From: Amos Jeffries Date: Fri, 1 Aug 2008 08:31:06 +0000 (+1200) Subject: Translation cleanups X-Git-Tag: SQUID_3_1_0_1~49^2~106^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=672dc0067b69013edefbb328c70a6ce42de46035;p=thirdparty%2Fsquid.git Translation cleanups --- diff --git a/errors/TRANSLATORS b/errors/TRANSLATORS index e0fde646b9..e13042d216 100644 --- a/errors/TRANSLATORS +++ b/errors/TRANSLATORS @@ -5,7 +5,7 @@ and ideas to make Squid available as multi-langual software. Alexandre Correa Constantin Rack Francesco Chemolli - Robert Dessa + Robert Förster \n" "Language-Team: Squid Developers \n" diff --git a/errors/en-au.po b/errors/en-au.po index c1140eb85e..1e6fad2e23 100644 --- a/errors/en-au.po +++ b/errors/en-au.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: squid 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-15 23:14+1300\n" +"POT-Creation-Date: 2008-08-01 20:26+1300\n" "PO-Revision-Date: 2008-07-27 13:46+0000\n" "Last-Translator: Amos Jeffries \n" "Language-Team: Squid Developers \n" @@ -12,27 +12,6 @@ msgstr "" "X-Launchpad-Export-Date: 2008-07-31 11:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: templates/ERR_FTP_FAILURE:8 templates/ERR_FTP_FORBIDDEN:8 -#: templates/ERR_FTP_NOT_FOUND:8 templates/ERR_FTP_PUT_ERROR:8 -#: templates/ERR_FTP_UNAVAILABLE:8 -msgid "%F" -msgstr "%F" - -#: templates/ERR_FTP_FAILURE:6 templates/ERR_FTP_FORBIDDEN:6 -#: templates/ERR_FTP_NOT_FOUND:6 templates/ERR_FTP_PUT_ERROR:6 -#: templates/ERR_FTP_UNAVAILABLE:6 -msgid "%f" -msgstr "%f" - -#: templates/ERR_FTP_FAILURE:9 templates/ERR_FTP_FORBIDDEN:9 -#: templates/ERR_FTP_NOT_FOUND:9 templates/ERR_FTP_UNAVAILABLE:9 -msgid "%g" -msgstr "%g" - -#: templates/ERR_DNS_FAIL:7 -msgid "%z" -msgstr "%z" - #: templates/ERR_INVALID_REQ:4 msgid "" "Invalid Request error was encountered while trying to process the " @@ -49,14 +28,6 @@ msgstr "" "Invalid Response error was encountered while trying to process the " "request:" -#: templates/generic:8 -msgid "@LONG_DESCRIPTION@" -msgstr "@LONG_DESCRIPTION@" - -#: templates/generic:5 -msgid "@SHORT_DESCRIPTION@" -msgstr "@SHORT_DESCRIPTION@" - #: templates/ERR_READ_TIMEOUT:7 msgid "" "A Timeout occurred while waiting to read data from the network. The network " @@ -93,11 +64,11 @@ msgstr "" #: templates/ERR_FTP_FAILURE:4 msgid "" -"An FTP protocol error occurred while trying to retrieve the URL: %U" +"An FTP protocol error occurred while trying to retrieve the URL: %U" msgstr "" -"An FTP protocol error occurred while trying to retrieve the URL: %U" +"An FTP protocol error occurred while trying to retrieve the URL: %U" #: templates/ERR_ICAP_FAILURE:10 msgid "An Illegal response was received from the ICAP server." @@ -137,7 +108,8 @@ msgid "Connection Lifetime Expired" msgstr "Connection Lifetime Expired" #: templates/ERR_CONNECT_FAIL:5 -msgid "Connection to %I Failed." +#, fuzzy +msgid "Connection to %I failed." msgstr "Connection to %I Failed." #: templates/ERR_INVALID_REQ:10 @@ -159,7 +131,6 @@ msgstr "Content-Length missing for POST or PUT requests." #: templates/ERR_SOCKET_FAILURE:2 templates/ERR_TOO_BIG:2 #: templates/ERR_UNSUP_REQ:2 templates/ERR_URN_RESOLVE:2 #: templates/ERR_WRITE_ERROR:2 templates/ERR_ZERO_SIZE_OBJECT:2 -#: templates/generic:2 msgid "ERROR" msgstr "ERROR" @@ -188,7 +159,6 @@ msgstr "ERROR: FTP upload failed" #: templates/ERR_SHUTTING_DOWN:1 templates/ERR_SOCKET_FAILURE:1 #: templates/ERR_TOO_BIG:1 templates/ERR_UNSUP_REQ:1 #: templates/ERR_WRITE_ERROR:1 templates/ERR_ZERO_SIZE_OBJECT:1 -#: templates/generic:1 msgid "ERROR: The requested URL could not be retrieved" msgstr "ERROR: The requested URL could not be retrieved" @@ -298,17 +268,17 @@ msgstr "No Wais Relay" msgid "Operation successful" msgstr "Operation successful" -#: templates/ERR_CACHE_ACCESS_DENIED:8 +#: templates/ERR_CACHE_ACCESS_DENIED:7 msgid "" "Please contact the cache administrator if you " -"have difficulties authenticating yourself or change your default password." +"have difficulties authenticating yourself or change your default password." msgstr "" "Please contact the cache administrator if you " -"have difficulties authenticating yourself or change your default password." +"have difficulties authenticating yourself or change your default password." -#: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 +#: templates/ERR_CACHE_MGR_ACCESS_DENIED:7 msgid "" "Please contact the cache administrator if you " "have difficulties authenticating yourself or, if you are the " @@ -400,10 +370,8 @@ msgid "The ESI processor returned:" msgstr "The ESI processor returned:" #: templates/ERR_FTP_UNAVAILABLE:4 -msgid "" -"The FTP server was too busy to retrieve the URL: %U" -msgstr "" -"The FTP server was too busy to retrieve the URL: %U" +msgid "The FTP server was too busy to retrieve the URL: %U" +msgstr "The FTP server was too busy to retrieve the URL: %U" #: templates/ERR_INVALID_RESP:5 msgid "" @@ -436,7 +404,6 @@ msgstr "The following URL could not be retrieved: %U" #: templates/ERR_SHUTTING_DOWN:4 templates/ERR_SOCKET_FAILURE:4 #: templates/ERR_TOO_BIG:4 templates/ERR_UNSUP_REQ:4 #: templates/ERR_WRITE_ERROR:4 templates/ERR_ZERO_SIZE_OBJECT:4 -#: templates/generic:4 msgid "" "The following error was encountered while trying to retrieve the URL: %U" @@ -453,10 +420,8 @@ msgstr "" "href=\"%U\">%U" #: templates/ERR_CONNECT_FAIL:7 -msgid "" -"The remote host or network may be down. Please try the request again." -msgstr "" -"The remote host or network may be down. Please try the request again." +msgid "The remote host or network may be down. Please try the request again." +msgstr "The remote host or network may be down. Please try the request again." #: templates/ERR_TOO_BIG:5 msgid "The request or reply is too large." @@ -475,20 +440,19 @@ msgstr "The request or reply is too large." #: templates/ERR_SHUTTING_DOWN:3 templates/ERR_SOCKET_FAILURE:3 #: templates/ERR_TOO_BIG:3 templates/ERR_UNSUP_REQ:3 #: templates/ERR_WRITE_ERROR:3 templates/ERR_ZERO_SIZE_OBJECT:3 -#: templates/generic:3 msgid "The requested URL could not be retrieved" msgstr "The requested URL could not be retrieved" -#: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7 -#: templates/ERR_FTP_NOT_FOUND:7 templates/ERR_FTP_PUT_ERROR:7 -#: templates/ERR_FTP_UNAVAILABLE:7 +#: templates/ERR_FTP_FAILURE:6 templates/ERR_FTP_FORBIDDEN:6 +#: templates/ERR_FTP_NOT_FOUND:6 templates/ERR_FTP_PUT_ERROR:6 +#: templates/ERR_FTP_UNAVAILABLE:6 msgid "The server responded with:" msgstr "The server responded with:" #: templates/ERR_CONNECT_FAIL:6 templates/ERR_ICAP_FAILURE:6 #: templates/ERR_READ_ERROR:6 templates/ERR_READ_TIMEOUT:6 #: templates/ERR_SECURE_CONNECT_FAIL:6 templates/ERR_SOCKET_FAILURE:6 -#: templates/ERR_WRITE_ERROR:6 templates/generic:6 +#: templates/ERR_WRITE_ERROR:6 msgid "The system returned: %E" msgstr "The system returned: %E" @@ -536,7 +500,7 @@ msgstr "" msgid "This means that some aspect of the ICAP communication failed." msgstr "This means that some aspect of the ICAP communication failed." -#: templates/ERR_FTP_PUT_ERROR:9 +#: templates/ERR_FTP_PUT_ERROR:7 msgid "" "This means that the FTP server may not have permission or space to store the " "file. Check the path, permissions, diskspace and try again." @@ -544,7 +508,7 @@ msgstr "" "This means that the FTP server may not have permission or space to store the " "file. Check the path, permissions, diskspace and try again." -#: templates/ERR_DNS_FAIL:8 +#: templates/ERR_DNS_FAIL:7 msgid "" "This means that the cache was not able to resolve the hostname presented in " "the URL. Check if the address is correct." @@ -560,11 +524,7 @@ msgstr "" "This means that the surrogate was not able to process the ESI template. " "Please report this error to the webmaster." -#: templates/generic:7 -msgid "This means:" -msgstr "This means:" - -#: templates/ERR_FTP_NOT_FOUND:10 +#: templates/ERR_FTP_NOT_FOUND:7 msgid "" "This might be caused by an FTP URL with an absolute path (which does not " "comply with RFC 1738). If this is the cause, then the file can be found at " @@ -636,20 +596,12 @@ msgstr "" "directive. The document was not found in the cache, or it required " "revalidation prohibited by the only-if-cached directive." -#: templates/ERR_CACHE_ACCESS_DENIED:7 templates/ERR_CACHE_MGR_ACCESS_DENIED:7 -msgid "" -"You need to use Netscape version 2.0 or greater, or Microsoft Internet " -"Explorer 3.0, or an HTTP/1.1 compliant browser for this to work." -msgstr "" -"You need to use Netscape version 2.0 or greater, or Microsoft Internet " -"Explorer 3.0, or an HTTP/1.1 compliant browser for this to work." - #: templates/ERR_ACCESS_DENIED:7 templates/ERR_CANNOT_FORWARD:7 -#: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:9 +#: templates/ERR_CONNECT_FAIL:8 templates/ERR_DNS_FAIL:8 #: templates/ERR_FORWARDING_DENIED:7 templates/ERR_FTP_DISABLED:7 -#: templates/ERR_FTP_FAILURE:10 templates/ERR_FTP_FORBIDDEN:10 -#: templates/ERR_FTP_NOT_FOUND:11 templates/ERR_FTP_PUT_ERROR:10 -#: templates/ERR_FTP_UNAVAILABLE:10 templates/ERR_INVALID_REQ:12 +#: templates/ERR_FTP_FAILURE:7 templates/ERR_FTP_FORBIDDEN:7 +#: templates/ERR_FTP_NOT_FOUND:8 templates/ERR_FTP_PUT_ERROR:8 +#: templates/ERR_FTP_UNAVAILABLE:7 templates/ERR_INVALID_REQ:12 #: templates/ERR_INVALID_RESP:7 templates/ERR_INVALID_URL:12 #: templates/ERR_LIFETIME_EXP:7 templates/ERR_NO_RELAY:7 #: templates/ERR_ONLY_IF_CACHED_MISS:7 templates/ERR_READ_ERROR:8 diff --git a/errors/en.po b/errors/en.po index 52f975f7a3..68fd322000 100644 --- a/errors/en.po +++ b/errors/en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: squid 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 23:09+1300\n" +"POT-Creation-Date: 2008-08-01 20:26+1300\n" "PO-Revision-Date: 2008-07-20 11:29+1200\n" "Last-Translator: Amos Jeffries \n" "Language-Team: Squid Developers \n" diff --git a/errors/it.po b/errors/it.po index 3de184dadb..b2f6b0db4c 100644 --- a/errors/it.po +++ b/errors/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 23:09+1300\n" +"POT-Creation-Date: 2008-08-01 20:26+1300\n" "PO-Revision-Date: 2008-08-01 02:31+1200\n" "Last-Translator: Francesco Chemolli \n" "Language-Team: LANGUAGE \n" @@ -418,16 +418,16 @@ msgid "" "The following error was encountered while trying to retrieve the URL: %U" msgstr "" -"Mentre si cercava di accedere alla URL %U si è manifestato " -"il seguente errore:" +"Mentre si cercava di accedere alla URL %U si è " +"manifestato il seguente errore:" #: templates/ERR_URN_RESOLVE:4 msgid "" "The following error was encountered while trying to retrieve the URN: %U" msgstr "" -"Mentre si cercava di accedere alla URN %U si è manifestato " -"il seguente errore:" +"Mentre si cercava di accedere alla URN %U si è " +"manifestato il seguente errore:" #: templates/ERR_CONNECT_FAIL:7 msgid "The remote host or network may be down. Please try the request again." diff --git a/errors/update-pot.sh b/errors/update-pot.sh index a25f2d05b5..1a3445313d 100755 --- a/errors/update-pot.sh +++ b/errors/update-pot.sh @@ -31,5 +31,6 @@ msgcat ./pot/*.pot -s -o dictionary.pot.new && for f in `ls -1 ./*.po` ; do echo -n "Update: ${f} ... " msgmerge --verbose -s -o ${f}.new ${f} dictionary.pot + chown --reference=${f} ${f}.new mv ${f}.new ${f} done