Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0

29 files changed, 7106 insertions, 4751 deletions

diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index 2d90f5d2648..31d8c62800c 100644
--- a/addons/fetchmail/i18n/bg.po
+++ b/addons/fetchmail/i18n/bg.po
@@ -7,304 +7,372 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-03-14 16:36+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Потвърден"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Внимание! Запис за избрания модел не може да бъде създаден\n"
-"Моля, изберете валиден модел."
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Потвърден"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Потвърди"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Групиране по..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Приоритена на сървър"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Състояние"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Не потвърден"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Име на потребител"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Тип"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Сървъри"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Описание"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Сървър"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Добавете прикрепен файл"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# имейли"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Потребител"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Дата"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# имейли"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Парола"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Имейли"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Търсене на мейл сървъри"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Сървъри и вход"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Автоматичен отговор?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Име"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Сървъри"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Пращане в проект"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Съобщения"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Сървър"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Активен"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Сървър"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Модел"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Сървър"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Внимание! Не може да се дублира конфигурация на сървър!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Парола"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Тип сървър"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Данни за вход"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Информация за сървър"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Сървър"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Сървъри и вход"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Приоритет от 0 до 10 изберете за да определите реда на обработка"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Не потвърден"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Приоритена на сървър"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Сървър"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Пощенски сървър"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "User Name"
+#~ msgstr "Име на потребител"
+
+#~ msgid "Confirm"
+#~ msgstr "Потвърди"
+
+#~ msgid "Group By..."
+#~ msgstr "Групиране по..."
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Внимание! Запис за избрания модел не може да бъде създаден\n"
+#~ "Моля, изберете валиден модел."
+
+#~ msgid "Description"
+#~ msgstr "Описание"
+
+#~ msgid "User"
+#~ msgstr "Потребител"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Добавете прикрепен файл"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Пращане в проект"
+
+#~ msgid "Emails"
+#~ msgstr "Имейли"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Автоматичен отговор?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Търсене на мейл сървъри"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Внимание! Не може да се дублира конфигурация на сървър!"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Server"
+#~ msgstr "Сървър"
+
+#~ msgid "Model"
+#~ msgstr "Модел"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Приоритет от 0 до 10 изберете за да определите реда на обработка"
 
 #~ msgid "Email Servers"
 #~ msgstr "Имейл сървъри"
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index 2ff7beed7ef..7509c5338b3 100644
--- a/addons/fetchmail/i18n/ca.po
+++ b/addons/fetchmail/i18n/ca.po
@@ -7,315 +7,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-04-10 14:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmat"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Atenció! No es poden crear registres per al model seleccionat\n"
-"Seleccioneu un model vàlid"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmat"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirma"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Agrupa per..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Estat"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "No confirmat"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nom de l'usuari"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipus"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Servidores POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Servidor Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descripció"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"Model OpenObject. Genera un registre d'aquest model.\n"
-"Seleccioneu un objecte amb atributs message_new (nou missatge)."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Afegeix adjunts?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "nombre d'emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historial d'emails"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Usuari"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "nombre d'emails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Esperant verificació"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Contrasenya"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Buscar servidores de correo"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Servidor i connexió"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "¿Auto responder?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nom"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Missatge passarel·la de correu"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Servidores POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Canvia a esborrany"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Missatges"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Servicios Fetchmail"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Missatges"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Servidor"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Actiu"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Paràmetre procés"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Contrasenya"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipus de servidor"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informació de connexió"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informació del servidor"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Si está marcado, obtiene correo con documentos adjuntos."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Servidor POP"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Recuperar email des de servidor POP / IMAP\n"
-"    * Compatibilitat amb SSL\n"
-"    * Integració amb tots els mòduls\n"
-"    * Recepció automàtica d'emails\n"
-"    * Registres basats en email (afegir, actualitzar)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Servidor i connexió"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Una acció de servidor de correu. S'executarà sempre que s'obtingui un email "
-"des del servidor."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioritat entre 0 i 10, defineix l'ordre de procés."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Acción d'email del servidor"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmat"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioridad servidor"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Servidor POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Servidor de correu"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Recupera emails"
+#~ msgid "User Name"
+#~ msgstr "Nom de l'usuari"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirma"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupa per..."
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Atenció! No es poden crear registres per al model seleccionat\n"
+#~ "Seleccioneu un model vàlid"
+
+#~ msgid "Description"
+#~ msgstr "Descripció"
+
+#~ msgid "User"
+#~ msgstr "Usuari"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Afegeix adjunts?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Esperant verificació"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "Model OpenObject. Genera un registre d'aquest model.\n"
+#~ "Seleccioneu un objecte amb atributs message_new (nou missatge)."
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Servidor Fetchmail"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Canvia a esborrany"
+
+#~ msgid "Emails"
+#~ msgstr "Emails"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "¿Auto responder?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Buscar servidores de correo"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Missatge passarel·la de correu"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Paràmetre procés"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioritat entre 0 i 10, defineix l'ordre de procés."
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Recuperar email des de servidor POP / IMAP\n"
+#~ "    * Compatibilitat amb SSL\n"
+#~ "    * Integració amb tots els mòduls\n"
+#~ "    * Recepció automàtica d'emails\n"
+#~ "    * Registres basats en email (afegir, actualitzar)\n"
+#~ "    "
+
+#~ msgid "Email Server Action"
+#~ msgstr "Acción d'email del servidor"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Una acció de servidor de correu. S'executarà sempre que s'obtingui un email "
+#~ "des del servidor."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Recupera emails"
 
 #~ msgid "Email Servers"
 #~ msgstr "Servidores de correo"
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 858468a858c..d22fae7667f 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-12-29 12:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,308 +14,417 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bestätigt"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Warnung ! Datensatz für das ausgewählte Modul kann nicht erstellt werden\n"
-"Bitte wählen Sie ein gültiges Modul aus"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Bestätigt"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Bestätigen"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Gruppierung..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Priorität Server"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nicht Bestätigt"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Benutzer Name"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Typ"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Server"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Beschreibung"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject Modul. Erzeugt einen Datensatz aus diesem Modul.\n"
-"Wähle Objekt mit message_new Attribut."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Hinzufügen Anhang ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# EMails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historie Email"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Benutzer"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# EMails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Warte auf Verifizierung"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Passwort"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Email Konfiguration"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Suche Mailserver"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Antwort?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Bezeich."
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway Nachricht"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Zurücksetzen"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "EMail Nachrichten"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail Service"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "EMail Nachrichten"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktiv"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parameter Prozess"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modul"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Warnung ! Doppelte Server Konfiguration ist nicht möglich !"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Passwort"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Server Typ"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Login Information"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Server Information"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Emails mit Dateianhängen abholen"
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Importiere Email von Pop / IMAP Server\n"
-"    * Support von SSL\n"
-"    * Integration in alle Module\n"
-"    * Automatischer Email Empfang\n"
-"    * Mailbasierte Daten (Hinzuf., Update)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Eine Aktion durch den EMail Server. Die Aktion läuft immer bei Abholung der "
-"Emails von einem anderen Server."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Priorität 0 bis 10, wähle entsprechende Reihenfolge"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "EMail Serveraktion"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nicht Bestätigt"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Priorität Server"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Mail Server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Abholen Emails"
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Server"
+
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Hinzufügen Anhang ?"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Zurücksetzen"
+
+#~ msgid "User Name"
+#~ msgstr "Benutzer Name"
+
+#~ msgid "User"
+#~ msgstr "Benutzer"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Warte auf Verifizierung"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Antwort?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mailgateway Nachricht"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parameter Prozess"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Model"
+#~ msgstr "Modul"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Importiere Email von Pop / IMAP Server\n"
+#~ "    * Support von SSL\n"
+#~ "    * Integration in alle Module\n"
+#~ "    * Automatischer Email Empfang\n"
+#~ "    * Mailbasierte Daten (Hinzuf., Update)\n"
+#~ "    "
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Priorität 0 bis 10, wähle entsprechende Reihenfolge"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Abholen Emails"
+
+#~ msgid "Emails"
+#~ msgstr "Email Konfiguration"
+
+#~ msgid "Confirm"
+#~ msgstr "Bestätigen"
+
+#~ msgid "Group By..."
+#~ msgstr "Gruppierung..."
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Suche Mailserver"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Emails mit Dateianhängen abholen"
 
 #~ msgid "Email Servers"
 #~ msgstr "EMail Server"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Eine Aktion durch den EMail Server. Die Aktion läuft immer bei Abholung der "
+#~ "Emails von einem anderen Server."
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject Modul. Erzeugt einen Datensatz aus diesem Modul.\n"
+#~ "Wähle Objekt mit message_new Attribut."
+
+#~ msgid "Email Server Action"
+#~ msgstr "EMail Serveraktion"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Warnung ! Doppelte Server Konfiguration ist nicht möglich !"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Warnung ! Datensatz für das ausgewählte Modul kann nicht erstellt werden\n"
+#~ "Bitte wählen Sie ein gültiges Modul aus"
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index fd33daa52eb..d4291996e9a 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.po
@@ -7,299 +7,320 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-08-23 14:49+0000\n"
 "Last-Translator: Tryfon Farmakakis <farmakakistryfon@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Μη Επιβεβαιωμένο"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
+#: field:fetchmail.server,port:0
+msgid "Port"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
+#: field:fetchmail.server,user:0
+msgid "Username"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Προσθήκη Επισυνάψεων;"
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: view:fetchmail.server:0
+msgid "SSL"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: view:fetchmail.server:0
+msgid "# of emails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Αναζήτηση Εξυπηρτεητή Email"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Αυτόματη Απάντηση;"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
+#: view:fetchmail.server:0
+msgid "IMAP"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
+#: field:fetchmail.server,password:0
+msgid "Password"
 msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
+#: view:fetchmail.server:0
+msgid "Server & Login"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Μη Επιβεβαιωμένο"
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
+#: view:mail.message:0
+msgid "Mail Server"
 msgstr ""
 
