Re: [MERGE] Language Updates

2009-05-24 Thread Bundle Buggy 

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20090517101856.252BA88D4B%40treenet.co.nz%3E

Project: Squid

[MERGE] Language Updates

2009-05-17 Thread Amos Jeffries 
Testing auto-submit. This one failed.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squ...@treenet.co.nz-20090411180053-75osjbtu569ttwnb
# target_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 29dbc344e2efc242e44d995a40b5a260bafeecec
# timestamp: 2009-05-17 22:17:52 +1200
# source_branch: http://www.squid-cache.org/bzr/squid3/trunk/
# message: Language Updates
# base_revision_id: squ...@treenet.co.nz-20090409134549-\
#   dw2hzbfqp4ys6qu3
# 
# Begin patch
=== modified file 'errors/TRANSLATORS'
--- errors/TRANSLATORS	2009-04-09 13:45:49 +
+++ errors/TRANSLATORS	2009-04-10 03:16:56 +
@@ -17,7 +17,7 @@
 	Martin Perner
 	Mohsen Saeedi 
 	M. Rodrigo Montiero
-	Olivier W.
+	Olivier Wahrenberger
 	Ramdhani Fathurrohman
 	Rene Wijninga
 	Robert Forster

=== modified file 'errors/fr.po'
--- errors/fr.po	2009-04-09 13:45:49 +
+++ errors/fr.po	2009-04-11 18:00:53 +
@@ -3,13 +3,17 @@
 "Project-Id-Version: Squid-3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-02-18 18:05+1300\n"
-"PO-Revision-Date: 2009-04-09 01:39+1200\n"
-"Last-Translator: Olivier W. \n"
+"PO-Revision-Date: 2009-04-12 05:06+1300\n"
+"Last-Translator: Olivier W \n"
 "Language-Team: Squid Developers \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.2.0\n"
 
+# I haven't changed anything in the translation, I'm just checking that the submit button works.
 #: templates/ERR_FTP_LISTING:6
 msgid "Parent Directory (Root Directory)"
 msgstr "Répertoire Parent (Répertoire Racine)"
@@ -327,8 +331,8 @@
 "have difficulties authenticating yourself or http://%h/cgi-bin/";
 "chpasswd.cgi\">change your default password."
 msgstr ""
-"Veuillez contacter l'administrateur de cachesi "
-"vous avez des difficlutés à vous authentifier, oul'administrateur de cache si "
+"vous avez des difficultés à vous authentifier, ouhttp://%h/cgi-bin/chpasswd.cgi\";>changez votre mot de passe par défaut."
 
 #: templates/ERR_CACHE_MGR_ACCESS_DENIED:7
@@ -339,7 +343,7 @@
 "administrator, read Squid documentation on cache manager interface and check "
 "cache log for more detailed error messages."
 msgstr ""
-"Veuillez contacter l'administrateur de cachesi "
+"Veuillez contacter l'administrateur de cache si "
 "vous avez des difficultés à vous authentifier ou, si "
 "vous êtes l'administrateur, veuillez lire la documentation de Squid "
 "sur l'interface de gestionnaire de cache, et vérifier le log du cache "
@@ -415,7 +419,7 @@
 "Please retry your request."
 msgstr ""
 "Squid n'est pas en mesure de créer une socket TCP, "
-"probablement à cause d'une charge excessive. Veuillez réitérer"
+"probablement à cause d'une charge excessive. Veuillez réitérer "
 "votre requête."
 
 #: templates/ERR_FTP_FAILURE:5 templates/ERR_FTP_FORBIDDEN:5
@@ -653,7 +657,6 @@
 msgstr ""
 "Aucun document valide n'a été trouvé dans le cache et "
 "la directive only-if-cached a été spécifiée."
