[MERGE]

bzr revid: uco@tinyerp.com-20101213071756-wopi0pojilu7hr7q

3 files changed, 123 insertions, 111 deletions

diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index 49bb46ac336..d4b35a54fa9 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-08 19:51+0000\n"
+"PO-Revision-Date: 2010-12-09 08:32+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@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: 2010-12-09 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-11 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 4b871cc176f..b86775a0887 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-06 17:30+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-09 09:31+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-12-09 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-11 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index 631d0436fd5..815f8ea0690 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -1,4 +1,4 @@
-# Serbian translation for openobject-addons
+# Serbian latin translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@@ -7,227 +7,239 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+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"
+"POT-Creation-Date: 2010-12-03 15:43+0000\n"
+"PO-Revision-Date: 2010-12-10 16:43+0000\n"
+"Last-Translator: Milan Milosevic <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: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-11 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Confirmed"
-msgstr "Potvrđeno"
+msgstr "Potvrdjeno"
 
 #. module: fetchmail
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: view:email.server:0
+msgid "Confirm"
 msgstr ""
-"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#. module: fetchmail
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
-
-#. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree_imap
-#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree_imap
-msgid "IMAP Servers"
-msgstr "IMAP Serveri"
 
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Reply Email"
-msgstr "Odgovori na Email"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
-msgid "Server & Login"
-msgstr "Server & Login"
-
-#. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
-msgstr "Prioritet Servera"
+msgid "Group By..."
+msgstr ""
 
 #. module: fetchmail
+#: view:email.server:0
 #: field:email.server,state:0
 msgid "State"
-msgstr "Stanje"
+msgstr ""
 
 #. module: fetchmail
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Greska! Ne mozete kreirati rekursivni meni."
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Not Confirmed"
-msgstr "Nije potvrdjeno"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP/IMAP Servers"
-msgstr "POP/IMAP Serveri"
+msgstr ""
 
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
 msgid "Fetchmail Server"
-msgstr "Email Server"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 #: field:email.server,note:0
 msgid "Description"
-msgstr "Opis"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,attach:0
 msgid "Add Attachments ?"
-msgstr "Dodajes Attachmente ( dodatke) ?"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
-msgid "Set to Draft"
-msgstr "Postavi u pripremu"
+msgid "POP"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,user:0
 msgid "User Name"
-msgstr "Korisničko ime"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,user_id:0
 msgid "User"
-msgstr "Korisnik"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,date:0
 msgid "Date"
-msgstr "Datum"
+msgstr ""
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Waiting for Verification"
-msgstr "Cekanje na Potvrdu"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr "Lozinka"
+#: help:email.server,object_id:0
+msgid "OpenObject Model. Generates a record of this model."
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr ""
 
 #. module: fetchmail
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Neispravni Argumenti"
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr ""
 
 #. module: fetchmail
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: view:email.server:0
+msgid "Server & Login"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Auto Reply?"
-msgstr "Auto Odgovor?"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr ""
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr "Poruka Email prolaza"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
-#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree
-msgid "POP Servers"
-msgstr "POP Serveri"
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr ""
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Fetchmail Services"
-msgstr "Email Servisi"
+msgid "Email Servers"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree
-#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree_pop
-#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree
-#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree_pop
-msgid "Received Email History"
-msgstr "Istorija Primljenih E-mailova"
+#: field:email.server,server:0
+msgid "Server"
+msgstr ""
 
 #. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,server_type:0
-msgid "Server Type"
-msgstr "Tup Servera"
+#: field:email.server,active:0
+msgid "Active"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Process Parameter"
-msgstr "Obradi Parametar"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,is_ssl:0
 msgid "SSL ?"
-msgstr "SSL ?"
+msgstr ""
 
 #. module: fetchmail
 #: selection:email.server,type:0
 #: selection:mailgate.message,server_type:0
 msgid "IMAP Server"
-msgstr "MAP Server"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,object_id:0
 msgid "Model"
-msgstr "Model"
-
-#. module: fetchmail
-#: field:email.server,server:0
-msgid "Server"
-msgstr "Server"
+msgstr ""
 
 #. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
-msgid "Email History"
-msgstr "Email Istorija"
+#: view:email.server:0
+msgid "IMAP"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 #: model:ir.model,name:fetchmail.model_email_server
 msgid "POP/IMAP Server"
-msgstr "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Login Information"
-msgstr "Informacije o Prijavi"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Server Information"
-msgstr "Podaci o Serveru"
+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 Server"
+msgstr ""
 
 #. module: fetchmail
 #: field:email.server,port:0
 msgid "Port"
-msgstr "Port"
+msgstr ""
 
 #. module: fetchmail
 #: model:ir.module.module,description:fetchmail.module_meta_information
@@ -240,31 +252,31 @@ msgid ""
 "    * 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"
+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 ""
 
 #. 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"
+msgstr ""
 
 #. module: fetchmail
+#: view:mailgate.message:0
 #: field:mailgate.message,server_id:0
 msgid "Mail Server"
-msgstr "Email Server"
+msgstr ""
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr "Hvata Emailove"
-
-#~ msgid "Active"
-#~ msgstr "Aktivan"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+msgstr ""