-#. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#~ msgid "Add Attachments ?"
+#~ msgstr "Προσθήκη Επισυνάψεων;"
 
-#. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
-msgid "Mail Server"
-msgstr ""
+#~ msgid "Auto Reply?"
+#~ msgstr "Αυτόματη Απάντηση;"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "Search Email Servers"
+#~ msgstr "Αναζήτηση Εξυπηρτεητή Email"
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
index 8514c567a61..2e11e5b2d90 100644
--- a/addons/fetchmail/i18n/en_GB.po
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -7,315 +7,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-09-13 09:02+0000\n"
 "Last-Translator: John Bradshaw <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmed"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmed"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirm"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Group By..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Server Priority"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "State"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Not Confirmed"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "User Name"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Type"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Servers"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Description"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Add Attachments ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# of emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Email History"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "User"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Date"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# of emails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Waiting for Verification"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Password"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Search Email Servers"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Reply?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Name"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mail gateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Set to Draft"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail Services"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Messages"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Active"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Password"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Server Type"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Login Information"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Server Information"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Fetches mail with attachments if true."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Email Server Action"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Not Confirmed"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Server Priority"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Mail Server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Fetch Emails"
+#~ msgid "Confirm"
+#~ msgstr "Confirm"
+
+#~ msgid "Group By..."
+#~ msgstr "Group By..."
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Server"
+
+#~ msgid "User"
+#~ msgstr "User"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Add Attachments ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Waiting for Verification"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+
+#~ msgid "User Name"
+#~ msgstr "User Name"
+
+#~ msgid "Emails"
+#~ msgstr "Emails"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Set to Draft"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Reply?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Search Email Servers"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mail gateway Message"
 
 #~ msgid "Email Servers"
 #~ msgstr "Email Servers"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Warning! Can't have duplicate server configuration!"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Process Parameter"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Priority between 0 to 10, select define the order of Processing"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+
