[MERGE]Merge with openobject-addons

[odoo/odoo.git] / addons / fetchmail / i18n / fr.po

diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 5f1da23..003d75d 100644 (file)
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-05-09 10:18+0000\n"
-"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-01-18 16:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-10 07:29+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -58,6 +58,11 @@ msgid "Not Confirmed"
 msgstr "Non confirmé"
 
 #. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Nom de l'utilisateur"
+
+#. module: fetchmail
 #: view:email.server:0
 msgid "Type"
 msgstr "Type"
@@ -98,9 +103,9 @@ msgid "# of emails"
 msgstr "# de courriels"
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nom de l'utilisateur"
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Historique des courriels"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
@@ -123,7 +128,6 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr "Courriels"
@@ -154,6 +158,11 @@ msgid "Mailgateway Message"
 msgstr "Message pour la passerelle de courriel"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr "Serveurs POP"
+
+#. module: fetchmail
 #: view:email.server:0
 msgid "Set to Draft"
 msgstr "Mettre à l'état \"Brouillon\""
@@ -165,10 +174,9 @@ msgid "Messages"
 msgstr "Messages"
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Email Servers"
-msgstr ""
+msgid "Fetchmail Services"
+msgstr "Services Fetchmail"
 
 #. module: fetchmail
 #: field:email.server,server:0
@@ -309,11 +317,5 @@ msgstr "Serveur de courriel"
 msgid "Fetch Emails"
 msgstr "Récupérer les courriels"
 
-#~ msgid "POP Servers"
-#~ msgstr "Serveurs POP"
-
-#~ msgid "Fetchmail Services"
-#~ msgstr "Services Fetchmail"
-
-#~ msgid "Email History"
-#~ msgstr "Historique des courriels"
+#~ msgid "IMAP Servers"
+#~ msgstr "Serveur IMAP"