[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

1 files changed, 3 insertions, 31 deletions

diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index d7458a00f36..e4bc911b34c 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -124,6 +124,7 @@ msgid "Password"
 msgstr "Lozinka"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
 msgstr ""
@@ -309,32 +310,3 @@ msgstr "Email Server"
 #: view:email.server:0
 msgid "Fetch Emails"
 msgstr "Hvata Emailove"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "IMAP Servers"
-#~ msgstr "IMAP Serveri"
-
-#~ msgid "Reply Email"
-#~ msgstr "Odgovori na Email"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Greska! Ne mozete kreirati rekursivni meni."
-
-#~ msgid "Invalid arguments"
-#~ msgstr "Neispravni Argumenti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Received Email History"
-#~ msgstr "Istorija Primljenih E-mailova"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Pravila nisu podrzana od strane osv_memory objekata !"