+#~ msgid "Email Server Action"
+#~ msgstr "Email Server Action"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Fetches mail with attachments if true."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Fetch Emails"
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index 1cd8db90ad9..be521a20518 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-12-22 08:38+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -15,308 +15,417 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"¡Atención! No se pueden crear registros para el modelo seleccionado\n"
-"Seleccione un modelo válido"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confimar"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridad servidor"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "No confirmado"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nombre usuario"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipo"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Puerto"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Servidores POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Servidor Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descripción"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"Modelo OpenObject. Genera un registro de este modelo.\n"
-"Seleccione un objeto con atributos message_new (nuevo mensaje)."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "¿Añadir adjuntos?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "número de emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historial email"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Fecha"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "número de emails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Esperando verificación"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Contraseña"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Buscar servidores de correo"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Servidor y conexión"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "¿Auto responder?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nombre"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensaje pasarela de correo"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Servidores POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Mensajes"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Servicios Fetchmail"
-
-#. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Servidor"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parámetro proceso"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipo servidor"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Información conexión"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Información servidor"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Si está marcado, obtiene correo con documentos adjuntos."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Servidor POP"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Puerto"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Recuperar email desde servidor POP / IMAP\n"
-"    * Compatibilidad con SSL\n"
-"    * Integración con todos los módulos\n"
-"    * Recepción automática de emails\n"
-"    * Registros basados en email (añadir, actualizar)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Servidor y conexión"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Una acción de servidor de correo. Se ejecutará siempre que se obtenga un "
-"email desde el servidor."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioridad entre 0 y 10, define el orden de proceso."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Acción de correo electrónico del servidor"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "No confirmado"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioridad servidor"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Servidor POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Servidor correo"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Recuperar emails"
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "User Name"
+#~ msgstr "Nombre usuario"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "¿Añadir adjuntos?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Esperando verificación"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Servidor Fetchmail"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "¿Auto responder?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mensaje pasarela de correo"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parámetro proceso"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Recuperar email desde servidor POP / IMAP\n"
+#~ "    * Compatibilidad con SSL\n"
+#~ "    * Integración con todos los módulos\n"
+#~ "    * Recepción automática de emails\n"
+#~ "    * Registros basados en email (añadir, actualizar)\n"
+#~ "    "
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioridad entre 0 y 10, define el orden de proceso."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Recuperar emails"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Buscar servidores de correo"
+
+#~ msgid "Emails"
+#~ msgstr "Emails"
+
+#~ msgid "Confirm"
+#~ msgstr "Confimar"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar por..."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
 
 #~ msgid "Email Servers"
 #~ msgstr "Servidores de correo"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "¡Aviso! No puede tener la configuración del servidor duplicada."
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Si está marcado, obtiene correo con documentos adjuntos."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Una acción de servidor de correo. Se ejecutará siempre que se obtenga un "
+#~ "email desde el servidor."
+
+#~ msgid "Email Server Action"
+#~ msgstr "Acción de correo electrónico del servidor"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "Modelo OpenObject. Genera un registro de este modelo.\n"
+#~ "Seleccione un objeto con atributos message_new (nuevo mensaje)."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "¡Atención! No se pueden crear registros para el modelo seleccionado\n"
+#~ "Seleccione un modelo válido"
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
index 6a0486f4cbd..aabb7b424f7 100644
--- a/addons/fetchmail/i18n/et.po
+++ b/addons/fetchmail/i18n/et.po
@@ -7,299 +7,353 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-10-11 18:02+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Kinnitatud"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Kinnitatud"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Kinnita"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupeeri..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Olek"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Kinnitamata"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Kasutajanimi"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tüüp"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP serverid"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Kirjeldus"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Kasutaja"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Kuupäev"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Salasõna"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-kirjad"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automaatvastus"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nimi"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP serverid"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Määra mustandiks"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Sõnumid"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail teenused"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Sõnumid"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktiivne"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Mudel"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP server"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Salasõna"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Serveri tüüp"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Sisselogimise info"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Serveri info"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP server"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Kinnitamata"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr ""
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "User Name"
+#~ msgstr "Kasutajanimi"
+
+#~ msgid "Confirm"
+#~ msgstr "Kinnita"
+
+#~ msgid "Group By..."
+#~ msgstr "Grupeeri..."
+
+#~ msgid "Type"
+#~ msgstr "Tüüp"
+
+#~ msgid "Description"
+#~ msgstr "Kirjeldus"
+
+#~ msgid "User"
+#~ msgstr "Kasutaja"
+
+#~ msgid "Date"
+#~ msgstr "Kuupäev"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail server"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Määra mustandiks"
+
+#~ msgid "Emails"
+#~ msgstr "E-kirjad"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automaatvastus"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Model"
+#~ msgstr "Mudel"
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index 75000114b5c..21733bcc02d 100644
--- a/addons/fetchmail/i18n/fi.po
+++ b/addons/fetchmail/i18n/fi.po
@@ -7,308 +7,401 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-08-04 10:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Varoitus! Tietoja valitulle mallille ei voitu luoda\n"
-"Ole hyvä ja valitse voimassaoleva malli"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Vahvistettu"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Hyväksy"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Palvelimen prioriteetti"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Tila"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Ei vahvistettu"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Käyttäjätunnus"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tyyppi"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Portti"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP palvelimet"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Kuvaus"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP palvelin"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject malli. Luo tiedot tästä mallista.\n"
-"Valitse objekti jolla on attribuutit message_new. (uusi viesti)"
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Lisää liitetiedostot ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "Sähköpostien määrä"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Käyttäjä"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Päiväys"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "Sähköpostien määrä"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Odotetaan vahvistusta"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Salasana"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Sähköpostit"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Hae sähköpostipalvelimia"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Palvelin ja kirjautuminen"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automaattivastaus?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nimi"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "sähköpostivälittäjän viesti"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Aseta luonnokseksi"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Viestit"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Palvelin"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktiivinen"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Prosessin parametri"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IAMP palvelin"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Malli"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP palvelin"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Salasana"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Varoitus! Ei voi olla kahta palvelinkonfiguraatiota!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Palvelimen tyyppi"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Kirjautumistiedot"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Syötää sähköposteja liitteineen jos tosi (true)."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP palvelin"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Portti"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Palvelin ja kirjautuminen"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Sähköpostipalvelimen toiminto. Suoritetaan kun sähköpostia haetaan "
-"palvelimelta."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioriteetti välillä 0 ... 10. Määrittelee prosessointijärjestyksen"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Sähköpostipalvelimen toiminto"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Ei vahvistettu"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Palvelimen prioriteetti"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP palvelin"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Sähköpostipalvelin"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Hae sähköpostit"
+#~ msgid "Type"
+#~ msgstr "Tyyppi"
+
+#~ msgid "Confirm"
+#~ msgstr "Hyväksy"
+
+#~ msgid "Group By..."
+#~ msgstr "Ryhmittely.."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Varoitus! Tietoja valitulle mallille ei voitu luoda\n"
+#~ "Ole hyvä ja valitse voimassaoleva malli"
+
+#~ msgid "Date"
+#~ msgstr "Päiväys"
+
+#~ msgid "User"
+#~ msgstr "Käyttäjä"
+
+#~ msgid "User Name"
+#~ msgstr "Käyttäjätunnus"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Lisää liitetiedostot ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Odotetaan vahvistusta"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject malli. Luo tiedot tästä mallista.\n"
+#~ "Valitse objekti jolla on attribuutit message_new. (uusi viesti)"
+
+#~ msgid "Emails"
+#~ msgstr "Sähköpostit"
+
+#~ msgid "Description"
+#~ msgstr "Kuvaus"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Aseta luonnokseksi"
+
+#~ msgid "Server"
+#~ msgstr "Palvelin"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automaattivastaus?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Hae sähköpostipalvelimia"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "sähköpostivälittäjän viesti"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Varoitus! Ei voi olla kahta palvelinkonfiguraatiota!"
+
+#~ msgid "Model"
+#~ msgstr "Malli"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Prosessin parametri"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioriteetti välillä 0 ... 10. Määrittelee prosessointijärjestyksen"
+
+#~ msgid "Email Server Action"
+#~ msgstr "Sähköpostipalvelimen toiminto"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Syötää sähköposteja liitteineen jos tosi (true)."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Sähköpostipalvelimen toiminto. Suoritetaan kun sähköpostia haetaan "
+#~ "palvelimelta."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Hae sähköpostit"
 
 #~ msgid "Email Servers"
 #~ msgstr "sähköpostipalvelimet"
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index fd4307ead5c..54db4e889a7 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -6,317 +6,426 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+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-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmé"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Avertissement! l'enregistrement pour le modèle sélectionné ne peut être "
-"créer\n"
-"Veuillez choisir un modèle valide"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmé"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirmer"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grouper par ..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Priorité du serveur"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "État"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Non confirmé"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nom de l'utilisateur"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Type"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Serveurs POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Serveur Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Description"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Serveur POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"Model OpenObject. Générer un enregistrement pour ce modèle.\n"
-"Sélectionner un objet avec l'attribut message_new"
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Ajouter des pièces jointes ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# de courriels"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historique des courriels"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Utilisateur"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Date"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# de courriels"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "En attente de vérification"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Mot de passe"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Courriels"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Rechercher des serveurs de courriel"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Serveur et login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Réponse automatique ?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nom"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Message pour la passerelle de courriel"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Serveurs POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Mettre à l'état \"Brouillon\""
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Services Fetchmail"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Messages"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Serveur"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Actif"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Paramètre du processus"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Serveur IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modèle"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Serveur POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Mot de passe"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
-"Avertissement! vous ne pouvez pas dupliquer une configuration de serveur!"
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Type de serveur"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Information de connexion"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Information du serveur"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Récupérer les courriels avec attachements si vrai"
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Serveur POP"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * récupère les courriels depuis le serveur POP/IMAP\n"
-"    * est compatible avec SSL \n"
-"    * est intégré à tous les modules\n"
-"    * réceptionne automatiquement les courriels\n"
-"    * enregistre les courriels (ajouts, mises à jour)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Serveur et login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Un courriel du Server Action. Il sera lancé lorsqu'un email sera récupérer "
-"sur le serveur."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Priorité entre 0 et 10, qui définit l'ordre de traitement"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Courriel du Server Action"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Non confirmé"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Priorité du serveur"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Serveur POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Serveur de courriel"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Récupérer les courriels"
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid "User Name"
+#~ msgstr "Nom de l'utilisateur"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Serveur Fetchmail"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "Model"
+#~ msgstr "Modèle"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Priorité entre 0 et 10, qui définit l'ordre de traitement"
+
+#~ msgid "User"
+#~ msgstr "Utilisateur"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Mettre à l'état \"Brouillon\""
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Ajouter des pièces jointes ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "En attente de vérification"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Message pour la passerelle de courriel"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Réponse automatique ?"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Récupérer les courriels"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * récupère les courriels depuis le serveur POP/IMAP\n"
+#~ "    * est compatible avec SSL \n"
+#~ "    * est intégré à tous les modules\n"
+#~ "    * réceptionne automatiquement les courriels\n"
+#~ "    * enregistre les courriels (ajouts, mises à jour)\n"
+#~ "    "
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmer"
+
+#~ msgid "Group By..."
+#~ msgstr "Grouper par ..."
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "Model OpenObject. Générer un enregistrement pour ce modèle.\n"
+#~ "Sélectionner un objet avec l'attribut message_new"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Avertissement! l'enregistrement pour le modèle sélectionné ne peut être "
+#~ "créer\n"
+#~ "Veuillez choisir un modèle valide"
+
+#~ msgid "Emails"
+#~ msgstr "Courriels"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr ""
+#~ "Avertissement! vous ne pouvez pas dupliquer une configuration de serveur!"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Un courriel du Server Action. Il sera lancé lorsqu'un email sera récupérer "
+#~ "sur le serveur."
+
+#~ msgid "Email Server Action"
+#~ msgstr "Courriel du Server Action"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Paramètre du processus"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Rechercher des serveurs de courriel"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Récupérer les courriels avec attachements si vrai"
 
 #~ msgid "Email Servers"
 #~ msgstr "Serveurs de courriels"
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index daeff566ca9..b91f6c1a0d7 100644
--- a/addons/fetchmail/i18n/gl.po
+++ b/addons/fetchmail/i18n/gl.po
@@ -7,313 +7,422 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-02-22 22:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Atención! Non se poden crear rexistros para o modelo seleccionado\n"
-"Seleccione un modelo válido"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirmar"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Agrupar por ..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridade de servidor"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Provincia"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Non confirmado"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nome de usuario"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipo"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Porto"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Servidores POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Servidor Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descrición"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"Modelo OpenObject. Xenera un rexistro deste modelo.\n"
-"Seleccione un obxeto con atributos message_new (nova mensaxe)."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Engadir adxuntos?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# de correos electrónicos"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historial de correos electrónicos"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# de correos electrónicos"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Esperando verificación"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Contrasinal"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Correos electrónicos"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Buscar servidores de correo electrónico"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Servidor e conexión"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto respostar?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensaxe da pasarela de correo electrónico"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Servidores POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Establecer como Borrador"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Mensaxes"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Servicios Fetchmail"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Mensaxes"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Servidor"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parámetro de proceso"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Aviso! Non pode ter a configuración do servidor duplicada"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Contrasinal"
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipo de servidor"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Información de Autentificación"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Información do servidor"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
-"Se está seleccionado, obten correo electrónico con documentos adxuntos"
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Servidor POP"
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Porto"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Recuperar email dende servidor POP / IMAP\n"
-"    * Compatibilidade con SSL\n"
-"    * Integración con todos os módulos\n"
-"    * Recepción automática de emails\n"
-"    * Rexistros baseados no email (engadir, actualizar)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Servidor e conexión"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Acción de servidor de correo electrónico. Executarase sempre que se obteña "
-"un correo electrónico dende o servidor."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioridade entre 0 e 10, define a orde de proceso."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Acción do servidor de correo electrónico"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Non confirmado"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioridade de servidor"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Servidor POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Servidor de correo"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Recuperar correos electrónicos"
+#~ msgid "User Name"
+#~ msgstr "Nome de usuario"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar por ..."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Atención! Non se poden crear rexistros para o modelo seleccionado\n"
+#~ "Seleccione un modelo válido"
+
+#~ msgid "Description"
+#~ msgstr "Descrición"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Engadir adxuntos?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Esperando verificación"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "Modelo OpenObject. Xenera un rexistro deste modelo.\n"
+#~ "Seleccione un obxeto con atributos message_new (nova mensaxe)."
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Servidor Fetchmail"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mensaxe da pasarela de correo electrónico"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Establecer como Borrador"
+
+#~ msgid "Emails"
+#~ msgstr "Correos electrónicos"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto respostar?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Buscar servidores de correo electrónico"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Aviso! Non pode ter a configuración do servidor duplicada"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parámetro de proceso"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioridade entre 0 e 10, define a orde de proceso."
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Recuperar email dende servidor POP / IMAP\n"
+#~ "    * Compatibilidade con SSL\n"
+#~ "    * Integración con todos os módulos\n"
+#~ "    * Recepción automática de emails\n"
+#~ "    * Rexistros baseados no email (engadir, actualizar)\n"
+#~ "    "
+
+#~ msgid "Email Server Action"
+#~ msgstr "Acción do servidor de correo electrónico"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr ""
+#~ "Se está seleccionado, obten correo electrónico con documentos adxuntos"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Acción de servidor de correo electrónico. Executarase sempre que se obteña "
+#~ "un correo electrónico dende o servidor."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Recuperar correos electrónicos"
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
index 8cba2911ee3..4b10e6503ed 100644
--- a/addons/fetchmail/i18n/hr.po
+++ b/addons/fetchmail/i18n/hr.po
@@ -7,299 +7,332 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-12-19 17:13+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-20 04:50+0000\n"
-"X-Generator: Launchpad (build 14538)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Potvrdi"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stanje"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nepotvrđeno"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Korisničko ime"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Vrsta"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Servers"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Opis"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: view:fetchmail.server:0
+msgid "SSL"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: view:fetchmail.server:0
+msgid "# of emails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Lozinka"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
+#: view:fetchmail.server:0
+msgid "IMAP"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr ""
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Lozinka"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
+#: view:fetchmail.server:0
+msgid "Server & Login"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepotvrđeno"
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
+#: view:mail.message:0
+msgid "Mail Server"
 msgstr ""
 
-#. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#~ msgid "User Name"
+#~ msgstr "Korisničko ime"
 
