From: Amos Jeffries Date: Tue, 29 Jul 2008 15:26:06 +0000 (+1200) Subject: Update page templates and .POT update script X-Git-Tag: SQUID_3_1_0_1~49^2~123^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1d6f80d5d8517a9758edf63d1b67cc530d6068c;p=thirdparty%2Fsquid.git Update page templates and .POT update script - cleans the templates slightly to remove text with only % codes from translation dictionary. - .POT will now update any existing .PO to match the new dictionary --- diff --git a/errors/dictionary.pot b/errors/dictionary.pot index f8eceabd23..c6d175e785 100644 --- a/errors/dictionary.pot +++ b/errors/dictionary.pot @@ -3,7 +3,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-07-30 03:24+1300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Squid Developers \n" @@ -12,45 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 1.1.1\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 "" - -#: 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 "" - -#: templates/ERR_FTP_FAILURE:9 templates/ERR_FTP_FORBIDDEN:9 -#: templates/ERR_FTP_NOT_FOUND:9 templates/ERR_FTP_UNAVAILABLE:9 -msgid "%g" -msgstr "" - -#: templates/ERR_DNS_FAIL:7 -msgid "%z" -msgstr "" - #: templates/ERR_INVALID_REQ:4 -msgid "Invalid Request error was encountered while trying to process the request:" +msgid "" +"Invalid Request error was encountered while trying to process the " +"request:" msgstr "" #: templates/ERR_INVALID_RESP:4 -msgid "Invalid Response error was encountered while trying to process the request:" -msgstr "" - -#: templates/generic:8 -msgid "@LONG_DESCRIPTION@" -msgstr "" - -#: templates/generic:5 -msgid "@SHORT_DESCRIPTION@" +msgid "" +"Invalid Response error was encountered while trying to process the " +"request:" msgstr "" #: templates/ERR_READ_TIMEOUT:7 -msgid "A Timeout occurred while waiting to read data from the network. The network or server may be down or congested. Please retry your request." +msgid "" +"A Timeout occurred while waiting to read data from the network. The network " +"or server may be down or congested. Please retry your request." msgstr "" #: templates/ERR_URN_RESOLVE:3 @@ -62,15 +39,22 @@ msgid "Access Denied." msgstr "" #: templates/ERR_ACCESS_DENIED:6 -msgid "Access control configuration prevents your request from being allowed at this time. Please contact your service provider if you feel this is incorrect." +msgid "" +"Access control configuration prevents your request from being allowed at " +"this time. Please contact your service provider if you feel this is " +"incorrect." msgstr "" #: templates/ERR_FTP_FORBIDDEN:4 -msgid "An FTP authentication failure occurred while trying to retrieve the URL: %U" +msgid "" +"An FTP authentication failure occurred while trying to retrieve the URL: %U" msgstr "" #: templates/ERR_FTP_FAILURE:4 -msgid "An FTP protocol error occurred while trying to retrieve the URL: %U" +msgid "" +"An FTP protocol error occurred while trying to retrieve the URL: %U" msgstr "" #: templates/ERR_ICAP_FAILURE:10 @@ -78,11 +62,15 @@ msgid "An Illegal response was received from the ICAP server." msgstr "" #: templates/ERR_READ_ERROR:7 -msgid "An error condition occurred while reading data from the network. Please retry your request." +msgid "" +"An error condition occurred while reading data from the network. Please " +"retry your request." msgstr "" #: templates/ERR_WRITE_ERROR:7 -msgid "An error condition occurred while writing to the network. Please retry your request." +msgid "" +"An error condition occurred while writing to the network. Please retry your " +"request." msgstr "" #: templates/ERR_CACHE_ACCESS_DENIED:3 templates/ERR_CACHE_ACCESS_DENIED:5 @@ -103,7 +91,7 @@ msgid "Connection Lifetime Expired" msgstr "" #: templates/ERR_CONNECT_FAIL:5 -msgid "Connection to %I Failed." +msgid "Connection to %I failed." msgstr "" #: templates/ERR_INVALID_REQ:10 @@ -125,7 +113,6 @@ msgstr "" #: 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 "" @@ -154,7 +141,6 @@ msgstr "" #: 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 "" @@ -207,11 +193,15 @@ msgid "ICAP protocol error." msgstr "" #: templates/ERR_TOO_BIG:7 -msgid "If you are making a GET request, then the item you are trying to download is too large." +msgid "" +"If you are making a GET request, then the item you are trying to download is " +"too large." msgstr "" #: templates/ERR_TOO_BIG:6 -msgid "If you are making a POST or PUT request, then the item you are trying to upload is too large." +msgid "" +"If you are making a POST or PUT request, then the item you are trying to " +"upload is too large." msgstr "" #: templates/ERR_INVALID_REQ:11 templates/ERR_INVALID_URL:11 @@ -239,7 +229,8 @@ msgid "Missing hostname" msgstr "" #: templates/ERR_INVALID_URL:8 -msgid "Missing or incorrect access protocol (should be http:// or similar)" +msgid "" +"Missing or incorrect access protocol (should be http:// or similar)" msgstr "" #: templates/ERR_INVALID_REQ:6 @@ -255,11 +246,18 @@ msgid "Operation successful" msgstr "" #: templates/ERR_CACHE_ACCESS_DENIED:8 -msgid "Please contact the cache administrator if you have difficulties authenticating yourself or change your default password." +msgid "" +"Please contact the cache administrator if you " +"have difficulties authenticating yourself or change your default password." msgstr "" #: templates/ERR_CACHE_MGR_ACCESS_DENIED:8 -msgid "Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages." +msgid "" +"Please contact the cache administrator if you " +"have difficulties authenticating yourself or, if you are the " +"administrator, read Squid documentation on cache manager interface and check " +"cache log for more detailed error messages." msgstr "" #: templates/ERR_READ_ERROR:5 @@ -288,11 +286,15 @@ msgid "Some possible problems are:" msgstr "" #: templates/ERR_CACHE_MGR_ACCESS_DENIED:6 -msgid "Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself." +msgid "" +"Sorry, you are not currently allowed to request %U from this cache manager " +"until you have authenticated yourself." msgstr "" #: templates/ERR_CACHE_ACCESS_DENIED:6 -msgid "Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself." +msgid "" +"Sorry, you are not currently allowed to request %U from this cache until you " +"have authenticated yourself." msgstr "" #: templates/ERR_ZERO_SIZE_OBJECT:6 @@ -300,15 +302,21 @@ msgid "Squid did not receive any data for this request." msgstr "" #: templates/ERR_UNSUP_REQ:6 -msgid "Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request." +msgid "" +"Squid does not support all request methods for all access protocols. For " +"example, you can not POST a Gopher request." msgstr "" #: templates/ERR_LIFETIME_EXP:6 -msgid "Squid has terminated the request because it has exceeded the maximum connection lifetime." +msgid "" +"Squid has terminated the request because it has exceeded the maximum " +"connection lifetime." msgstr "" #: templates/ERR_SOCKET_FAILURE:7 -msgid "Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request." +msgid "" +"Squid is unable to create a TCP socket, presumably due to excessive load. " +"Please retry your request." msgstr "" #: templates/ERR_FTP_FAILURE:5 templates/ERR_FTP_FORBIDDEN:5 @@ -326,7 +334,9 @@ msgid "The FTP server was too busy to retrieve the URL: %U" msgstr "" #: templates/ERR_INVALID_RESP:5 -msgid "The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator." +msgid "" +"The HTTP Response message received from the contacted server could not be " +"understood or was otherwise malformed. Please contact the site operator." msgstr "" #: templates/ERR_ICAP_FAILURE:9 @@ -352,12 +362,15 @@ msgstr "" #: 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" +msgid "" +"The following error was encountered while trying to retrieve the URL: %U" msgstr "" #: templates/ERR_URN_RESOLVE:4 -msgid "The following error was encountered while trying to retrieve the URN: %U" +msgid "" +"The following error was encountered while trying to retrieve the URN: %U" msgstr "" #: templates/ERR_CONNECT_FAIL:7 @@ -381,29 +394,33 @@ msgstr "" #: 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 "" -#: 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 "" #: 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 "" #: templates/ERR_NO_RELAY:6 -msgid "There is no WAIS Relay host defined for this Cache! Yell at the administrator." +msgid "" +"There is no WAIS Relay host defined for this Cache! Yell at the " +"administrator." msgstr "" #: templates/ERR_TOO_BIG:8 -msgid "These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error." +msgid "" +"These limits have been established by the Internet Service Provider who " +"operates this cache. Please contact them directly if you feel this is an " +"error." msgstr "" #: templates/ERR_FTP_DISABLED:6 @@ -411,43 +428,61 @@ msgid "This cache does not support FTP." msgstr "" #: templates/ERR_SHUTTING_DOWN:5 -msgid "This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon." +msgid "" +"This cache is in the process of shutting down and can not service your " +"request at this time. Please retry your request again soon." msgstr "" #: templates/ERR_FORWARDING_DENIED:6 -msgid "This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured." +msgid "" +"This cache will not forward your request because it is trying to enforce a " +"sibling relationship. Perhaps the client at %i is a cache which has been " +"misconfigured." msgstr "" #: templates/ERR_ICAP_FAILURE:7 msgid "This means that some aspect of the ICAP communication failed." msgstr "" -#: templates/ERR_FTP_PUT_ERROR:9 -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." +#: 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." msgstr "" -#: templates/ERR_DNS_FAIL:8 -msgid "This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct." +#: 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." msgstr "" #: templates/ERR_ESI:7 -msgid "This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster." -msgstr "" - -#: templates/generic:7 -msgid "This means:" +msgid "" +"This means that the surrogate was not able to process the ESI template. " +"Please report this error to the webmaster." msgstr "" -#: templates/ERR_FTP_NOT_FOUND:10 -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 %B." +#: 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 " +"%B." msgstr "" #: templates/ERR_SECURE_CONNECT_FAIL:7 -msgid "This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials." +msgid "" +"This proxy and the remote host failed to negotiate a mutually acceptable " +"security settings for handling your request. It is possible that the remote " +"host does not support secure connections, or the proxy is not satisfied with " +"the host security credentials." msgstr "" #: templates/ERR_CANNOT_FORWARD:6 -msgid "This request could not be forwarded to the origin server or to any parent caches. The most likely cause for this error is that the cache administrator does not allow this cache to make direct connections to origin servers, and all configured parent caches are currently unreachable." +msgid "" +"This request could not be forwarded to the origin server or to any parent " +"caches. The most likely cause for this error is that the cache " +"administrator does not allow this cache to make direct connections to origin " +"servers, and all configured parent caches are currently unreachable." msgstr "" #: templates/ERR_DNS_FAIL:5 @@ -463,7 +498,9 @@ msgid "Unsupported Request Method and Protocol" msgstr "" #: templates/ERR_ONLY_IF_CACHED_MISS:5 -msgid "Valid document was not found in the cache and only-if-cached directive was specified." +msgid "" +"Valid document was not found in the cache and only-if-cached " +"directive was specified." msgstr "" #: templates/ERR_FTP_PUT_ERROR:4 @@ -475,19 +512,24 @@ msgid "Write Error" msgstr "" #: templates/ERR_ONLY_IF_CACHED_MISS:6 -msgid "You have issued a request with a only-if-cached cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached directive." +msgid "" +"You have issued a request with a only-if-cached cache control " +"directive. The document was not found in the cache, or it required " +"revalidation prohibited by the only-if-cached directive." msgstr "" #: 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." +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 "" #: 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 @@ -500,7 +542,9 @@ msgid "Your cache administrator is %w." msgstr "" #: templates/ERR_INVALID_RESP:6 -msgid "Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed." +msgid "" +"Your cache administrator may be able to provide you with more details about " +"the exact nature of the problem if needed." msgstr "" #: templates/ERR_ESI:8 diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL index 7833c92a0f..1e1ec68bb3 100644 --- a/errors/templates/ERR_CONNECT_FAIL +++ b/errors/templates/ERR_CONNECT_FAIL @@ -9,7 +9,7 @@

The following error was encountered while trying to retrieve the URL: %U

-

Connection to %I Failed.

+

Connection to %I failed.

The system returned: %E

diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL index 78e97040df..0abe94d283 100644 --- a/errors/templates/ERR_DNS_FAIL +++ b/errors/templates/ERR_DNS_FAIL @@ -15,7 +15,7 @@

The dnsserver returned:

-

%z

+
%z

This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.

diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE index debe66754c..a91b123c5d 100644 --- a/errors/templates/ERR_FTP_FAILURE +++ b/errors/templates/ERR_FTP_FAILURE @@ -11,13 +11,13 @@

Squid sent the following FTP command:

-

%f

+
%f

The server responded with:

-

%F

-

%g

+
%F
+
%g

Your cache administrator is %w.

diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN index 64b15c69a4..18549ea08e 100644 --- a/errors/templates/ERR_FTP_FORBIDDEN +++ b/errors/templates/ERR_FTP_FORBIDDEN @@ -11,13 +11,13 @@

Squid sent the following FTP command:

-

%f

+
%f

The server responded with:

-

%F

-

%g

+
%F
+
%g

Your cache administrator is %w.

diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND index b56afa0d25..7cd013a84e 100644 --- a/errors/templates/ERR_FTP_NOT_FOUND +++ b/errors/templates/ERR_FTP_NOT_FOUND @@ -11,13 +11,13 @@

Squid sent the following FTP command:

-

%f

+
%f

The server responded with:

-

%F

-

%g

+
%F
+
%g

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 %B.

diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR index 9e9f8ea2de..a3d36c2afd 100644 --- a/errors/templates/ERR_FTP_PUT_ERROR +++ b/errors/templates/ERR_FTP_PUT_ERROR @@ -11,12 +11,12 @@

Squid sent the following FTP command:

-

%f

+
%f

The server responded with:

-

%F

+
%F

This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.

diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE index b4837a4a40..839c6d26d6 100644 --- a/errors/templates/ERR_FTP_UNAVAILABLE +++ b/errors/templates/ERR_FTP_UNAVAILABLE @@ -12,13 +12,13 @@

Squid sent the following FTP command:

-

%f

+
%f

The server responded with:

-

%F

-

%g

+
%F
+
%g

Your cache administrator is %w.

diff --git a/errors/update-pot.sh b/errors/update-pot.sh index 0f98d3a92b..a25f2d05b5 100755 --- a/errors/update-pot.sh +++ b/errors/update-pot.sh @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # # Update the core dictionary file from the basic templates # Useful if any template has altered. @@ -7,29 +7,29 @@ # Make sure any existing temp stuff is gone from previous updates... rm -r -f ./pot rm -f dictionary.pot.new +rm dictionary.pot # make a temp directory for all our workings... mkdir ./pot # Generate per-page disctionaries ... for f in `ls -1 ./templates/`; do - html2po -i ./templates/${f} -P --duplicates=merge -o ./pot/${f}.pot + if test "${f}" != "generic" ; then + html2po -i ./templates/${f} -P --duplicates=merge -o ./pot/${f}.pot + fi done # merge and sort the per-page dictionaries into a single master -msgcat ./pot/*.pot -s --no-wrap -o dictionary.pot.new && +msgcat ./pot/*.pot -s -o dictionary.pot.new && ( cat dictionary.pot.new | sed s/PACKAGE\ VERSION/squid\ 3\.0/ | sed s/LANGUAGE\ \/Squid\ Developers\ \/ ) >dictionary.pot -# Update all existing dictionaries with the new content ... +## Update all existing dictionaries with the new content ... for f in `ls -1 ./*.po` ; do - -# NP: this does not yet fully work. Old dictionaries upgrading still needs a little work. - -# msgmerge --verbose -s --no-wrap -o ${f}.new ${f} dictionary.pot - - # TODO check that the merge actually removes translations which are now obsolete??? + echo -n "Update: ${f} ... " + msgmerge --verbose -s -o ${f}.new ${f} dictionary.pot + mv ${f}.new ${f} done