From 2524076dd238f47d3d45368a6b2722931cea577e Mon Sep 17 00:00:00 2001
From: Peter Pisar <petr.pisar@atlas.cz>
Date: Sun, 5 Jul 2009 14:35:21 -0700
Subject: [PATCH] Translation fixes.
---
src/ChangeLog | 10 ++++++++++
src/gnutls.c | 4 ++--
src/http.c | 2 +-
src/main.c | 12 ++++++------
src/netrc.c | 4 ++--
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 45a66572..60a71dbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2009-07-05 Peter Pisar <petr.pisar@atlas.cz>
+
+ * main.c (print_version): Mark initial line for translation, along
+ with (env), (user), and (system). Change copyright year to 2009.
+
+ * http.c (http_loop): Space after colon.
+
+ * gnutls.c (ssl_check_certificate): Use quote function, rather
+ than explicit quotes.
+
2009-07-05 Micah Cowan <micah@cowan.name>
* Makefile.am (version.c): Add dependency on configure.ac.
diff --git a/src/gnutls.c b/src/gnutls.c
index 5480cde3..dfbe8bf5 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -290,8 +290,8 @@ ssl_check_certificate (int fd, const char *host)
if (!gnutls_x509_crt_check_hostname (cert, host))
{
logprintf (LOG_NOTQUIET,
- _("The certificate's owner does not match hostname '%s'\n"),
- host);
+ _("The certificate's owner does not match hostname %s\n"),
+ quote (host));
success = false;
}
gnutls_x509_crt_deinit (cert);
diff --git a/src/http.c b/src/http.c
index 974951a1..311cb972 100644
--- a/src/http.c
+++ b/src/http.c
@@ -2782,7 +2782,7 @@ Remote file exists.\n\n"));
if (finished)
{
logprintf (LOG_NONVERBOSE,
- _("%s URL:%s %2d %s\n"),
+ _("%s URL: %s %2d %s\n"),
tms, u->url, hstat.statcode,
hstat.message ? quotearg_style (escape_quoting_style, hstat.message) : "");
goto exit;
diff --git a/src/main.c b/src/main.c
index 713b240a..f7ea1b34 100644
--- a/src/main.c
+++ b/src/main.c
@@ -779,10 +779,10 @@ print_version (void)
int i;
#ifdef __VMS
- printf ("GNU Wget %s built on VMS %s %s.\n\n",
+ printf (_("GNU Wget %s built on VMS %s %s.\n\n"),
version_string, vms_arch(), vms_vers());
#else /* def __VMS */
- printf ("GNU Wget %s built on %s.\n\n", version_string, OS_TYPE);
+ printf (_("GNU Wget %s built on %s.\n\n"), version_string, OS_TYPE);
#endif /* def __VMS */
/* compiled_features is a char*[]. We limit the characters per
line to MAX_CHARS_PER_LINE and prefix each line with a constant
@@ -805,17 +805,17 @@ print_version (void)
env_wgetrc = wgetrc_env_file_name ();
if (env_wgetrc && *env_wgetrc)
{
- printf (" %s (env)\n", env_wgetrc);
+ printf (_(" %s (env)\n"), env_wgetrc);
xfree (env_wgetrc);
}
user_wgetrc = wgetrc_user_file_name ();
if (user_wgetrc)
{
- printf (" %s (user)\n", user_wgetrc);
+ printf (_(" %s (user)\n"), user_wgetrc);
xfree (user_wgetrc);
}
#ifdef SYSTEM_WGETRC
- printf (" %s (system)\n", SYSTEM_WGETRC);
+ printf (_(" %s (system)\n"), SYSTEM_WGETRC);
#endif
format_and_print_line (locale_title,
@@ -834,7 +834,7 @@ print_version (void)
/* TRANSLATORS: When available, an actual copyright character
(cirle-c) should be used in preference to "(C)". */
fputs (_("\
-Copyright (C) 2008 Free Software Foundation, Inc.\n"), stdout);
+Copyright (C) 2009 Free Software Foundation, Inc.\n"), stdout);
fputs (_("\
License GPLv3+: GNU GPL version 3 or later\n\
<http://www.gnu.org/licenses/gpl.html>.\n\
diff --git a/src/netrc.c b/src/netrc.c
index e6c0d12c..73de0d07 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -388,8 +388,8 @@ parse_netrc (const char *path)
if (premature_token)
{
fprintf (stderr, _("\
-%s: %s:%d: warning: \"%s\" token appears before any machine name\n"),
- exec_name, path, ln, premature_token);
+%s: %s:%d: warning: %s token appears before any machine name\n"),
+ exec_name, path, ln, quote (premature_token));
premature_token = NULL;
}