-#. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
-msgid "Mail Server"
-msgstr ""
+#~ msgid "Group By..."
+#~ msgstr "Grupiraj po..."
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "Type"
+#~ msgstr "Vrsta"
+
+#~ msgid "Confirm"
+#~ msgstr "Potvrdi"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "User"
+#~ msgstr "Korisnik"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 63bae119942..824617b5d97 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-19 14:10+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,301 +14,397 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Megerősítve"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Figyelem! A rekord a kiválasztott modellel nem hozható létre\n"
-"Kérjük, válasszon érvényes modellt"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Megerősítve"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Megerősítés"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Szerver prioritás"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Állapot"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nincs megerősítve"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Felhasználónév"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Típus"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Szerverek"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Szerver"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Leírás"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Szerver"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Valóban szeretne hozzáadni mellékleteket ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "E-mailek száma"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "E-mail előzmény"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Felhasználó"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Dátum"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "E-mailek száma"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Ellenőrzésre várva"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Jelszó"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-mailek"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "E-mail szerverek keresése"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Szerver & Bejelentkezés"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automata válasz küldése?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Név"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway üzenet"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Szerverek"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Beállítás tervezetnek"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Üzenetek"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail szolgáltatások"
-
-#. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Szerver"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktív"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Folyamat paraméter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Szerver"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modell"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Szerver"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Figyelem! Nem lehet párhuzamos szerver konfiguráció!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Jelszó"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Szervertípus"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Bejelentkezési információk"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Szerver információk"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Letölti a levelet mellékletekkel."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Szerver"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Letölti a leveleket  Pop / IMAP szerverről\n"
-"    * SSL-támogatés\n"
-"    * Integrált az összes modillal\n"
-"    * E-mailek automatikus fogadása\n"
-"    * E-mailen alapuló rekordok (hozzáadás, frissítés)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Szerver & Bejelentkezés"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "E-mail Szerverművelet"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nincs megerősítve"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Szerver prioritás"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Szerver"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Levelezőszerver"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "E-mailek letöltése"
+#~ msgid "User Name"
+#~ msgstr "Felhasználónév"
+
+#~ msgid "Confirm"
+#~ msgstr "Megerősítés"
+
+#~ msgid "Group By..."
+#~ msgstr "Csoportosítás..."
+
+#~ msgid "Type"
+#~ msgstr "Típus"
+
+#~ msgid "Description"
+#~ msgstr "Leírás"
+
+#~ msgid "User"
+#~ msgstr "Felhasználó"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Valóban szeretne hozzáadni mellékleteket ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Ellenőrzésre várva"
+
+#~ msgid "Date"
+#~ msgstr "Dátum"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Szerver"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Beállítás tervezetnek"
+
+#~ msgid "Emails"
+#~ msgstr "E-mailek"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automata válasz küldése?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "E-mail szerverek keresése"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mailgateway üzenet"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Figyelem! Nem lehet párhuzamos szerver konfiguráció!"
+
+#~ msgid "Server"
+#~ msgstr "Szerver"
+
+#~ msgid "Model"
+#~ msgstr "Modell"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Folyamat paraméter"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Letölti a leveleket  Pop / IMAP szerverről\n"
+#~ "    * SSL-támogatés\n"
+#~ "    * Integrált az összes modillal\n"
+#~ "    * E-mailek automatikus fogadása\n"
+#~ "    * E-mailen alapuló rekordok (hozzáadás, frissítés)\n"
+#~ "    "
+
+#~ msgid "Email Server Action"
+#~ msgstr "E-mail Szerverművelet"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Letölti a levelet mellékletekkel."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "E-mailek letöltése"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Figyelem! A rekord a kiválasztott modellel nem hozható létre\n"
+#~ "Kérjük, válasszon érvényes modellt"
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index 09845f18fb7..57c60e7f730 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.po
@@ -7,313 +7,411 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-12 16:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confermato"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Attenzione! Il record per il modello selezionato non può essere creato\n"
-"Per favore scegliere un modello valido"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confermato"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Conferma"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Priorità server"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stato"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Non confermato"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nome Utente"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipo"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Porta"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP / IMAP Server"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Server Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descrizione"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Server POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Aggiungere Attachment?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# di email"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Storico email"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Utente"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# di email"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "In attesa di verifica"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Password"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Email"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Cerca email server"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto risposta?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Messaggio server mail"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Server POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Imposta come Bozza"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Messaggi"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Serizio recupero posta"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Messaggi"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Attivo"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parametro Processo"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Server IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modello"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Server POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipo di Server"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informazioni di accesso"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informazioni sul server"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Recupera mail con attachment se \"vero\"."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Server POP"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Porta"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Recupera email da server POP / IMAP\n"
-"    * Supporta SSL\n"
-"    * Integrato con tutti i moduli\n"
-"    * Ricezione automatica email\n"
-"    * Record basati su email (Aggiungi, Aggiorna)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Una azione email server. Essa verrà lanciata quando un'email sarà stata "
-"prelevata dal server."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Azione server email"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Non confermato"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Priorità server"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Server POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Mail Server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Preleva email"
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
+#~ msgid "User"
+#~ msgstr "Utente"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Imposta come Bozza"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "User Name"
+#~ msgstr "Nome Utente"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Model"
+#~ msgstr "Modello"
+
+#~ msgid "Confirm"
+#~ msgstr "Conferma"
+
+#~ msgid "Group By..."
+#~ msgstr "Raggruppa per..."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Server Fetchmail"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Aggiungere Attachment?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "In attesa di verifica"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto risposta?"
+
+#~ msgid "Emails"
+#~ msgstr "Email"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL?"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Recupera email da server POP / IMAP\n"
+#~ "    * Supporta SSL\n"
+#~ "    * Integrato con tutti i moduli\n"
+#~ "    * Ricezione automatica email\n"
+#~ "    * Record basati su email (Aggiungi, Aggiorna)\n"
+#~ "    "
 
 #~ msgid "Email Servers"
 #~ msgstr "Server Email"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Recupera mail con attachment se \"vero\"."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Attenzione! Il record per il modello selezionato non può essere creato\n"
+#~ "Per favore scegliere un modello valido"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Una azione email server. Essa verrà lanciata quando un'email sarà stata "
+#~ "prelevata dal server."
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Cerca email server"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parametro Processo"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Preleva email"
+
+#~ msgid "Email Server Action"
+#~ msgstr "Azione server email"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Messaggio server mail"
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index e485362a242..6b4c79362fe 100644
--- a/addons/fetchmail/i18n/lt.po
+++ b/addons/fetchmail/i18n/lt.po
@@ -7,301 +7,381 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-16 21:18+0000\n"
-"Last-Translator: Paulius Sladkevičius - inovera.lt <komsas@gmail.com>\n"
+"Last-Translator: Paulius Sladkevičius <komsas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Patvirtinta"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Klaida! Įrašas pasirinktam modeliui negali būti sukurtas\n"
-"Prašome pasirinkite tinkamą modelį"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Patvirtinta"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Patvirtinti"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupuoti pagal..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Serverio prioritetas"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Būsena"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nepatvirtinta"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Naudotojo vardas"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipas"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Prievadas"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP serveriai"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail serveris"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Aprašymas"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP serveris"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Pridėti priedus?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# el. laiškų"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "El. pašto istorija"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Naudotojas"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# el. laiškų"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Laukiama patvirtinimo"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Slaptažodis"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "El. laiškai"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Serveris ir prisijungimas"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automatiškai atsakyti?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "El. pašto šliuzo žinutė"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP serveris"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Nustatyti kaip juodraštį"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Žinutė"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail paslaugos"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Žinutė"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Serveris"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktyvus"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP serveris"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelis"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP serveris"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Įspėjimas! Jūs negalite padaryti serverio konfigūravimo kopijos!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Slaptažodis"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Serverio tipas"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Prisijungimo informacija"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Serverio informacija"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Jeigu pažymėta, parsiunčia el. laiškus su priedais"
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP serveros"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Prievadas"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Serveris ir prisijungimas"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "El. pašto serverio veiksmas"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepatvirtinta"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Serverio prioritetas"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP serveros"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Pašto serveris"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Gauti laiškus"
+#~ msgid "Type"
+#~ msgstr "Tipas"
+
+#~ msgid "User Name"
+#~ msgstr "Naudotojo vardas"
+
+#~ msgid "Confirm"
+#~ msgstr "Patvirtinti"
+
+#~ msgid "Group By..."
+#~ msgstr "Grupuoti pagal..."
+
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
+#~ msgid "User"
+#~ msgstr "Naudotojas"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Laukiama patvirtinimo"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Pridėti priedus?"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Nustatyti kaip juodraštį"
+
+#~ msgid "Emails"
+#~ msgstr "El. laiškai"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automatiškai atsakyti?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "El. pašto šliuzo žinutė"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Įspėjimas! Jūs negalite padaryti serverio konfigūravimo kopijos!"
+
+#~ msgid "Server"
+#~ msgstr "Serveris"
+
+#~ msgid "Model"
+#~ msgstr "Modelis"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Email Server Action"
+#~ msgstr "El. pašto serverio veiksmas"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Jeigu pažymėta, parsiunčia el. laiškus su priedais"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Gauti laiškus"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail serveris"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Klaida! Įrašas pasirinktam modeliui negali būti sukurtas\n"
+#~ "Prašome pasirinkite tinkamą modelį"
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index 0049c3c4fe9..f6a31d1d884 100644
--- a/addons/fetchmail/i18n/lv.po
+++ b/addons/fetchmail/i18n/lv.po
@@ -7,299 +7,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-13 22:58+0000\n"
 "Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Apstiprināts"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Apstiprināts"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Apstiprināt"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupēt pēc..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Servera prioritāte"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stāvoklis"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nav apstiprināts"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Lietotāja vārds"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tips"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Ports"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Serveri"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Serveris"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Apraksts"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Serveris"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Pievienots piesaistnes?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "E-pastu skaits"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "E-pasta vēsture"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Lietotājs"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datums"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "E-pastu skaits"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Gaida pārbaudi"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Parole"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-pasti"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Meklēt e-pasta serverus"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Serveris un pieteikšanās"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automātiska atbilde?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nosaukums"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Serveri"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Atzīmēt kā Melnrakstu"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Ziņojumi"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail Servisi"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Ziņojumi"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Serveris"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktīvs"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Serveris"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelis"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Serveris"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Uzmanību! Nedrīkst būt dubulta servera configurācija!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Parole"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Servera tips"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Pieteikšanās informācijas"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Servera informācija"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Ja jā, saņem e-pastus ar piesaistnēm."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Serveris"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Ports"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Serveris un pieteikšanās"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Servera darbība uz e-pastu"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nav apstiprināts"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Servera prioritāte"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Serveris"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Pasta serveris"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Saņem e-pastus"
