# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@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: squid3@treenet.co.nz-20090409134549-\
#   dw2hzbfqp4ys6qu3
# 
# Begin patch
=== modified file 'errors/TRANSLATORS'
--- errors/TRANSLATORS	2009-04-09 13:45:49 +0000
+++ errors/TRANSLATORS	2009-04-10 03:16:56 +0000
@@ -17,7 +17,7 @@
 	Martin Perner
 	Mohsen Saeedi <mohsen.saeedi@gmail.com>
 	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 +0000
+++ errors/fr.po	2009-04-11 18:00:53 +0000
@@ -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. <unknown>\n"
+"PO-Revision-Date: 2009-04-12 05:06+1300\n"
+"Last-Translator: Olivier W <pctuning@free.fr>\n"
 "Language-Team: Squid Developers <squid-dev@squid-cache.org>\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 "<a href=\"../\">Parent Directory</a> (<a href=\"/\">Root Directory</a>)"
 msgstr "<a href=\"../\">Répertoire Parent</a> (<a href=\"/\">Répertoire Racine</a>)"
@@ -327,8 +331,8 @@
 "have difficulties authenticating yourself or <a href=\"http://%h/cgi-bin/"
 "chpasswd.cgi\">change</a> your default password."
 msgstr ""
-"Veuillez contacter <a href=\"mailto:%w%W\">l'administrateur de cache</a>si "
-"vous avez des difficlutés à vous authentifier, ou<a href="
+"Veuillez contacter <a href=\"mailto:%w%W\">l'administrateur de cache</a> si "
+"vous avez des difficultés à vous authentifier, ou<a href="
 "\"http://%h/cgi-bin/chpasswd.cgi\">changez</a> 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 <a href=\"mailto:%w%W\">l'administrateur de cache</a>si "
+"Veuillez contacter <a href=\"mailto:%w%W\">l'administrateur de cache</a> si "
 "vous avez des difficultés à vous authentifier ou, si "
 "vous <em>êtes</em> 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 <q>only-if-cached</q> a été spécifiée."
-"e."
 
 #: templates/ERR_FTP_PUT_ERROR:4
 msgid "While trying to PUT the following URL: <a href=\"%U\">%U</a>"

# Begin bundle
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