Hi,
A few messages in wget-1.10-rc1 seem to have been overlooked during
gettextization. The patch repairs this. It also makes identical
some messages that say the same thing in a slightly different form.
It's maybe a bit late to make such a change shortly before a
release, but I don't think the translators would mind making
another small update.
Cheers,
Benno
diff -ur cvs-wget/src/connect.c wget-fresh/src/connect.c
--- cvs-wget/src/connect.c 2005-05-10 17:17:36.000000000 +0200
+++ wget-fresh/src/connect.c 2005-06-12 14:18:14.000000000 +0200
@@ -344,7 +344,7 @@
if (sock >= 0)
fd_close (sock);
if (print)
- logprintf (LOG_VERBOSE, "failed: %s.\n", strerror (errno));
+ logprintf (LOG_VERBOSE, _("failed: %s.\n"), strerror (errno));
errno = save_errno;
return -1;
}
diff -ur cvs-wget/src/cookies.c wget-fresh/src/cookies.c
--- cvs-wget/src/cookies.c 2005-06-01 11:22:29.000000000 +0200
+++ wget-fresh/src/cookies.c 2005-06-12 14:18:14.000000000 +0200
@@ -862,7 +862,7 @@
if (!check_domain_match (cookie->domain, host))
{
logprintf (LOG_NOTQUIET,
- "Cookie coming from %s attempted to set domain to %s\n",
+ _("Cookie coming from %s attempted to set domain to %s\n"),
escnonprint (host), escnonprint (cookie->domain));
xfree (cookie->domain);
goto copy_domain;
@@ -1317,7 +1317,7 @@
FILE *fp = fopen (file, "r");
if (!fp)
{
- logprintf (LOG_NOTQUIET, "Cannot open cookies file `%s': %s\n",
+ logprintf (LOG_NOTQUIET, _("Cannot open cookies file `%s': %s\n"),
file, strerror (errno));
return;
}
diff -ur cvs-wget/src/ftp.c wget-fresh/src/ftp.c
--- cvs-wget/src/ftp.c 2005-05-17 14:53:08.000000000 +0200
+++ wget-fresh/src/ftp.c 2005-06-12 14:18:14.000000000 +0200
@@ -478,7 +478,7 @@
abort ();
}
if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
+ logputs (LOG_VERBOSE, _("done. "));
} /* do login */
if (cmd & DO_CWD)
@@ -1111,7 +1111,7 @@
if (opt.noclobber && file_exists_p (con->target))
{
logprintf (LOG_VERBOSE,
- _("File `%s' already there, not retrieving.\n"), con->target);
+ _("File `%s' already there; not retrieving.\n\n"), con->target);
/* If the file is there, we suppose it's retrieved OK. */
return RETROK;
}
@@ -1454,7 +1454,7 @@
/* Remote file is older, file sizes can be compared and
are both equal. */
logprintf (LOG_VERBOSE, _("\
-Remote file no newer than local file `%s' -- not retrieving.\n"), con->target);
+Remote file no newer than local file `%s' -- not retrieving.\n\n"), con->target);
dlthis = 0;
}
else if (eq_size)
diff -ur cvs-wget/src/html-url.c wget-fresh/src/html-url.c
--- cvs-wget/src/html-url.c 2005-06-01 11:22:29.000000000 +0200
+++ wget-fresh/src/html-url.c 2005-06-12 14:18:14.000000000 +0200
@@ -702,7 +702,7 @@
url = url_parse (url_text, &up_error_code);
if (!url)
{
- logprintf (LOG_NOTQUIET, "%s: Invalid URL %s: %s\n",
+ logprintf (LOG_NOTQUIET, _("%s: Invalid URL %s: %s\n"),
file, url_text, url_error (up_error_code));
xfree (url_text);
continue;
diff -ur cvs-wget/src/http.c wget-fresh/src/http.c
--- cvs-wget/src/http.c 2005-06-01 11:22:29.000000000 +0200
+++ wget-fresh/src/http.c 2005-06-12 14:18:14.000000000 +0200
@@ -1365,7 +1365,7 @@
post_data_size = file_size (opt.post_file_name);
if (post_data_size == -1)
{
- logprintf (LOG_NOTQUIET, "POST data file missing: %s\n",
+ logprintf (LOG_NOTQUIET, _("POST data file missing: %s\n"),
opt.post_file_name);
post_data_size = 0;
}
@@ -2040,7 +2040,7 @@
/* If opt.noclobber is turned on and file already exists, do not
retrieve the file */
logprintf (LOG_VERBOSE, _("\
-File `%s' already there, will not retrieve.\n"), *hstat.local_file);
+File `%s' already there; not retrieving.\n\n"), *hstat.local_file);
/* If the file is there, we suppose it's retrieved OK. */
*dt |= RETROKF;
@@ -2440,7 +2440,7 @@
else if (!opt.kill_longer) /* meaning we got more than expected */
{
logprintf (LOG_VERBOSE,
- _("%s (%s) - `%s' saved [%s/%s])\n\n"),
+ _("%s (%s) - `%s' saved [%s/%s]\n\n"),
tms, tmrate, locf,
number_to_static_string (hstat.len),
number_to_static_string (hstat.contlen));
diff -ur cvs-wget/src/init.c wget-fresh/src/init.c
--- cvs-wget/src/init.c 2005-06-01 11:22:29.000000000 +0200
+++ wget-fresh/src/init.c 2005-06-12 14:18:14.000000000 +0200
@@ -746,8 +746,8 @@
lockable_boolean_value = -1;
else
{
- fprintf (stderr,
- _("%s: %s: Invalid boolean `%s', use always, on, off, or never.\n"),
+ fprintf (stderr, _("%s: %s: Invalid boolean `%s',"
+ "use `always', `on', `off', or `never'.\n"),
exec_name, com, val);
return 0;
}
diff -ur cvs-wget/src/res.c wget-fresh/src/res.c
--- cvs-wget/src/res.c 2005-05-10 21:07:57.000000000 +0200
+++ wget-fresh/src/res.c 2005-06-12 14:18:14.000000000 +0200
@@ -391,7 +391,7 @@
struct file_memory *fm = read_file (filename);
if (!fm)
{
- logprintf (LOG_NOTQUIET, "Cannot open %s: %s",
+ logprintf (LOG_NOTQUIET, _("Cannot open %s: %s"),
filename, strerror (errno));
return NULL;
}