+#~ msgid "User Name"
+#~ msgstr "Lietotāja vārds"
+
+#~ msgid "Confirm"
+#~ msgstr "Apstiprināt"
+
+#~ msgid "Group By..."
+#~ msgstr "Grupēt pēc..."
+
+#~ msgid "Type"
+#~ msgstr "Tips"
+
+#~ msgid "Description"
+#~ msgstr "Apraksts"
+
+#~ msgid "User"
+#~ msgstr "Lietotājs"
+
+#~ msgid "Date"
+#~ msgstr "Datums"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Pievienots piesaistnes?"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Serveris"
+
+#~ msgid "Emails"
+#~ msgstr "E-pasti"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Atzīmēt kā Melnrakstu"
+
+#~ msgid "Server"
+#~ msgstr "Serveris"
+
+#~ msgid "Model"
+#~ msgstr "Modelis"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Uzmanību! Nedrīkst būt dubulta servera configurācija!"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Gaida pārbaudi"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automātiska atbilde?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Meklēt e-pasta serverus"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Ja jā, saņem e-pastus ar piesaistnēm."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Saņem e-pastus"
+
+#~ msgid "Email Server Action"
+#~ msgstr "Servera darbība uz e-pastu"
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 8033759aa03..70c911a33e6 100644
--- a/addons/fetchmail/i18n/mn.po
+++ b/addons/fetchmail/i18n/mn.po
@@ -7,306 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-12-21 14:04+0000\n"
 "Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Баталсан"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Баталсан"
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Урьтамж"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Төлөв"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Батлагдаагүй"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Хэрэглэгчийн нэр"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr ""
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Порт"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Servers"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Тайлбар"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Add Attachments ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Э-мэйлийн түүх"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "User"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Date"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Waiting for Verification"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Password"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Сервер & Нэвтрэх"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Reply?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Name"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Ноороглох"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail Services"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Сервер"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Active"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Сервер"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Модел"
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Password"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Серверийн төрөл"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Нэвтрэх мэдээлэл"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Серверийн мэдээлэл"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Сервер"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Порт"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Сервер & Нэвтрэх"
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Priority between 0 to 10, select define the order of Processing"
-
-#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Батлагдаагүй"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Урьтамж"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Сервер"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Мэйл сервер"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Fetch Emails"
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Server"
+
+#~ msgid "Description"
+#~ msgstr "Тайлбар"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Add Attachments ?"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Ноороглох"
+
+#~ msgid "User Name"
+#~ msgstr "Хэрэглэгчийн нэр"
+
+#~ msgid "User"
+#~ msgstr "User"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Waiting for Verification"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Reply?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mailgateway Message"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Process Parameter"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Model"
+#~ msgstr "Модел"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Priority between 0 to 10, select define the order of Processing"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Fetch Emails"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 72beaf2e52e..c19007322b7 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -7,315 +7,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-12 13:13+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Waarschuwing! Record voor geselecteerde model kan niet worden gemaakt\n"
-"Kies aub een geldig model"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Bevestigen"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Groepeer op..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Server Prioriteit"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Niet bevestigd"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Gebruikersnaam"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Soort"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Poort"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Servers"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Omschrijving"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject Model. Genereert een record van dit model.\n"
-"Selecteer Object met message_new attributen."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Bijlagen toevoegen ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Email historie"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Gebruiker"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# emails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Wacht op verificatie"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Wachtwoord"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-mails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Email servers zoeken"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Automatisch antwoord?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Naam"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgateway bericht"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Maak concept"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Berichten"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail services"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Berichten"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Actief"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Proces parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Waarschuwing! Kan geen duplicaat server configuratie hebben!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Wachtwoord"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Soort server"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Aanmeldinformatie"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Serverinformatie"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Haalt mail met bijlagen op als aangezet."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Poort"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * haalt email op van POP / IMAP server\n"
-"    * Ondersteunt SSL\n"
-"    * Geïntegreerd met alle modules\n"
-"    * Automatisch email ophalen\n"
-"    * Email gebaseerde records (Add, Update)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Een email server actie. Die wordt uitgevoerd elke keer als een e-mail is "
-"opgehaald van de server."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioriteit tussen 0 en 10, definieert de volgorde van verwerking"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Email server actie"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Niet bevestigd"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Server Prioriteit"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Mail server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Ophalen emails"
+#~ msgid "Description"
+#~ msgstr "Omschrijving"
+
+#~ msgid "User"
+#~ msgstr "Gebruiker"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Bijlagen toevoegen ?"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Server"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioriteit tussen 0 en 10, definieert de volgorde van verwerking"
+
+#~ msgid "User Name"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Maak concept"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Proces parameter"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Wacht op verificatie"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Automatisch antwoord?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mailgateway bericht"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Ophalen emails"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * haalt email op van POP / IMAP server\n"
+#~ "    * Ondersteunt SSL\n"
+#~ "    * Geïntegreerd met alle modules\n"
+#~ "    * Automatisch email ophalen\n"
+#~ "    * Email gebaseerde records (Add, Update)\n"
+#~ "    "
+
+#~ msgid "Emails"
+#~ msgstr "E-mails"
+
+#~ msgid "Confirm"
+#~ msgstr "Bevestigen"
+
+#~ msgid "Group By..."
+#~ msgstr "Groepeer op..."
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Email servers zoeken"
+
+#~ msgid "Type"
+#~ msgstr "Soort"
 
 #~ msgid "Email Servers"
 #~ msgstr "Email servers"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Haalt mail met bijlagen op als aangezet."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Een email server actie. Die wordt uitgevoerd elke keer als een e-mail is "
+#~ "opgehaald van de server."
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject Model. Genereert een record van dit model.\n"
+#~ "Selecteer Object met message_new attributen."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Waarschuwing! Record voor geselecteerde model kan niet worden gemaakt\n"
+#~ "Kies aub een geldig model"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Waarschuwing! Kan geen duplicaat server configuratie hebben!"
+
+#~ msgid "Email Server Action"
+#~ msgstr "Email server actie"
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index d090956d63e..2e1b22a9adf 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.po
@@ -7,306 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-11-10 08:36+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Potwierdzone"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Potwierdzone"
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Priorytet serwera"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stan"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nie potwierdzone"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nazwa użytkownika"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr ""
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Serwery POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Serwer fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Opis"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Serwer POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Dodać załaczniki ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Historia poczty"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Użytkownik"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Czekanie na weryfikację"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Hasło"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Serwer i login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Autoodpowiedź ?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nazwa"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Wiadomość Mailgateway"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Serwery POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Ustaw na projekt"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Usługi Fetchmail"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Serwer"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktywne"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parametr Procesu"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Serwer IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Serwer POP/IMAP"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Hasło"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Typ serwera"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informacje o logowaniu"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informacja o serwerze"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Serwer POP"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Serwer i login"
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Pobiera maile z serwerów Pop / IMAP\n"
-"    * Wspiera SSL\n"
-"    * Zintegrowany z wszystkimi modułami\n"
-"    * Automatyczne przyjmowanie poczty\n"
-"    * Rekordy oparte o Email (Add, Update)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Priorytet pomiędzy 0 a 10, definiuje porządek przetwarzania."
-
-#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nie potwierdzone"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Priorytet serwera"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Serwer POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Serwer pocztowy"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Pobierz pocztę"
+#~ msgid "User"
+#~ msgstr "Użytkownik"
+
+#~ msgid "User Name"
+#~ msgstr "Nazwa użytkownika"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Ustaw na projekt"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Dodać załaczniki ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Czekanie na weryfikację"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Serwer fetchmail"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Autoodpowiedź ?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Wiadomość Mailgateway"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parametr Procesu"
+
+#~ msgid "Server"
+#~ msgstr "Serwer"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Priorytet pomiędzy 0 a 10, definiuje porządek przetwarzania."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Pobierz pocztę"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Pobiera maile z serwerów Pop / IMAP\n"
+#~ "    * Wspiera SSL\n"
+#~ "    * Zintegrowany z wszystkimi modułami\n"
+#~ "    * Automatyczne przyjmowanie poczty\n"
+#~ "    * Rekordy oparte o Email (Add, Update)\n"
+#~ "    "
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 9f79ecb649c..694f8d80b1e 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.po
@@ -7,306 +7,397 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-13 12:15+0000\n"
 "Last-Translator: Tiago Baptista <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Aviso! O registo para o Modelo seleccionado não pode ser criado\n"
-"Por favor escolha um Modelo válido"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirmar"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridade do Servidor"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Estado"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Não confirmado"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nome de utilizador"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipo"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Porto"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Servidores POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Servidor Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descrição"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Adicionar anexos?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "Nº de mensagens"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Histórico de Email"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Utilizador"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "Nº de mensagens"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Aguardando verificação"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Senha"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Mensagens"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Procurar servidores de correio eletrónico"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Servidor e Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Resposta Automática?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Servidores POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Definir como rascunho"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Mensagens"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Serviços Fetchmail"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Mensagens"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Servidor"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Activo"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parâmetro de Processamento"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "Copy text   \t SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Aviso! Não podem existir configurações de servidor repetidas!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Senha"
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipo de servidor"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informação de Login"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informação do servidor"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Retira emails com anexos se seleccionado."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Servidor POP"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Porto"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Servidor e Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Uma acção de servidor de email. Será executada sempre que uma mensagem é "
-"retirada do servidor."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Prioridade entre 0 e 10. Define a ordem de processamento"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Acção"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Não confirmado"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioridade do Servidor"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Servidor POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Servidor de correio"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Retira emails."
+#~ msgid "Set to Draft"
+#~ msgstr "Definir como rascunho"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar por..."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "User"
+#~ msgstr "Utilizador"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "User Name"
+#~ msgstr "Nome de utilizador"
+
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
 
 #~ msgid "Email Servers"
 #~ msgstr "Servidores de correio"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "SSL ?"
