diff --git a/apps/i2psnark/locale/messages_fr.po b/apps/i2psnark/locale/messages_fr.po
index f9f6d3c67..52accb53c 100644
--- a/apps/i2psnark/locale/messages_fr.po
+++ b/apps/i2psnark/locale/messages_fr.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: I2P i2psnark\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-03-25 12:48+0000\n"
-"PO-Revision-Date: 2011-04-07 10:58+0100\n"
+"PO-Revision-Date: 2011-04-09 03:00+0100\n"
 "Last-Translator: magma <magma@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "Language: \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"
+"Plural-Forms: nplurals=2; plural=(n >= 2)\n"
 "X-Poedit-Language: French\n"
 
 #: ../java/src/org/klomp/snark/SnarkManager.java:307
@@ -389,14 +389,14 @@ msgstr "Totaux"
 #, java-format
 msgid "1 torrent"
 msgid_plural "{0} torrents"
-msgstr[0] "1 torrent"
+msgstr[0] "{0} torrent"
 msgstr[1] "{0} torrents"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:408
 #, java-format
 msgid "1 connected peer"
 msgid_plural "{0} connected peers"
-msgstr[0] "1 pair connecté"
+msgstr[0] "{0} pair connecté"
 msgstr[1] "{0} pairs connectés"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:497
@@ -490,8 +490,8 @@ msgstr "Erreur du tracker"
 #, java-format
 msgid "1 peer"
 msgid_plural "{0} peers"
-msgstr[0] "1 Pair"
-msgstr[1] "{0} Pairs"
+msgstr[0] "{0} pair"
+msgstr[1] "{0} pairs"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:819
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:824
@@ -785,14 +785,14 @@ msgstr "Info d'empreinte incorrecte dans l'URL magnet {0}"
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
-msgstr[0] "1 saut"
+msgstr[0] "{0} saut"
 msgstr[1] "{0} sauts"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1501
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
-msgstr[0] "1 tunnel"
+msgstr[0] "{0} tunnel"
 msgstr[1] "{0} tunnels"
 
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1663
diff --git a/apps/susidns/locale/messages_fr.po b/apps/susidns/locale/messages_fr.po
index 48301ad1a..8d2c13c29 100644
--- a/apps/susidns/locale/messages_fr.po
+++ b/apps/susidns/locale/messages_fr.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: I2P susidns\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-03-24 16:49+0000\n"
-"PO-Revision-Date: 2011-04-07 12:19+0100\n"
+"PO-Revision-Date: 2011-04-09 02:53+0100\n"
 "Last-Translator: magma <magma@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
 "Language: \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"
+"Plural-Forms: nplurals=2; plural=(n >= 2)\n"
 
 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:200
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:193
diff --git a/apps/susimail/locale/messages_fr.po b/apps/susimail/locale/messages_fr.po
index a77b034d8..238ebd4e7 100644
--- a/apps/susimail/locale/messages_fr.po
+++ b/apps/susimail/locale/messages_fr.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: I2P susimail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-03-24 16:49+0000\n"
-"PO-Revision-Date: 2011-04-07 12:31+0100\n"
+"PO-Revision-Date: 2011-04-09 03:06+0100\n"
 "Last-Translator: magma <magma@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
 "Language: \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"
+"Plural-Forms: nplurals=2; plural=(n >= 2)\n"
 
 #: src/src/i2p/susi/webmail/WebMail.java:454
 msgid "unknown"
@@ -29,7 +29,7 @@ msgstr "Avertissement: pas d'encodage de transfert trouvé: retour en 7bits."
 #: src/src/i2p/susi/webmail/WebMail.java:478
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
-msgstr "Pas d''encodeur trouvé pour encoder \\''{0}\\''."
+msgstr "Pas d''encodeur trouvé pour encoder \"{0}\"."
 
 #: src/src/i2p/susi/webmail/WebMail.java:484
 msgid "Warning: no charset found, fallback to US-ASCII."
@@ -165,8 +165,8 @@ msgstr "Erreur de suppression du message: {0}"
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
-msgstr[0] "1 message supprimé"
-msgstr[1] "{0} message(s) supprimé(s)"
+msgstr[0] "{0} message supprimé"
+msgstr[1] "{0} messages supprimés"
 
 #: src/src/i2p/susi/webmail/WebMail.java:1264
 #: src/src/i2p/susi/webmail/WebMail.java:1587
@@ -177,8 +177,8 @@ msgstr "Identification"
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
-msgstr[0] "1 Message"
-msgstr[1] "{0} Message(s)"
+msgstr[0] "{0} Message"
+msgstr[1] "{0} Messages"
 
 #: src/src/i2p/susi/webmail/WebMail.java:1268
 msgid "Show Message"
@@ -369,8 +369,8 @@ msgstr "Taille"
 #, java-format
 msgid "1 Byte"
 msgid_plural "{0} Bytes"
-msgstr[0] "1 octet"
-msgstr[1] "{0} octet(s)"
+msgstr[0] "{0} octet"
+msgstr[1] "{0} octets"
 
 #: src/src/i2p/susi/webmail/WebMail.java:1644
 msgid "Mark All"