mirror of
https://github.com/mirror/wget.git
synced 2024-12-27 13:20:23 +08:00
Automated merge.
This commit is contained in:
Micah Cowan
commit
2f5e7187a2
@ -1,3 +1,8 @@
|
||||
2008-02-06 Micah Cowan <micah@cowan.name>
|
||||
|
||||
* configure.ac (AC_CHECK_FUNCS): Added check for mbtowc.
|
||||
* po/be.po: Added from the TP.
|
||||
|
||||
2008-02-03 Micah Cowan <micah@cowan.name>
|
||||
|
||||
* configure.in: Add checks for wchar.h, wcwidth function (to
|
||||
|
||||
@ -197,7 +197,7 @@ AC_FUNC_ALLOCA
|
||||
AC_FUNC_MMAP
|
||||
AC_FUNC_FSEEKO
|
||||
AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48)
|
||||
AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth)
|
||||
AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth mbtowc)
|
||||
|
||||
if test x"$ENABLE_OPIE" = xyes; then
|
||||
AC_LIBOBJ([ftp-opie])
|
||||
|
||||
@ -32,8 +32,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: GNU wget 1.12-devel\n"
|
||||
"Report-Msgid-Bugs-To: wget@sunsite.dk\n"
|
||||
"POT-Creation-Date: 2008-01-28 17:25-0800\n"
|
||||
"PO-Revision-Date: 2008-01-28 17:25-0800\n"
|
||||
"POT-Creation-Date: 2008-02-06 18:23-0800\n"
|
||||
"PO-Revision-Date: 2008-02-06 18:23-0800\n"
|
||||
"Last-Translator: Automatically generated\n"
|
||||
"Language-Team: none\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -120,7 +120,7 @@ msgstr "connected.\n"
|
||||
msgid "failed: %s.\n"
|
||||
msgstr "failed: %s.\n"
|
||||
|
||||
#: src/connect.c:366 src/http.c:1629
|
||||
#: src/connect.c:366 src/http.c:1632
|
||||
#, c-format
|
||||
msgid "%s: unable to resolve host address `%s'\n"
|
||||
msgstr "%s: unable to resolve host address ‘[1m%s[0m’\n"
|
||||
@ -223,12 +223,12 @@ msgstr " (%s bytes)"
|
||||
msgid "Length: %s"
|
||||
msgstr "Length: %s"
|
||||
|
||||
#: src/ftp.c:220 src/http.c:2174
|
||||
#: src/ftp.c:220 src/http.c:2183
|
||||
#, c-format
|
||||
msgid ", %s (%s) remaining"
|
||||
msgstr ", %s (%s) remaining"
|
||||
|
||||
#: src/ftp.c:224 src/http.c:2178
|
||||
#: src/ftp.c:224 src/http.c:2187
|
||||
#, c-format
|
||||
msgid ", %s remaining"
|
||||
msgstr ", %s remaining"
|
||||
@ -355,7 +355,7 @@ msgstr ""
|
||||
"No such file or directory ‘[1m%s[0m’.\n"
|
||||
"\n"
|
||||
|
||||
#: src/ftp.c:935 src/http.c:2236
|
||||
#: src/ftp.c:935 src/http.c:2245
|
||||
#, c-format
|
||||
msgid "%s has sprung into existence.\n"
|
||||
msgstr "%s has sprung into existence.\n"
|
||||
@ -383,12 +383,12 @@ msgstr "Data transfer aborted.\n"
|
||||
msgid "File `%s' already there; not retrieving.\n"
|
||||
msgstr "File ‘[1m%s[0m’ already there; not retrieving.\n"
|
||||
|
||||
#: src/ftp.c:1165 src/http.c:2394
|
||||
#: src/ftp.c:1165 src/http.c:2423
|
||||
#, c-format
|
||||
msgid "(try:%2d)"
|
||||
msgstr "(try:%2d)"
|
||||
|
||||
#: src/ftp.c:1235 src/http.c:2717
|
||||
#: src/ftp.c:1235 src/http.c:2746
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s]\n"
|
||||
@ -557,45 +557,45 @@ msgstr "Failed writing HTTP request: %s.\n"
|
||||
msgid "No headers, assuming HTTP/0.9"
|
||||
msgstr "No headers, assuming HTTP/0.9"
|
||||
|
||||
#: src/http.c:1414
|
||||
#: src/http.c:1417
|
||||
msgid "Disabling SSL due to encountered errors.\n"
|
||||
msgstr "Disabling SSL due to encountered errors.\n"
|
||||
|
||||
#: src/http.c:1567
|
||||
#: src/http.c:1570
|
||||
#, c-format
|
||||
msgid "POST data file `%s' missing: %s\n"
|
||||
msgstr "POST data file ‘[1m%s[0m’ missing: %s\n"
|
||||
|
||||
#: src/http.c:1616
|
||||
#: src/http.c:1619
|
||||
#, c-format
|
||||
msgid "Reusing existing connection to %s:%d.\n"
|
||||
msgstr "Reusing existing connection to %s:%d.\n"
|
||||
|
||||
#: src/http.c:1684
|
||||
#: src/http.c:1687
|
||||
#, c-format
|
||||
msgid "Failed reading proxy response: %s\n"
|
||||
msgstr "Failed reading proxy response: %s\n"
|
||||
|
||||
#: src/http.c:1704
|
||||
#: src/http.c:1707
|
||||
#, c-format
|
||||
msgid "Proxy tunneling failed: %s"
|
||||
msgstr "Proxy tunneling failed: %s"
|
||||
|
||||
#: src/http.c:1749
|
||||
#: src/http.c:1752
|
||||
#, c-format
|
||||
msgid "%s request sent, awaiting response... "
|
||||
msgstr "%s request sent, awaiting response... "
|
||||
|
||||
#: src/http.c:1760
|
||||
#: src/http.c:1763
|
||||
msgid "No data received.\n"
|
||||
msgstr "No data received.\n"
|
||||
|
||||
#: src/http.c:1767
|
||||
#: src/http.c:1770
|
||||
#, c-format
|
||||
msgid "Read error (%s) in headers.\n"
|
||||
msgstr "Read error (%s) in headers.\n"
|
||||
|
||||
#: src/http.c:1813
|
||||
#: src/http.c:1816 src/http.c:2368
|
||||
#, c-format
|
||||
msgid ""
|
||||
"File `%s' already there; not retrieving.\n"
|
||||
@ -604,36 +604,36 @@ msgstr ""
|
||||
"File ‘[1m%s[0m’ already there; not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:1966
|
||||
#: src/http.c:1969
|
||||
msgid "Unknown authentication scheme.\n"
|
||||
msgstr "Unknown authentication scheme.\n"
|
||||
|
||||
#: src/http.c:1997
|
||||
#: src/http.c:2000
|
||||
msgid "Authorization failed.\n"
|
||||
msgstr "Authorization failed.\n"
|
||||
|
||||
#: src/http.c:2011
|
||||
#: src/http.c:2014
|
||||
msgid "Malformed status line"
|
||||
msgstr "Malformed status line"
|
||||
|
||||
#: src/http.c:2013
|
||||
#: src/http.c:2016
|
||||
msgid "(no description)"
|
||||
msgstr "(no description)"
|
||||
|
||||
#: src/http.c:2076
|
||||
#: src/http.c:2082
|
||||
#, c-format
|
||||
msgid "Location: %s%s\n"
|
||||
msgstr "Location: %s%s\n"
|
||||
|
||||
#: src/http.c:2077 src/http.c:2184
|
||||
#: src/http.c:2083 src/http.c:2193
|
||||
msgid "unspecified"
|
||||
msgstr "unspecified"
|
||||
|
||||
#: src/http.c:2078
|
||||
#: src/http.c:2084
|
||||
msgid " [following]"
|
||||
msgstr " [following]"
|
||||
|
||||
#: src/http.c:2134
|
||||
#: src/http.c:2140
|
||||
msgid ""
|
||||
"\n"
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
@ -643,59 +643,59 @@ msgstr ""
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2164
|
||||
#: src/http.c:2173
|
||||
msgid "Length: "
|
||||
msgstr "Length: "
|
||||
|
||||
#: src/http.c:2184
|
||||
#: src/http.c:2193
|
||||
msgid "ignored"
|
||||
msgstr "ignored"
|
||||
|
||||
#: src/http.c:2255
|
||||
#: src/http.c:2264
|
||||
#, c-format
|
||||
msgid "Saving to: `%s'\n"
|
||||
msgstr "Saving to: ‘[1m%s[0m’\n"
|
||||
|
||||
#: src/http.c:2336
|
||||
#: src/http.c:2345
|
||||
msgid "Warning: wildcards not supported in HTTP.\n"
|
||||
msgstr "Warning: wildcards not supported in HTTP.\n"
|
||||
|
||||
#: src/http.c:2383
|
||||
#: src/http.c:2412
|
||||
msgid "Spider mode enabled. Check if remote file exists.\n"
|
||||
msgstr "Spider mode enabled. Check if remote file exists.\n"
|
||||
|
||||
#: src/http.c:2468
|
||||
#: src/http.c:2497
|
||||
#, c-format
|
||||
msgid "Cannot write to `%s' (%s).\n"
|
||||
msgstr "Cannot write to ‘[1m%s[0m’ (%s).\n"
|
||||
|
||||
#: src/http.c:2477
|
||||
#: src/http.c:2506
|
||||
msgid "Unable to establish SSL connection.\n"
|
||||
msgstr "Unable to establish SSL connection.\n"
|
||||
|
||||
#: src/http.c:2485
|
||||
#: src/http.c:2514
|
||||
#, c-format
|
||||
msgid "ERROR: Redirection (%d) without location.\n"
|
||||
msgstr "ERROR: Redirection (%d) without location.\n"
|
||||
|
||||
#: src/http.c:2531
|
||||
#: src/http.c:2560
|
||||
msgid "Remote file does not exist -- broken link!!!\n"
|
||||
msgstr "Remote file does not exist -- broken link!!!\n"
|
||||
|
||||
#: src/http.c:2536
|
||||
#: src/http.c:2565
|
||||
#, c-format
|
||||
msgid "%s ERROR %d: %s.\n"
|
||||
msgstr "%s ERROR %d: %s.\n"
|
||||
|
||||
#: src/http.c:2552
|
||||
#: src/http.c:2581
|
||||
msgid "Last-modified header missing -- time-stamps turned off.\n"
|
||||
msgstr "Last-modified header missing -- time-stamps turned off.\n"
|
||||
|
||||
#: src/http.c:2560
|
||||
#: src/http.c:2589
|
||||
msgid "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
msgstr "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
|
||||
#: src/http.c:2590
|
||||
#: src/http.c:2619
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Server file no newer than local file `%s' -- not retrieving.\n"
|
||||
@ -704,16 +704,16 @@ msgstr ""
|
||||
"Server file no newer than local file ‘[1m%s[0m’ -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2598
|
||||
#: src/http.c:2627
|
||||
#, c-format
|
||||
msgid "The sizes do not match (local %s) -- retrieving.\n"
|
||||
msgstr "The sizes do not match (local %s) -- retrieving.\n"
|
||||
|
||||
#: src/http.c:2605
|
||||
#: src/http.c:2634
|
||||
msgid "Remote file is newer, retrieving.\n"
|
||||
msgstr "Remote file is newer, retrieving.\n"
|
||||
|
||||
#: src/http.c:2621
|
||||
#: src/http.c:2650
|
||||
msgid ""
|
||||
"Remote file exists and could contain links to other resources -- "
|
||||
"retrieving.\n"
|
||||
@ -723,7 +723,7 @@ msgstr ""
|
||||
"retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2626
|
||||
#: src/http.c:2655
|
||||
msgid ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -731,7 +731,7 @@ msgstr ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2634
|
||||
#: src/http.c:2663
|
||||
msgid ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -739,7 +739,7 @@ msgstr ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2686
|
||||
#: src/http.c:2715
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s/%s]\n"
|
||||
@ -748,17 +748,17 @@ msgstr ""
|
||||
"%s (%s) - ‘[1m%s[0m’ saved [%s/%s]\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2741
|
||||
#: src/http.c:2770
|
||||
#, c-format
|
||||
msgid "%s (%s) - Connection closed at byte %s. "
|
||||
msgstr "%s (%s) - Connection closed at byte %s. "
|
||||
|
||||
#: src/http.c:2756
|
||||
#: src/http.c:2785
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s (%s)."
|
||||
msgstr "%s (%s) - Read error at byte %s (%s)."
|
||||
|
||||
#: src/http.c:2765
|
||||
#: src/http.c:2794
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
msgstr "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
@ -1687,7 +1687,7 @@ msgstr ""
|
||||
msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
|
||||
msgstr "To connect to %s insecurely, use ‘[1m--no-check-certificate[0m’.\n"
|
||||
|
||||
#: src/progress.c:239
|
||||
#: src/progress.c:242
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\n"
|
||||
@ -1696,17 +1696,17 @@ msgstr ""
|
||||
"\n"
|
||||
"%*s[ skipping %sK ]"
|
||||
|
||||
#: src/progress.c:453
|
||||
#: src/progress.c:456
|
||||
#, c-format
|
||||
msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
|
||||
msgstr "Invalid dot style specification ‘[1m%s[0m’; leaving unchanged.\n"
|
||||
|
||||
#: src/progress.c:947
|
||||
#: src/progress.c:802
|
||||
#, c-format
|
||||
msgid " eta %s"
|
||||
msgstr " eta %s"
|
||||
|
||||
#: src/progress.c:962
|
||||
#: src/progress.c:1041
|
||||
msgid " in "
|
||||
msgstr " in "
|
||||
|
||||
|
||||
102
po/en@quot.po
102
po/en@quot.po
@ -29,8 +29,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: GNU wget 1.12-devel\n"
|
||||
"Report-Msgid-Bugs-To: wget@sunsite.dk\n"
|
||||
"POT-Creation-Date: 2008-01-28 17:25-0800\n"
|
||||
"PO-Revision-Date: 2008-01-28 17:25-0800\n"
|
||||
"POT-Creation-Date: 2008-02-06 18:23-0800\n"
|
||||
"PO-Revision-Date: 2008-02-06 18:23-0800\n"
|
||||
"Last-Translator: Automatically generated\n"
|
||||
"Language-Team: none\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -117,7 +117,7 @@ msgstr "connected.\n"
|
||||
msgid "failed: %s.\n"
|
||||
msgstr "failed: %s.\n"
|
||||
|
||||
#: src/connect.c:366 src/http.c:1629
|
||||
#: src/connect.c:366 src/http.c:1632
|
||||
#, c-format
|
||||
msgid "%s: unable to resolve host address `%s'\n"
|
||||
msgstr "%s: unable to resolve host address ‘%s’\n"
|
||||
@ -220,12 +220,12 @@ msgstr " (%s bytes)"
|
||||
msgid "Length: %s"
|
||||
msgstr "Length: %s"
|
||||
|
||||
#: src/ftp.c:220 src/http.c:2174
|
||||
#: src/ftp.c:220 src/http.c:2183
|
||||
#, c-format
|
||||
msgid ", %s (%s) remaining"
|
||||
msgstr ", %s (%s) remaining"
|
||||
|
||||
#: src/ftp.c:224 src/http.c:2178
|
||||
#: src/ftp.c:224 src/http.c:2187
|
||||
#, c-format
|
||||
msgid ", %s remaining"
|
||||
msgstr ", %s remaining"
|
||||
@ -352,7 +352,7 @@ msgstr ""
|
||||
"No such file or directory ‘%s’.\n"
|
||||
"\n"
|
||||
|
||||
#: src/ftp.c:935 src/http.c:2236
|
||||
#: src/ftp.c:935 src/http.c:2245
|
||||
#, c-format
|
||||
msgid "%s has sprung into existence.\n"
|
||||
msgstr "%s has sprung into existence.\n"
|
||||
@ -380,12 +380,12 @@ msgstr "Data transfer aborted.\n"
|
||||
msgid "File `%s' already there; not retrieving.\n"
|
||||
msgstr "File ‘%s’ already there; not retrieving.\n"
|
||||
|
||||
#: src/ftp.c:1165 src/http.c:2394
|
||||
#: src/ftp.c:1165 src/http.c:2423
|
||||
#, c-format
|
||||
msgid "(try:%2d)"
|
||||
msgstr "(try:%2d)"
|
||||
|
||||
#: src/ftp.c:1235 src/http.c:2717
|
||||
#: src/ftp.c:1235 src/http.c:2746
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s]\n"
|
||||
@ -554,45 +554,45 @@ msgstr "Failed writing HTTP request: %s.\n"
|
||||
msgid "No headers, assuming HTTP/0.9"
|
||||
msgstr "No headers, assuming HTTP/0.9"
|
||||
|
||||
#: src/http.c:1414
|
||||
#: src/http.c:1417
|
||||
msgid "Disabling SSL due to encountered errors.\n"
|
||||
msgstr "Disabling SSL due to encountered errors.\n"
|
||||
|
||||
#: src/http.c:1567
|
||||
#: src/http.c:1570
|
||||
#, c-format
|
||||
msgid "POST data file `%s' missing: %s\n"
|
||||
msgstr "POST data file ‘%s’ missing: %s\n"
|
||||
|
||||
#: src/http.c:1616
|
||||
#: src/http.c:1619
|
||||
#, c-format
|
||||
msgid "Reusing existing connection to %s:%d.\n"
|
||||
msgstr "Reusing existing connection to %s:%d.\n"
|
||||
|
||||
#: src/http.c:1684
|
||||
#: src/http.c:1687
|
||||
#, c-format
|
||||
msgid "Failed reading proxy response: %s\n"
|
||||
msgstr "Failed reading proxy response: %s\n"
|
||||
|
||||
#: src/http.c:1704
|
||||
#: src/http.c:1707
|
||||
#, c-format
|
||||
msgid "Proxy tunneling failed: %s"
|
||||
msgstr "Proxy tunneling failed: %s"
|
||||
|
||||
#: src/http.c:1749
|
||||
#: src/http.c:1752
|
||||
#, c-format
|
||||
msgid "%s request sent, awaiting response... "
|
||||
msgstr "%s request sent, awaiting response... "
|
||||
|
||||
#: src/http.c:1760
|
||||
#: src/http.c:1763
|
||||
msgid "No data received.\n"
|
||||
msgstr "No data received.\n"
|
||||
|
||||
#: src/http.c:1767
|
||||
#: src/http.c:1770
|
||||
#, c-format
|
||||
msgid "Read error (%s) in headers.\n"
|
||||
msgstr "Read error (%s) in headers.\n"
|
||||
|
||||
#: src/http.c:1813
|
||||
#: src/http.c:1816 src/http.c:2368
|
||||
#, c-format
|
||||
msgid ""
|
||||
"File `%s' already there; not retrieving.\n"
|
||||
@ -601,36 +601,36 @@ msgstr ""
|
||||
"File ‘%s’ already there; not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:1966
|
||||
#: src/http.c:1969
|
||||
msgid "Unknown authentication scheme.\n"
|
||||
msgstr "Unknown authentication scheme.\n"
|
||||
|
||||
#: src/http.c:1997
|
||||
#: src/http.c:2000
|
||||
msgid "Authorization failed.\n"
|
||||
msgstr "Authorization failed.\n"
|
||||
|
||||
#: src/http.c:2011
|
||||
#: src/http.c:2014
|
||||
msgid "Malformed status line"
|
||||
msgstr "Malformed status line"
|
||||
|
||||
#: src/http.c:2013
|
||||
#: src/http.c:2016
|
||||
msgid "(no description)"
|
||||
msgstr "(no description)"
|
||||
|
||||
#: src/http.c:2076
|
||||
#: src/http.c:2082
|
||||
#, c-format
|
||||
msgid "Location: %s%s\n"
|
||||
msgstr "Location: %s%s\n"
|
||||
|
||||
#: src/http.c:2077 src/http.c:2184
|
||||
#: src/http.c:2083 src/http.c:2193
|
||||
msgid "unspecified"
|
||||
msgstr "unspecified"
|
||||
|
||||
#: src/http.c:2078
|
||||
#: src/http.c:2084
|
||||
msgid " [following]"
|
||||
msgstr " [following]"
|
||||
|
||||
#: src/http.c:2134
|
||||
#: src/http.c:2140
|
||||
msgid ""
|
||||
"\n"
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
@ -640,59 +640,59 @@ msgstr ""
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2164
|
||||
#: src/http.c:2173
|
||||
msgid "Length: "
|
||||
msgstr "Length: "
|
||||
|
||||
#: src/http.c:2184
|
||||
#: src/http.c:2193
|
||||
msgid "ignored"
|
||||
msgstr "ignored"
|
||||
|
||||
#: src/http.c:2255
|
||||
#: src/http.c:2264
|
||||
#, c-format
|
||||
msgid "Saving to: `%s'\n"
|
||||
msgstr "Saving to: ‘%s’\n"
|
||||
|
||||
#: src/http.c:2336
|
||||
#: src/http.c:2345
|
||||
msgid "Warning: wildcards not supported in HTTP.\n"
|
||||
msgstr "Warning: wildcards not supported in HTTP.\n"
|
||||
|
||||
#: src/http.c:2383
|
||||
#: src/http.c:2412
|
||||
msgid "Spider mode enabled. Check if remote file exists.\n"
|
||||
msgstr "Spider mode enabled. Check if remote file exists.\n"
|
||||
|
||||
#: src/http.c:2468
|
||||
#: src/http.c:2497
|
||||
#, c-format
|
||||
msgid "Cannot write to `%s' (%s).\n"
|
||||
msgstr "Cannot write to ‘%s’ (%s).\n"
|
||||
|
||||
#: src/http.c:2477
|
||||
#: src/http.c:2506
|
||||
msgid "Unable to establish SSL connection.\n"
|
||||
msgstr "Unable to establish SSL connection.\n"
|
||||
|
||||
#: src/http.c:2485
|
||||
#: src/http.c:2514
|
||||
#, c-format
|
||||
msgid "ERROR: Redirection (%d) without location.\n"
|
||||
msgstr "ERROR: Redirection (%d) without location.\n"
|
||||
|
||||
#: src/http.c:2531
|
||||
#: src/http.c:2560
|
||||
msgid "Remote file does not exist -- broken link!!!\n"
|
||||
msgstr "Remote file does not exist -- broken link!!!\n"
|
||||
|
||||
#: src/http.c:2536
|
||||
#: src/http.c:2565
|
||||
#, c-format
|
||||
msgid "%s ERROR %d: %s.\n"
|
||||
msgstr "%s ERROR %d: %s.\n"
|
||||
|
||||
#: src/http.c:2552
|
||||
#: src/http.c:2581
|
||||
msgid "Last-modified header missing -- time-stamps turned off.\n"
|
||||
msgstr "Last-modified header missing -- time-stamps turned off.\n"
|
||||
|
||||
#: src/http.c:2560
|
||||
#: src/http.c:2589
|
||||
msgid "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
msgstr "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
|
||||
#: src/http.c:2590
|
||||
#: src/http.c:2619
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Server file no newer than local file `%s' -- not retrieving.\n"
|
||||
@ -701,16 +701,16 @@ msgstr ""
|
||||
"Server file no newer than local file ‘%s’ -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2598
|
||||
#: src/http.c:2627
|
||||
#, c-format
|
||||
msgid "The sizes do not match (local %s) -- retrieving.\n"
|
||||
msgstr "The sizes do not match (local %s) -- retrieving.\n"
|
||||
|
||||
#: src/http.c:2605
|
||||
#: src/http.c:2634
|
||||
msgid "Remote file is newer, retrieving.\n"
|
||||
msgstr "Remote file is newer, retrieving.\n"
|
||||
|
||||
#: src/http.c:2621
|
||||
#: src/http.c:2650
|
||||
msgid ""
|
||||
"Remote file exists and could contain links to other resources -- "
|
||||
"retrieving.\n"
|
||||
@ -720,7 +720,7 @@ msgstr ""
|
||||
"retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2626
|
||||
#: src/http.c:2655
|
||||
msgid ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -728,7 +728,7 @@ msgstr ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2634
|
||||
#: src/http.c:2663
|
||||
msgid ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -736,7 +736,7 @@ msgstr ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2686
|
||||
#: src/http.c:2715
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s/%s]\n"
|
||||
@ -745,17 +745,17 @@ msgstr ""
|
||||
"%s (%s) - ‘%s’ saved [%s/%s]\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2741
|
||||
#: src/http.c:2770
|
||||
#, c-format
|
||||
msgid "%s (%s) - Connection closed at byte %s. "
|
||||
msgstr "%s (%s) - Connection closed at byte %s. "
|
||||
|
||||
#: src/http.c:2756
|
||||
#: src/http.c:2785
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s (%s)."
|
||||
msgstr "%s (%s) - Read error at byte %s (%s)."
|
||||
|
||||
#: src/http.c:2765
|
||||
#: src/http.c:2794
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
msgstr "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
@ -1680,7 +1680,7 @@ msgstr ""
|
||||
msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
|
||||
msgstr "To connect to %s insecurely, use ‘--no-check-certificate’.\n"
|
||||
|
||||
#: src/progress.c:239
|
||||
#: src/progress.c:242
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\n"
|
||||
@ -1689,17 +1689,17 @@ msgstr ""
|
||||
"\n"
|
||||
"%*s[ skipping %sK ]"
|
||||
|
||||
#: src/progress.c:453
|
||||
#: src/progress.c:456
|
||||
#, c-format
|
||||
msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
|
||||
msgstr "Invalid dot style specification ‘%s’; leaving unchanged.\n"
|
||||
|
||||
#: src/progress.c:947
|
||||
#: src/progress.c:802
|
||||
#, c-format
|
||||
msgid " eta %s"
|
||||
msgstr " eta %s"
|
||||
|
||||
#: src/progress.c:962
|
||||
#: src/progress.c:1041
|
||||
msgid " in "
|
||||
msgstr " in "
|
||||
|
||||
|
||||
594
po/en_GB.po
594
po/en_GB.po
File diff suppressed because it is too large
Load Diff
102
po/en_US.po
102
po/en_US.po
@ -29,8 +29,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: GNU wget 1.12-devel\n"
|
||||
"Report-Msgid-Bugs-To: wget@sunsite.dk\n"
|
||||
"POT-Creation-Date: 2008-01-28 17:25-0800\n"
|
||||
"PO-Revision-Date: 2008-01-28 17:25-0800\n"
|
||||
"POT-Creation-Date: 2008-02-06 18:23-0800\n"
|
||||
"PO-Revision-Date: 2008-02-06 18:23-0800\n"
|
||||
"Last-Translator: Automatically generated\n"
|
||||
"Language-Team: none\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -117,7 +117,7 @@ msgstr "connected.\n"
|
||||
msgid "failed: %s.\n"
|
||||
msgstr "failed: %s.\n"
|
||||
|
||||
#: src/connect.c:366 src/http.c:1629
|
||||
#: src/connect.c:366 src/http.c:1632
|
||||
#, c-format
|
||||
msgid "%s: unable to resolve host address `%s'\n"
|
||||
msgstr "%s: unable to resolve host address ‘%s’\n"
|
||||
@ -220,12 +220,12 @@ msgstr " (%s bytes)"
|
||||
msgid "Length: %s"
|
||||
msgstr "Length: %s"
|
||||
|
||||
#: src/ftp.c:220 src/http.c:2174
|
||||
#: src/ftp.c:220 src/http.c:2183
|
||||
#, c-format
|
||||
msgid ", %s (%s) remaining"
|
||||
msgstr ", %s (%s) remaining"
|
||||
|
||||
#: src/ftp.c:224 src/http.c:2178
|
||||
#: src/ftp.c:224 src/http.c:2187
|
||||
#, c-format
|
||||
msgid ", %s remaining"
|
||||
msgstr ", %s remaining"
|
||||
@ -352,7 +352,7 @@ msgstr ""
|
||||
"No such file or directory ‘%s’.\n"
|
||||
"\n"
|
||||
|
||||
#: src/ftp.c:935 src/http.c:2236
|
||||
#: src/ftp.c:935 src/http.c:2245
|
||||
#, c-format
|
||||
msgid "%s has sprung into existence.\n"
|
||||
msgstr "%s has sprung into existence.\n"
|
||||
@ -380,12 +380,12 @@ msgstr "Data transfer aborted.\n"
|
||||
msgid "File `%s' already there; not retrieving.\n"
|
||||
msgstr "File ‘%s’ already there; not retrieving.\n"
|
||||
|
||||
#: src/ftp.c:1165 src/http.c:2394
|
||||
#: src/ftp.c:1165 src/http.c:2423
|
||||
#, c-format
|
||||
msgid "(try:%2d)"
|
||||
msgstr "(try:%2d)"
|
||||
|
||||
#: src/ftp.c:1235 src/http.c:2717
|
||||
#: src/ftp.c:1235 src/http.c:2746
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s]\n"
|
||||
@ -554,45 +554,45 @@ msgstr "Failed writing HTTP request: %s.\n"
|
||||
msgid "No headers, assuming HTTP/0.9"
|
||||
msgstr "No headers, assuming HTTP/0.9"
|
||||
|
||||
#: src/http.c:1414
|
||||
#: src/http.c:1417
|
||||
msgid "Disabling SSL due to encountered errors.\n"
|
||||
msgstr "Disabling SSL due to encountered errors.\n"
|
||||
|
||||
#: src/http.c:1567
|
||||
#: src/http.c:1570
|
||||
#, c-format
|
||||
msgid "POST data file `%s' missing: %s\n"
|
||||
msgstr "POST data file ‘%s’ missing: %s\n"
|
||||
|
||||
#: src/http.c:1616
|
||||
#: src/http.c:1619
|
||||
#, c-format
|
||||
msgid "Reusing existing connection to %s:%d.\n"
|
||||
msgstr "Reusing existing connection to %s:%d.\n"
|
||||
|
||||
#: src/http.c:1684
|
||||
#: src/http.c:1687
|
||||
#, c-format
|
||||
msgid "Failed reading proxy response: %s\n"
|
||||
msgstr "Failed reading proxy response: %s\n"
|
||||
|
||||
#: src/http.c:1704
|
||||
#: src/http.c:1707
|
||||
#, c-format
|
||||
msgid "Proxy tunneling failed: %s"
|
||||
msgstr "Proxy tunneling failed: %s"
|
||||
|
||||
#: src/http.c:1749
|
||||
#: src/http.c:1752
|
||||
#, c-format
|
||||
msgid "%s request sent, awaiting response... "
|
||||
msgstr "%s request sent, awaiting response... "
|
||||
|
||||
#: src/http.c:1760
|
||||
#: src/http.c:1763
|
||||
msgid "No data received.\n"
|
||||
msgstr "No data received.\n"
|
||||
|
||||
#: src/http.c:1767
|
||||
#: src/http.c:1770
|
||||
#, c-format
|
||||
msgid "Read error (%s) in headers.\n"
|
||||
msgstr "Read error (%s) in headers.\n"
|
||||
|
||||
#: src/http.c:1813
|
||||
#: src/http.c:1816 src/http.c:2368
|
||||
#, c-format
|
||||
msgid ""
|
||||
"File `%s' already there; not retrieving.\n"
|
||||
@ -601,36 +601,36 @@ msgstr ""
|
||||
"File ‘%s’ already there; not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:1966
|
||||
#: src/http.c:1969
|
||||
msgid "Unknown authentication scheme.\n"
|
||||
msgstr "Unknown authentication scheme.\n"
|
||||
|
||||
#: src/http.c:1997
|
||||
#: src/http.c:2000
|
||||
msgid "Authorization failed.\n"
|
||||
msgstr "Authorization failed.\n"
|
||||
|
||||
#: src/http.c:2011
|
||||
#: src/http.c:2014
|
||||
msgid "Malformed status line"
|
||||
msgstr "Malformed status line"
|
||||
|
||||
#: src/http.c:2013
|
||||
#: src/http.c:2016
|
||||
msgid "(no description)"
|
||||
msgstr "(no description)"
|
||||
|
||||
#: src/http.c:2076
|
||||
#: src/http.c:2082
|
||||
#, c-format
|
||||
msgid "Location: %s%s\n"
|
||||
msgstr "Location: %s%s\n"
|
||||
|
||||
#: src/http.c:2077 src/http.c:2184
|
||||
#: src/http.c:2083 src/http.c:2193
|
||||
msgid "unspecified"
|
||||
msgstr "unspecified"
|
||||
|
||||
#: src/http.c:2078
|
||||
#: src/http.c:2084
|
||||
msgid " [following]"
|
||||
msgstr " [following]"
|
||||
|
||||
#: src/http.c:2134
|
||||
#: src/http.c:2140
|
||||
msgid ""
|
||||
"\n"
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
@ -640,59 +640,59 @@ msgstr ""
|
||||
" The file is already fully retrieved; nothing to do.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2164
|
||||
#: src/http.c:2173
|
||||
msgid "Length: "
|
||||
msgstr "Length: "
|
||||
|
||||
#: src/http.c:2184
|
||||
#: src/http.c:2193
|
||||
msgid "ignored"
|
||||
msgstr "ignored"
|
||||
|
||||
#: src/http.c:2255
|
||||
#: src/http.c:2264
|
||||
#, c-format
|
||||
msgid "Saving to: `%s'\n"
|
||||
msgstr "Saving to: ‘%s’\n"
|
||||
|
||||
#: src/http.c:2336
|
||||
#: src/http.c:2345
|
||||
msgid "Warning: wildcards not supported in HTTP.\n"
|
||||
msgstr "Warning: wildcards not supported in HTTP.\n"
|
||||
|
||||
#: src/http.c:2383
|
||||
#: src/http.c:2412
|
||||
msgid "Spider mode enabled. Check if remote file exists.\n"
|
||||
msgstr "Spider mode enabled. Check if remote file exists.\n"
|
||||
|
||||
#: src/http.c:2468
|
||||
#: src/http.c:2497
|
||||
#, c-format
|
||||
msgid "Cannot write to `%s' (%s).\n"
|
||||
msgstr "Cannot write to ‘%s’ (%s).\n"
|
||||
|
||||
#: src/http.c:2477
|
||||
#: src/http.c:2506
|
||||
msgid "Unable to establish SSL connection.\n"
|
||||
msgstr "Unable to establish SSL connection.\n"
|
||||
|
||||
#: src/http.c:2485
|
||||
#: src/http.c:2514
|
||||
#, c-format
|
||||
msgid "ERROR: Redirection (%d) without location.\n"
|
||||
msgstr "ERROR: Redirection (%d) without location.\n"
|
||||
|
||||
#: src/http.c:2531
|
||||
#: src/http.c:2560
|
||||
msgid "Remote file does not exist -- broken link!!!\n"
|
||||
msgstr "Remote file does not exist -- broken link!!!\n"
|
||||
|
||||
#: src/http.c:2536
|
||||
#: src/http.c:2565
|
||||
#, c-format
|
||||
msgid "%s ERROR %d: %s.\n"
|
||||
msgstr "%s ERROR %d: %s.\n"
|
||||
|
||||
#: src/http.c:2552
|
||||
#: src/http.c:2581
|
||||
msgid "Last-modified header missing -- time-stamps turned off.\n"
|
||||
msgstr "Last-modified header missing -- time-stamps turned off.\n"
|
||||
|
||||
#: src/http.c:2560
|
||||
#: src/http.c:2589
|
||||
msgid "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
msgstr "Last-modified header invalid -- time-stamp ignored.\n"
|
||||
|
||||
#: src/http.c:2590
|
||||
#: src/http.c:2619
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Server file no newer than local file `%s' -- not retrieving.\n"
|
||||
@ -701,16 +701,16 @@ msgstr ""
|
||||
"Server file no newer than local file ‘%s’ -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2598
|
||||
#: src/http.c:2627
|
||||
#, c-format
|
||||
msgid "The sizes do not match (local %s) -- retrieving.\n"
|
||||
msgstr "The sizes do not match (local %s) -- retrieving.\n"
|
||||
|
||||
#: src/http.c:2605
|
||||
#: src/http.c:2634
|
||||
msgid "Remote file is newer, retrieving.\n"
|
||||
msgstr "Remote file is newer, retrieving.\n"
|
||||
|
||||
#: src/http.c:2621
|
||||
#: src/http.c:2650
|
||||
msgid ""
|
||||
"Remote file exists and could contain links to other resources -- "
|
||||
"retrieving.\n"
|
||||
@ -720,7 +720,7 @@ msgstr ""
|
||||
"retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2626
|
||||
#: src/http.c:2655
|
||||
msgid ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -728,7 +728,7 @@ msgstr ""
|
||||
"Remote file exists but does not contain any link -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2634
|
||||
#: src/http.c:2663
|
||||
msgid ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
@ -736,7 +736,7 @@ msgstr ""
|
||||
"Remote file exists but recursion is disabled -- not retrieving.\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2686
|
||||
#: src/http.c:2715
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s (%s) - `%s' saved [%s/%s]\n"
|
||||
@ -745,17 +745,17 @@ msgstr ""
|
||||
"%s (%s) - ‘%s’ saved [%s/%s]\n"
|
||||
"\n"
|
||||
|
||||
#: src/http.c:2741
|
||||
#: src/http.c:2770
|
||||
#, c-format
|
||||
msgid "%s (%s) - Connection closed at byte %s. "
|
||||
msgstr "%s (%s) - Connection closed at byte %s. "
|
||||
|
||||
#: src/http.c:2756
|
||||
#: src/http.c:2785
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s (%s)."
|
||||
msgstr "%s (%s) - Read error at byte %s (%s)."
|
||||
|
||||
#: src/http.c:2765
|
||||
#: src/http.c:2794
|
||||
#, c-format
|
||||
msgid "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
msgstr "%s (%s) - Read error at byte %s/%s (%s). "
|
||||
@ -1680,7 +1680,7 @@ msgstr ""
|
||||
msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
|
||||
msgstr "To connect to %s insecurely, use ‘--no-check-certificate’.\n"
|
||||
|
||||
#: src/progress.c:239
|
||||
#: src/progress.c:242
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\n"
|
||||
@ -1689,17 +1689,17 @@ msgstr ""
|
||||
"\n"
|
||||
"%*s[ skipping %sK ]"
|
||||
|
||||
#: src/progress.c:453
|
||||
#: src/progress.c:456
|
||||
#, c-format
|
||||
msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
|
||||
msgstr "Invalid dot style specification ‘%s’; leaving unchanged.\n"
|
||||
|
||||
#: src/progress.c:947
|
||||
#: src/progress.c:802
|
||||
#, c-format
|
||||
msgid " eta %s"
|
||||
msgstr " eta %s"
|
||||
|
||||
#: src/progress.c:962
|
||||
#: src/progress.c:1041
|
||||
msgid " in "
|
||||
msgstr " in "
|
||||
|
||||
|
||||
595
po/pt_BR.po
595
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
594
po/zh_CN.po
594
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
597
po/zh_TW.po
597
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,12 @@
|
||||
2008-02-06 Micah Cowan <micah@cowan.name>
|
||||
|
||||
* progress.c (countcols): Use strlen() when mbtowc or wcwidth
|
||||
not available (or not using NLS).
|
||||
* utils.c: Ensure we use single-byte separators when not doing
|
||||
NLS progress-bars.
|
||||
* wget.h: Determine whether to use NLS for progress-bars, based
|
||||
on whether wcwidth and mbtowc are available.
|
||||
|
||||
2008-02-03 Micah Cowan <micah@cowan.name>
|
||||
|
||||
* progress.c (create_image): Use number of characters/columns
|
||||
|
||||
@ -767,10 +767,7 @@ update_speed_ring (struct bar_progress *bp, wgint howmuch, double dltime)
|
||||
#endif
|
||||
}
|
||||
|
||||
#if ! HAVE_WCWIDTH
|
||||
#define wcwidth(wc) (1)
|
||||
#endif
|
||||
|
||||
#if USE_NLS_PROGRESS_BAR
|
||||
int
|
||||
count_cols (const char *mbs)
|
||||
{
|
||||
@ -796,6 +793,9 @@ count_cols (const char *mbs)
|
||||
}
|
||||
return cols;
|
||||
}
|
||||
#else
|
||||
# define count_cols(mbs) ((int)(strlen(mbs)))
|
||||
#endif
|
||||
|
||||
/* Translation note: "ETA" is English-centric, but this must
|
||||
be short, ideally 3 chars. Abbreviate if necessary. */
|
||||
@ -811,7 +811,11 @@ get_eta (void)
|
||||
int nbytes;
|
||||
int ncols;
|
||||
|
||||
#if USE_NLS_PROGRESS_BAR
|
||||
eta_trans = _(eta_str);
|
||||
#else
|
||||
eta_trans = eta_str;
|
||||
#endif
|
||||
|
||||
/* Determine the number of bytes used in the translated string,
|
||||
* versus the number of columns used. This is to figure out how
|
||||
|
||||
@ -1221,6 +1221,12 @@ get_grouping_data (const char **sep, const char **grouping)
|
||||
struct lconv *lconv = localeconv ();
|
||||
cached_sep = lconv->thousands_sep;
|
||||
cached_grouping = lconv->grouping;
|
||||
#if ! USE_NLS_PROGRESS_BAR
|
||||
/* We can't count column widths, so ensure that the separator
|
||||
* is single-byte only (let check below determine what byte). */
|
||||
if (strlen(cached_sep) > 1)
|
||||
cached_sep = "";
|
||||
#endif
|
||||
if (!*cached_sep)
|
||||
{
|
||||
/* Many locales (such as "C" or "hr_HR") don't specify
|
||||
|
||||
13
src/wget.h
13
src/wget.h
@ -67,6 +67,19 @@ as that of the covered work. */
|
||||
variables. -- explanation partly taken from GNU make. */
|
||||
#define N_(string) string
|
||||
|
||||
#if ! ENABLE_NLS
|
||||
# undef HAVE_WCHAR_H
|
||||
# undef HAVE_WCWIDTH
|
||||
# undef HAVE_MBTOWC
|
||||
#endif /* not ENABLE_NLS */
|
||||
|
||||
#if HAVE_WCWIDTH && HAVE_MBTOWC
|
||||
# define USE_NLS_PROGRESS_BAR 1
|
||||
#else
|
||||
/* Just to be a little paranoid about it. */
|
||||
# undef USE_NLS_PROGRESS_BAR
|
||||
#endif
|
||||
|
||||
/* I18N NOTE: You will notice that none of the DEBUGP messages are
|
||||
marked as translatable. This is intentional, for a few reasons:
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user