+#~ msgstr "Copy text   \t SSL ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Aguardando verificação"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Procurar servidores de correio eletrónico"
+
+#~ msgid "Emails"
+#~ msgstr "Mensagens"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Aviso! O registo para o Modelo seleccionado não pode ser criado\n"
+#~ "Por favor escolha um Modelo válido"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Adicionar anexos?"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Resposta Automática?"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Servidor Fetchmail"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Aviso! Não podem existir configurações de servidor repetidas!"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Prioridade entre 0 e 10. Define a ordem de processamento"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Uma acção de servidor de email. Será executada sempre que uma mensagem é "
+#~ "retirada do servidor."
+
+#~ msgid "Email Server Action"
+#~ msgstr "Acção"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Retira emails com anexos se seleccionado."
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parâmetro de Processamento"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Retira emails."
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index b4c32d57291..3b47f29f51b 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -7,299 +7,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-02-28 21:26+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirmar"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioridade do Servidor"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Não Confirmado"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nome do Usuário"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tipo"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Porta"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Servidores POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descrição"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Adicionar Anexos?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# de emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Histórico de Email"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Usuário"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Data"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# de emails"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Aguardando Verifidação"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Senha"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Emails"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Pesquisar Servidores de Email"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Servidor e Login"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Resposta?"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mensagem do Gateway de Email"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Servidores POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Mensagens"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Servidor"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Ativo"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parâmetro de Processo"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Servidor POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Cuidado! Não é possível ter configurações de servidor duplicada!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Senha"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tipo de Servidor"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informação de Login"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informação do Servidor"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Baixa email com anexos, se marcado."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Servidor POP"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Porta"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Servidor e Login"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Não Confirmado"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioridade do Servidor"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Servidor POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Servidor de Email"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Baixar Emails"
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Group By..."
+#~ msgstr "Agrupar Por..."
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "User Name"
+#~ msgstr "Nome do Usuário"
+
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
+#~ msgid "User"
+#~ msgstr "Usuário"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Adicionar Anexos?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Aguardando Verifidação"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Definir como Rascunho"
+
+#~ msgid "Emails"
+#~ msgstr "Emails"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parâmetro de Processo"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Cuidado! Não é possível ter configurações de servidor duplicada!"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Pesquisar Servidores de Email"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Baixa email com anexos, se marcado."
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mensagem do Gateway de Email"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Resposta?"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Baixar Emails"
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index b8efdae2f88..8ad3e39192e 100644
--- a/addons/fetchmail/i18n/ro.po
+++ b/addons/fetchmail/i18n/ro.po
@@ -7,299 +7,353 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-03-26 06:05+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Confirmat"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Confirmat"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Confirmă"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupează după..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioritate server"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stare"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Neconfirmat"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Nume utilizator"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tip"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Server POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Descriere"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Server POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Adaugați atașament?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Istoric Email"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Utilizator"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Dată"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Parolă"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Email-uri"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Nume"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mesaj de la mesagerie"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Server POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Schimbă în ciornă"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Mesaje"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Activ"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Server IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Server POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Parolă"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tip server"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informație logare"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Informații despre server"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Server POP"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Neconfirmat"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioritate server"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Server POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Server de mail"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "User Name"
+#~ msgstr "Nume utilizator"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmă"
+
+#~ msgid "Group By..."
+#~ msgstr "Grupează după..."
+
+#~ msgid "Type"
+#~ msgstr "Tip"
+
+#~ msgid "Description"
+#~ msgstr "Descriere"
+
+#~ msgid "User"
+#~ msgstr "Utilizator"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Adaugați atașament?"
+
+#~ msgid "Date"
+#~ msgstr "Dată"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Schimbă în ciornă"
+
+#~ msgid "Emails"
+#~ msgstr "Email-uri"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mesaj de la mesagerie"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index a54d0e3fa52..2a478fac398 100644
--- a/addons/fetchmail/i18n/ru.po
+++ b/addons/fetchmail/i18n/ru.po
@@ -7,315 +7,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-11-29 07:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Подтверждено"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"Внимание! Невозможно создать запись для выбранной модели\n"
-"Выберите верную модель"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Подтверждено"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Подтвердить"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Группировать по .."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Приоритет сервера"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Состояние"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Не подтверждено"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Имя пользователя"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Тип"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Порт"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Сервера POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Сервер Fetchmail"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Описание"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Сервер POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"Модель OpenObject. По этой модели генерируется запись.\n"
-"Выбрать объект с атрибутами message_new."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Добавить вложение?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "Кол-во писем"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Пользователь"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Дата"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "Кол-во писем"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Ожидание проверки"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Пароль"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Письма"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Поиск серверов электронной почты"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Сервер и имя пользователя"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Авто-ответ?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Название"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Соообщение почтового шлюза"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Установить в \"Черновик\""
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Сообщения"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Сервер"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Активный"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Параметр процесса"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP сервер"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Модель"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Сервер POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Пароль"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Внимание! Нельзя использовать повторяющиеся конфигурации сервера!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Тип сервера"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Информация входа"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Сведения о сервере"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Если в значении \"Истина\", получать письма с вложениями."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Сервер POP"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Порт"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * Получение почты с серверов POP/IMAP\n"
-"    * Поддержка SSL\n"
-"    * Интеграция со всеми модулями\n"
-"    * Автоматическое получение почты\n"
-"    * Записи на основе писем (Добавление, Обновление)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Сервер и имя пользователя"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"Действие для почтового сервера. Будет выполняться при получении каждого "
-"письма с сервера."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Приоритет от 0 до 10, выбор определяет порядок обработки."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "Действие для почтового сервера"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Не подтверждено"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Приоритет сервера"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Сервер POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Почтовый сервер"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Получить эл. почту"
+#~ msgid "Set to Draft"
+#~ msgstr "Установить в \"Черновик\""
+
+#~ msgid "Confirm"
+#~ msgstr "Подтвердить"
+
+#~ msgid "Group By..."
+#~ msgstr "Группировать по .."
+
+#~ msgid "Description"
+#~ msgstr "Описание"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Добавить вложение?"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "User"
+#~ msgstr "Пользователь"
+
+#~ msgid "User Name"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "Emails"
+#~ msgstr "Письма"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#~ msgid "Model"
+#~ msgstr "Модель"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Параметр процесса"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Ожидание проверки"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Авто-ответ?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Поиск серверов электронной почты"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "Модель OpenObject. По этой модели генерируется запись.\n"
+#~ "Выбрать объект с атрибутами message_new."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Внимание! Невозможно создать запись для выбранной модели\n"
+#~ "Выберите верную модель"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Сервер Fetchmail"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Внимание! Нельзя использовать повторяющиеся конфигурации сервера!"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL?"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * Получение почты с серверов POP/IMAP\n"
+#~ "    * Поддержка SSL\n"
+#~ "    * Интеграция со всеми модулями\n"
+#~ "    * Автоматическое получение почты\n"
+#~ "    * Записи на основе писем (Добавление, Обновление)\n"
+#~ "    "
 
 #~ msgid "Email Servers"
 #~ msgstr "Сервера электронной почты"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Если в значении \"Истина\", получать письма с вложениями."
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Соообщение почтового шлюза"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "Действие для почтового сервера. Будет выполняться при получении каждого "
+#~ "письма с сервера."
+
+#~ msgid "Email Server Action"
+#~ msgstr "Действие для почтового сервера"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Приоритет от 0 до 10, выбор определяет порядок обработки."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Получить эл. почту"
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
index 2cdcd56b63d..d5f49d3c553 100644
--- a/addons/fetchmail/i18n/sl.po
+++ b/addons/fetchmail/i18n/sl.po
@@ -7,302 +7,362 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-22 16:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-23 05:20+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Potrjeno"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Potrdi"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Združi po ..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Država"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nepotrjeno"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Uporabniško Ime"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tip"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Vrata"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Strežniki"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Opis"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Strežnik"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Dodaj Priloge ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# od emalov"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Uporabnik"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# od emalov"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Čaka na Potrditev"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Geslo"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-pošte"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "Poišči Email Strežnik"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Strežnik in Prijava"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Avtomatski Odzivnik?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Ime"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Sporočila"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Strežnik"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktiven"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Parametri Procesa"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP Strežnik"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr ""
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Strežnik"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Geslo"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "Opozorilo! Ne morete podvojiti konfiguracije strežnika!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tip Strežnika"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Prijavni podatki"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Podatki o strežniku"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Strežnik"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Vrata"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Strežnik in Prijava"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepotrjeno"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Strežnik"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Poštni Strežnik"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "Confirm"
+#~ msgstr "Potrdi"
+
+#~ msgid "Group By..."
+#~ msgstr "Združi po ..."
+
+#~ msgid "Type"
+#~ msgstr "Tip"
+
+#~ msgid "User"
+#~ msgstr "Uporabnik"
+
+#~ msgid "User Name"
+#~ msgstr "Uporabniško Ime"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Dodaj Priloge ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Čaka na Potrditev"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Emails"
+#~ msgstr "E-pošte"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Server"
+#~ msgstr "Strežnik"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Avtomatski Odzivnik?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "Poišči Email Strežnik"
 
 #~ msgid "Email Servers"
 #~ msgstr "Email Strežniki"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "Opozorilo! Ne morete podvojiti konfiguracije strežnika!"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Parametri Procesa"
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index ab1f375703b..6c7f3831ffa 100644
--- a/addons/fetchmail/i18n/sr.po
+++ b/addons/fetchmail/i18n/sr.po
@@ -7,306 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-10-17 07:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioritet Servera"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stanje"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nije potvrdjeno"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Korisničko ime"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr ""
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Serveri"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Email Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Opis"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Dodajes Attachmente ( dodatke) ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Email Istorija"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Cekanje na Potvrdu"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Lozinka"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Odgovor?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Ime"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Poruka Email prolaza"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Serveri"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Postavi u pripremu"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Email Servisi"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktivan"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Obradi Parametar"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "MAP Server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Lozinka"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tup Servera"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informacije o Prijavi"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Podaci o Serveru"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    *Hvata emailove sa pop/imap servera\n"
-"    *Podrzava SSL\n"
-"    *Integrise se sa svim modulima\n"
-"    *Automatski prima Emailove\n"
-"    *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Vaznost izmedju 0 i 10,  izaberi i definisi redosled Procesuiranja"
-
-#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nije potvrdjeno"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioritet Servera"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Email Server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Hvata Emailove"
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "User Name"
+#~ msgstr "Korisničko ime"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Postavi u pripremu"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Dodajes Attachmente ( dodatke) ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Cekanje na Potvrdu"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "User"
+#~ msgstr "Korisnik"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Email Server"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Odgovor?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Poruka Email prolaza"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Obradi Parametar"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Vaznost izmedju 0 i 10,  izaberi i definisi redosled Procesuiranja"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Hvata Emailove"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    *Hvata emailove sa pop/imap servera\n"
+#~ "    *Podrzava SSL\n"
+#~ "    *Integrise se sa svim modulima\n"
+#~ "    *Automatski prima Emailove\n"
+#~ "    *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
+#~ "    "
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index adc9f781996..e6c27653264 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -7,306 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-12-23 16:22+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Potvrdjeno"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Potvrdjeno"
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Prioritet Servera"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Stanje"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Nije potvrdjeno"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Korisničko ime"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr ""
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Serveri"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Email Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Opis"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Dodajes Attachmente ( dodatke) ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Email Istorija"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Cekanje na Potvrdu"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Lozinka"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Auto Odgovor?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Ime"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Poruka Email prolaza"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Serveri"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Postavi u pripremu"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Email Servisi"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktivan"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "Obradi Parametar"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "MAP Server"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Lozinka"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Tup Servera"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Informacije o Prijavi"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Podaci o Serveru"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Server"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
+#: help:fetchmail.server,object_id:0
 msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    *Hvata emailove sa pop/imap servera\n"