-"e."
 
 #: templates/ERR_FTP_PUT_ERROR:4
 msgid "While trying to PUT the following URL: %U"

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfa1nk4ABAVflAAwW+///3e1
38SwQCAIAGAHffKoAAAV9UAKAADjJk0MRiaMAjATCAMBNNGmRoBjjJk0MRiaMAjATCAMBNNG
mRoBjjJk0MRiaMAjATCAMBNNGmRoBhpokySaM1P0kxNqaA0HqDQyNA00BpkABJUE0T1MI9RvVMTB
qNGTEwR6nk1DEDIBgSSAIAjSZBoBNohNT9U21T1PIyTT1PJqeUeSDNatqsboljlUMSCnpQJR1E26
GeGRSqkwCFAQl4w6EebiaJISqyResauo6b+WREdY6A8/bFv4K4I/RTTAzJMMHydZMRh0/SJUz/Zz
yg5nUBjsN2lWEggqxerOCgOFhS8Kji+I7DNrbeoKyTUQTJIliQfjnNYfgfMdJ4fPkPwXeXxV/ykf
7aYxPO969TL5jBj0FdglWMWAdOzp156QoQ6903lrhhsp4UhU2nTmmUXtwq/shihQg8+R1ETwEzJg
TxzhDH3Oc5jQ+p27eyFcdM++fU8+2oZjlXoN6OUM0kQFUz+nxOk5QvRzH1Lc0lf2dOemUrkClRAt
BbUe4x6XCNPCg5zo2bVfqcWCewsmSGaEMj7hCJIFyCcklqawq+VhYFgKQ8eWnuOJJF1pMoJgr0OO
c/IxHq8aYngyBXoxGRb6oA89B/W+eScgsZGqxnEBMmoCjhB6DImKUPd+RiqEC3Dz6FuwsejAp8Eb
EVfisswWwrAyCJseLmp5GxWwuRs3SLS4YysDZpe4bFw08ZGZkJwySJ7zYTlachSZEZaFDQmRNWJA
ID8ChiQVRnl5BJwHCA88EMrC29j7+tRSrfmYgsSqrCAzySMSBxvLpD9s4DHMgTjcUDMuMgwroaFD
CoyM0XD0PRAcILljgMZlxIqRRFGBLJRRciJxlgedHJTXaaPsbLLIIGNSBjrsiEDwSkeZPE7mcF5J
DYFHIW0WhoazUV2DgqJjM1xZOBNN50FpUKkTXIvKArCE4WC2imQLyhQ7kbg3l1oSeigMONQ8cFSq
1zjmZuIl6K8CBNjoFA1kjNLExsGNgLUC7VxbdDG1yTCxTBebC/iIrLEyKxLnW2QraVQySIQcjWxU
qbym4ag02NxiXmI4qYrIkVJqZgSDoC0WBQ6k2nApqtZmV5UWCT9aMElFuY9jFxc35A4Y49w5AzHr
GB3P2GVEzFQ1jnjDaJwweAwzLrvqdp70dJAeUHBQv3jyBdGQefoQJmyuE8pQhCSPPeCkaQHTagnl
mGd+QyIW6KgrZ6kHDQo8Y/cYd+55HdI2uPh1LYcYmQMcn5w3sMy9q6SAjMQBlOogiuEs1PBenmQd
OP1MBADAGyqSDhK1zItHGneOS3+jISjEq5g+Z6ih6kMxpYZUd7cBULZmJDwI4ysdBGPkMNtFWw6f
ooO4QTBhESHWXBwwCIcR5ihsLVU3GhoWmf4cbDtqWjM4y96BQCB2xiQzNHkECuKigkxkaiIKpYUL
BxyjOvLjcE0Qicvgjq93EZdb4LrPfk9Yrq5xjeM9NaSNxA6ervL7y/YsjgiIW2lBlkoAVuGdtmYH
c45esHiS+xZk8+00CxeroickXNiO5wv1QNXacfEucChKjOC8NGKoF/1RLz+4yS6XgaGbUNZcdZxj
045CBrOA9GRmKY93ivMsVrZGIKxGw8RjhH7WnUVNQ3DayE5xrD6jyBrOA28QxyXsOLWcPUj+F3om
bBKV5aY+lAvuC2p8SQZiZ6CSuHheXgW9rruc/5ykiZkVZAMYpBQov5j1JkzCxgtoLgcT

Merged! [MERGE] Language Updates

2008-08-08 Thread Bundle Buggy 

This change has been merged.
Previous status: Approved