-"    *Podrzava SSL\n"
-"    *Integrise se sa svim modulima\n"
-"    *Automatski prima Emailove\n"
-"    *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
-msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "Vaznost izmedju 0 i 10,  izaberi i definisi redosled Procesuiranja"
-
-#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Nije potvrdjeno"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioritet Servera"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "Email Server"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "Hvata Emailove"
+#~ msgid "Fetchmail Server"
+#~ msgstr "Email Server"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Dodajes Attachmente ( dodatke) ?"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Postavi u pripremu"
+
+#~ msgid "User Name"
+#~ msgstr "Korisničko ime"
+
+#~ msgid "User"
+#~ msgstr "Korisnik"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Cekanje na Potvrdu"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Auto Odgovor?"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Poruka Email prolaza"
+
+#~ msgid "Process Parameter"
+#~ msgstr "Obradi Parametar"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    *Hvata emailove sa pop/imap servera\n"
+#~ "    *Podrzava SSL\n"
+#~ "    *Integrise se sa svim modulima\n"
+#~ "    *Automatski prima Emailove\n"
+#~ "    *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
+#~ "    "
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "Vaznost izmedju 0 i 10,  izaberi i definisi redosled Procesuiranja"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "Hvata Emailove"
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index 96388775862..ed50684f8f2 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.po
@@ -7,299 +7,335 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-11-27 14:41+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Bekräftad"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Bekräfta"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Användarnamn"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr ""
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Beskrivning"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Lägg till bilaga?"
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: view:fetchmail.server:0
+msgid "SSL"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Användare"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Datum"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
+#: view:fetchmail.server:0
+msgid "# of emails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Lösenord"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "server & inloggning"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
-msgid "Name"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
+#: field:fetchmail.server,name:0
+msgid "Name"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Sätt till preliminär"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
-msgid "Active"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
+#: field:fetchmail.server,active:0
+msgid "Active"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "IMAP Server"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced options"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
+#: view:fetchmail.server:0
+msgid "Server type POP."
 msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Lösenord"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP server"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr ""
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "server & inloggning"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP server"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr ""
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "Set to Draft"
+#~ msgstr "Sätt till preliminär"
+
+#~ msgid "Confirm"
+#~ msgstr "Bekräfta"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Lägg till bilaga?"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail server"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivning"
+
+#~ msgid "User"
+#~ msgstr "Användare"
+
+#~ msgid "User Name"
+#~ msgstr "Användarnamn"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index affb2da303f..9263544654f 100644
--- a/addons/fetchmail/i18n/tr.po
+++ b/addons/fetchmail/i18n/tr.po
@@ -7,316 +7,425 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-02-24 20:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Onaylandı"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"UYARI! seçilen model için kayıt oluşturulamıyor\n"
-"Lütfen geçerli bir model seçin"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Onaylandı"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Onayla"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Grupla..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Sunucu Önceliği"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Durum"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Onaylanmadı"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Kullanıcı Adı"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Tip"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP Sunucuları"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail Sunucusu"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Açıklama"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Sunucu"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject Model. Bu model için bir kayıt oluşturur.\n"
-"message_new özelliği olan bir nesne seçin."
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "Ek Ekle ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "E-posta sayısı"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Eposta Geçmişi"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Kullanıcı"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Tarih"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "E-posta sayısı"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Onay Bekleniyor"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Şifre"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "E-postalar"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "E-posta Sunucusu Ara"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "Sunucu & Kullanıcı"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "Otomatik Cevap?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Adı"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "Mailgeçidi Mesajı"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Sunucuları"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Taslağa Çevir"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
-msgid "Messages"
-msgstr "Mesajlar"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Fetchmail Servisleri"
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Mesajlar"
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Sunucu"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Aktif"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "İşlem Parametresi"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP sunucusu"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP Sunucu"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "UYARI! Mükerrer sunucu ayarı yapamazsınız!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Şifre"
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "Sunucu Türü"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Kullanıcı Bilgileri"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Sunucu Bilgileri"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "Eğer doğru işe e-postaları ekleriyle birlikte çeker."
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP Sunucu"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Port"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail: \n"
-"    * POP/IMAP sunuculardan e-postaları çeker\n"
-"    * SSL Destekler\n"
-"    * Bütün Modüllerle entegre çalışır\n"
-"    * Otomatik E-posta çekimi\n"
-"    * E-posta temelli kayıtlar (ekle,Güncelle)\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Sunucu & Kullanıcı"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
-"E-posta sunucu eylemi. Sunucudan bir mesaj çekildiğinde bu eylem "
-"çalıştırılır."
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
-"İşlem sırasını belirlemek için öncelik seviyesi 0 ile 10 arası seçin."
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "E-posta Sunucu Eylemi"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Onaylanmadı"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Sunucu Önceliği"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP Sunucu"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "E-Posta Sunucusu"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "E-postaları Çeker"
+#~ msgid "User Name"
+#~ msgstr "Kullanıcı Adı"
+
+#~ msgid "Confirm"
+#~ msgstr "Onayla"
+
+#~ msgid "Group By..."
+#~ msgstr "Grupla..."
+
+#~ msgid "Type"
+#~ msgstr "Tip"
+
+#~ msgid "Description"
+#~ msgstr "Açıklama"
+
+#~ msgid "User"
+#~ msgstr "Kullanıcı"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "Ek Ekle ?"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Onay Bekleniyor"
+
+#~ msgid "Date"
+#~ msgstr "Tarih"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail Sunucusu"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Taslağa Çevir"
+
+#~ msgid "Emails"
+#~ msgstr "E-postalar"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "Otomatik Cevap?"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "E-posta Sunucusu Ara"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "Mailgeçidi Mesajı"
+
+#~ msgid "Server"
+#~ msgstr "Sunucu"
+
+#~ msgid "Model"
+#~ msgstr "Model"
+
+#~ msgid "Process Parameter"
+#~ msgstr "İşlem Parametresi"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL ?"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "UYARI! Mükerrer sunucu ayarı yapamazsınız!"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr ""
+#~ "İşlem sırasını belirlemek için öncelik seviyesi 0 ile 10 arası seçin."
+
+#~ msgid "Email Server Action"
+#~ msgstr "E-posta Sunucu Eylemi"
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "Eğer doğru işe e-postaları ekleriyle birlikte çeker."
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr ""
+#~ "E-posta sunucu eylemi. Sunucudan bir mesaj çekildiğinde bu eylem "
+#~ "çalıştırılır."
+
+#~ msgid "Fetch Emails"
+#~ msgstr "E-postaları Çeker"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail: \n"
+#~ "    * POP/IMAP sunuculardan e-postaları çeker\n"
+#~ "    * SSL Destekler\n"
+#~ "    * Bütün Modüllerle entegre çalışır\n"
+#~ "    * Otomatik E-posta çekimi\n"
+#~ "    * E-posta temelli kayıtlar (ekle,Güncelle)\n"
+#~ "    "
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject Model. Bu model için bir kayıt oluşturur.\n"
+#~ "message_new özelliği olan bir nesne seçin."
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "UYARI! seçilen model için kayıt oluşturulamıyor\n"
+#~ "Lütfen geçerli bir model seçin"
 
 #~ msgid "Email Servers"
 #~ msgstr "Eposta Sunucuları"
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 4cba1f1d170..0b6c3294c07 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -7,299 +7,350 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-07-20 08:02+0000\n"
 "Last-Translator: OpenBMS JSC <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Đã xác nhận"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "Đã xác nhận"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "Xác nhận"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "Nhóm theo..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "Trạng thái"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "Chưa được xác nhận"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "Tên người sử dụng"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "Loại"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Cổng"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "Máy chủ POP/IMAP"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "Mô tả"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Máy chủ POP/IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "Người sử dụng"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "Ngày"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "Chờ phê chuẩn"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Mật khẩu"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "Các thư điện tử"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "Tên"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
 msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "Máy chủ POP"
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "Đặt thành Nháp"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "Các thông điệp"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Máy chủ"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "Hoạt động"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "Sử dụng SSL ?"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "Địa chỉ máy chủ IMAP"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "Mô hình"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "Máy chủ POP/IMAP"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Mật khẩu"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "Thông tin đăng nhập"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "Thông tin máy chủ"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
+#: view:fetchmail.server:0
+msgid "If SSL required."
 msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "Địa chỉ máy chủ POP"
-
-#. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "Cổng"
-
-#. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
+#: view:fetchmail.server:0
+msgid "Advanced"
 msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr ""
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Chưa được xác nhận"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr ""
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "Địa chỉ máy chủ POP"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr ""
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr ""
+#~ msgid "Description"
+#~ msgstr "Mô tả"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "Chờ phê chuẩn"
+
+#~ msgid "Server"
+#~ msgstr "Máy chủ"
+
+#~ msgid "SSL ?"
+#~ msgstr "Sử dụng SSL ?"
+
+#~ msgid "User Name"
+#~ msgstr "Tên người sử dụng"
+
+#~ msgid "Confirm"
+#~ msgstr "Xác nhận"
+
+#~ msgid "Group By..."
+#~ msgstr "Nhóm theo..."
+
+#~ msgid "Type"
+#~ msgstr "Loại"
+
+#~ msgid "User"
+#~ msgstr "Người sử dụng"
+
+#~ msgid "Date"
+#~ msgstr "Ngày"
+
+#~ msgid "Emails"
+#~ msgstr "Các thư điện tử"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Đặt thành Nháp"
+
+#~ msgid "Model"
+#~ msgstr "Mô hình"
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 4e06e495c35..39a04a821ea 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -7,313 +7,422 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-12 17:27+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 07:18+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: fetchmail
-#: constraint:email.server:0
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "已确认"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
 msgid ""
-"Warning! Record for selected Model can not be created\n"
-"Please choose valid Model"
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
 msgstr ""
-"警告！选择模型不能创建。\n"
-"请选择有效的模板。"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Confirmed"
-msgstr "已确认"
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Confirm"
-msgstr "确认"
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Group By..."
-msgstr "分组..."
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "服务器优先级"
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,state:0
+#: field:fetchmail.server,state:0
 msgid "State"
 msgstr "状态"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP"
 msgstr "POP"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Not Confirmed"
-msgstr "未确认"
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
-msgstr "用户名"
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Type"
-msgstr "类型"
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "端口"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "POP/IMAP Servers"
 msgstr "POP/IMAP 服务器"
 
 #. module: fetchmail
-#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
-msgid "Fetchmail Server"
-msgstr "Fetchmail服务器"
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-#: field:email.server,note:0
-msgid "Description"
-msgstr "说明"
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid ""
-"OpenObject Model. Generates a record of this model.\n"
-"Select Object with message_new attrbutes."
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP 服务器"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
 msgstr ""
-"OpenObject模型。这模型产生一个记录。\n"
-"选择对象与新属性消息。"
 
 #. module: fetchmail
-#: field:email.server,attach:0
-msgid "Add Attachments ?"
-msgstr "添加附件？"
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "# of emails"
-msgstr "# 电子邮件"
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "电子邮件历史记录"
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,user_id:0
-msgid "User"
-msgstr "用户"
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,date:0
-msgid "Date"
-msgstr "日期"
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# 电子邮件"
 
 #. module: fetchmail
-#: selection:email.server,state:0
-msgid "Waiting for Verification"
-msgstr "等待审批"
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "密码"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-#: view:mailgate.message:0
-msgid "Emails"
-msgstr "电子邮件"
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Search Email Servers"
-msgstr "搜索电子邮件服务器"
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Server & Login"
-msgstr "服务器与登录"
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Auto Reply?"
-msgstr "自动回复？"
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,name:0
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
 msgid "Name"
 msgstr "名称"
 
 #. module: fetchmail
-#: model:ir.model,name:fetchmail.model_mailgate_message
-msgid "Mailgateway Message"
-msgstr "邮件网关消息"
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-msgid "POP Servers"
-msgstr "POP 服务器"
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Set to Draft"
-msgstr "设为草稿"
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,message_ids:0
-#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Messages"
 msgstr "消息"
 
 #. module: fetchmail
-#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "服务器"
-
-#. module: fetchmail
-#: field:email.server,active:0
+#: field:fetchmail.server,active:0
 msgid "Active"
 msgstr "生效"
 
 #. module: fetchmail
-#: view:email.server:0
-msgid "Process Parameter"
-msgstr "进程参数"
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,is_ssl:0
-msgid "SSL ?"
-msgstr "SSL 安全连接？"
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr ""
 
 #. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
+#: selection:fetchmail.server,type:0
 msgid "IMAP Server"
 msgstr "IMAP 服务器"
 
 #. module: fetchmail
-#: field:email.server,object_id:0
-msgid "Model"
-msgstr "模型"
-
-#. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "IMAP"
 msgstr "IMAP"
 
 #. module: fetchmail
-#: view:email.server:0
-#: model:ir.model,name:fetchmail.model_email_server
-msgid "POP/IMAP Server"
-msgstr "POP/IMAP 服务器"
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "密码"
 
 #. module: fetchmail
-#: constraint:email.server:0
-msgid "Warning! Can't have duplicate server configuration!"
-msgstr "警告！不能创建设置重复的服务器！"
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
+#: field:fetchmail.server,type:0
 msgid "Server Type"
 msgstr "服务器类型"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Login Information"
 msgstr "登录信息"
 
 #. module: fetchmail
-#: view:email.server:0
+#: view:fetchmail.server:0
 msgid "Server Information"
 msgstr "服务器信息"
 
 #. module: fetchmail
-#: help:email.server,attach:0
-msgid "Fetches mail with attachments if true."
-msgstr "如果为真取电子邮件与附件"
-
-#. module: fetchmail
-#: selection:email.server,type:0
-#: selection:mailgate.message,server_type:0
-msgid "POP Server"
-msgstr "POP 服务器"
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,port:0
-msgid "Port"
-msgstr "端口"
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.module.module,description:fetchmail.module_meta_information
-msgid ""
-"Fetchmail: \n"
-"    * Fetch email from Pop / IMAP server\n"
-"    * Support SSL\n"
-"    * Integrated with all Modules\n"
-"    * Automatic Email Receive\n"
-"    * Email based Records (Add, Update)\n"
-"    "
-msgstr ""
-"Fetchmail（取电子邮件）：\n"
-"     从Pop/IMAP服务器取电子邮件。\n"
-"    支持SSL\n"
-"    整合所有模块\n"
-"    自动接收邮件\n"
-"    邮件根据记录（新增/更新）\n"
-"    "
-
-#. module: fetchmail
-#: view:email.server:0
-msgid "SSL"
-msgstr "SSL"
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "服务器与登录"
 
 #. module: fetchmail
-#: help:email.server,action_id:0
+#: help:fetchmail.server,object_id:0
 msgid ""
-"An Email Server Action. It will be run whenever an e-mail is fetched from "
-"server."
-msgstr "电子邮件服务动作。它运行时从服务器取出电子邮件。"
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
 
 #. module: fetchmail
-#: help:email.server,priority:0
-msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr "优先级从0到10，选择它的优先级"
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Email Server Action"
-msgstr "电子邮件服务器动作"
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "未确认"
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "服务器优先级"
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP 服务器"
 
 #. module: fetchmail
-#: view:mailgate.message:0
-#: field:mailgate.message,server_id:0
+#: view:mail.message:0
 msgid "Mail Server"
 msgstr "邮件服务器"
 
-#. module: fetchmail
-#: view:email.server:0
-msgid "Fetch Emails"
-msgstr "取邮件"
+#~ msgid "User Name"
+#~ msgstr "用户名"
+
+#~ msgid "Confirm"
+#~ msgstr "确认"
+
+#~ msgid "Description"
+#~ msgstr "说明"
+
+#~ msgid "User"
+#~ msgstr "用户"
+
+#~ msgid "Search Email Servers"
+#~ msgstr "搜索电子邮件服务器"
+
+#~ msgid "Set to Draft"
+#~ msgstr "设为草稿"
+
+#~ msgid "Emails"
+#~ msgstr "电子邮件"
+
+#~ msgid "Auto Reply?"
+#~ msgstr "自动回复？"
+
+#~ msgid "SSL ?"
+#~ msgstr "SSL 安全连接？"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "Model"
+#~ msgstr "模型"
+
+#~ msgid "Process Parameter"
+#~ msgstr "进程参数"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#~ msgid "Type"
+#~ msgstr "类型"
+
+#~ msgid "Add Attachments ?"
+#~ msgstr "添加附件？"
+
+#~ msgid "Group By..."
+#~ msgstr "分组..."
 
 #~ msgid "Email Servers"
 #~ msgstr "电子邮件服务器"
+
+#~ msgid "Email Server Action"
+#~ msgstr "电子邮件服务器动作"
+
+#~ msgid ""
+#~ "An Email Server Action. It will be run whenever an e-mail is fetched from "
+#~ "server."
+#~ msgstr "电子邮件服务动作。它运行时从服务器取出电子邮件。"
+
+#~ msgid "Priority between 0 to 10, select define the order of Processing"
+#~ msgstr "优先级从0到10，选择它的优先级"
+
+#~ msgid "Fetch Emails"
+#~ msgstr "取邮件"
+
+#~ msgid "Fetchmail Server"
+#~ msgstr "Fetchmail服务器"
+
+#~ msgid ""
+#~ "OpenObject Model. Generates a record of this model.\n"
+#~ "Select Object with message_new attrbutes."
+#~ msgstr ""
+#~ "OpenObject模型。这模型产生一个记录。\n"
+#~ "选择对象与新属性消息。"
+
+#~ msgid "Mailgateway Message"
+#~ msgstr "邮件网关消息"
+
+#~ msgid ""
+#~ "Fetchmail: \n"
+#~ "    * Fetch email from Pop / IMAP server\n"
+#~ "    * Support SSL\n"
+#~ "    * Integrated with all Modules\n"
+#~ "    * Automatic Email Receive\n"
+#~ "    * Email based Records (Add, Update)\n"
+#~ "    "
+#~ msgstr ""
+#~ "Fetchmail（取电子邮件）：\n"
+#~ "     从Pop/IMAP服务器取电子邮件。\n"
+#~ "    支持SSL\n"
+#~ "    整合所有模块\n"
+#~ "    自动接收邮件\n"
+#~ "    邮件根据记录（新增/更新）\n"
+#~ "    "
+
+#~ msgid "Fetches mail with attachments if true."
+#~ msgstr "如果为真取电子邮件与附件"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "警告！选择模型不能创建。\n"
+#~ "请选择有效的模板。"
+
+#~ msgid "Waiting for Verification"
+#~ msgstr "等待审批"
+
+#~ msgid "Warning! Can't have duplicate server configuration!"
+#~ msgstr "警告！不能创建设置重复的服务器！"