For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20080808061444.ED7E3206218%40treenet.co.nz%3E

Project: Squid

Re: [MERGE] Language Updates

2008-08-08 Thread Amos Jeffries 

Amos Jeffries has voted approve.
Status is now: Approved


For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20080808061444.ED7E3206218%40treenet.co.nz%3E

Project: Squid

Re: [MERGE] Language Updates

2008-08-07 Thread Robert Collins 

Robert Collins has voted approve.
Status is now: Semi-approved


For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20080808061444.ED7E3206218%40treenet.co.nz%3E

Project: Squid

Re: [MERGE] Language Updates

2008-08-07 Thread Robert Collins 

Robert Collins has voted approve.
Status is now: Semi-approved


For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20080808061444.ED7E3206218%40treenet.co.nz%3E

Project: Squid

Re: [MERGE] Language Updates

2008-08-04 Thread Amos Jeffries 

Most of a day and this has not been picked up by bundlebuggy...

Amos
--
Please use Squid 2.7.STABLE3 or 3.0.STABLE8

[MERGE] Language Updates

2008-08-04 Thread Amos Jeffries 
Various corrections.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: file:///src/squid/bzr/trunk/
# testament_sha1: 7c7d1c4480f38428c7300456745e561d1f535e39
# timestamp: 2008-08-05 01:33:13 +1200
# message: Language Updates
# base_revision_id: [EMAIL PROTECTED]
#   2ccftxu9npuar2qn
# 
# Begin patch
=== modified file 'errors/TRANSLATORS'
--- errors/TRANSLATORS	2008-08-01 02:59:45 +
+++ errors/TRANSLATORS	2008-08-01 08:31:06 +
@@ -5,7 +5,7 @@
 	Alexandre Correa <[EMAIL PROTECTED]>
 	Constantin Rack <[EMAIL PROTECTED]>
 	Francesco Chemolli <[EMAIL PROTECTED]>
-	Robert Dessa <[EMAIL PROTECTED]>
+	Robert Förster <[EMAIL PROTECTED]
 
 via Rosetta Translation Project and Canonical Ltd.
 

=== modified file 'errors/dictionary.pot'
--- errors/dictionary.pot	2008-07-31 11:11:46 +
+++ errors/dictionary.pot	2008-08-01 08:31:06 +
@@ -3,7 +3,7 @@
 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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
 "Language-Team: Squid Developers \n"

=== modified file 'errors/en-au.po'
--- errors/en-au.po	2008-08-01 03:43:23 +
+++ errors/en-au.po	2008-08-01 13:01:27 +
@@ -2,36 +2,15 @@
 msgstr ""
 "Project-Id-Version: squid 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-15 23:14+1300\n"
-"PO-Revision-Date: 2008-07-27 13:46+\n"
-"Last-Translator: Amos Jeffries \n"
+"POT-Creation-Date: 2008-08-01 20:26+1300\n"
+"PO-Revision-Date: 2008-08-01 21:09+1200\n"
+"Last-Translator: Amos Jeffries <[EMAIL PROTECTED]>\n"
 "Language-Team: Squid Developers \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
 "X-Launchpad-Export-Date: 2008-07-31 11:24+\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 ""
@@ -49,14 +28,6 @@
 "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 @@
 
 #: 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,8 +108,8 @@
 msgstr "Connection Lifetime Expired"
 
 #: templates/ERR_CONNECT_FAIL:5
-msgid "Connection to %I Failed."
-msgstr "Connection to %I Failed."
+msgid "Connection to %I failed."
+msgstr "Connection to %I failed."
 
 #: templates/ERR_INVALID_REQ:10
 msgid "Content-Length missing for POST or PUT requests."
@@ -159,7 +130,6 @@
 #: 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 +158,6 @@
 #: 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 +267,17 @@
 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 http://%h/cgi-";
-"bin/chpasswd.cgi\">change your default password."
+"have difficulties authenticating yourself or http://%h/cgi-bin/";
+"chpasswd.cgi\">change your default password."
 msgstr ""
 "Please contact the cache administrator if you "
-"have difficulties authenticating yourself or http://%h/cgi-";
-"bin/chpasswd.cgi\">ch