[MERGE] from trunk

bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9

1 files changed, 24 insertions, 23 deletions

diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 92753d98255..4386cf40a1f 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -8,14 +8,14 @@ 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"
-"PO-Revision-Date: 2010-10-30 15:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-07-20 08:02+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <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-04-29 05:45+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-21 04:35+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -27,17 +27,17 @@ msgstr ""
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Đã xác nhận"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Confirm"
-msgstr ""
+msgstr "Xác nhận"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: fetchmail
 #: view:email.server:0
@@ -48,7 +48,7 @@ msgstr "Trạng thái"
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP"
-msgstr ""
+msgstr "POP"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -58,17 +58,17 @@ msgstr "Chưa được xác nhận"
 #. module: fetchmail
 #: field:email.server,user:0
 msgid "User Name"
-msgstr ""
+msgstr "Tên người sử dụng"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Type"
-msgstr ""
+msgstr "Loại"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP/IMAP Servers"
-msgstr ""
+msgstr "Máy chủ POP/IMAP"
 
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
@@ -106,12 +106,12 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: fetchmail
 #: field:email.server,date:0
 msgid "Date"
-msgstr ""
+msgstr "Ngày"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -124,9 +124,10 @@ msgid "Password"
 msgstr "Mật khẩu"
 
 #. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
 #: view:mailgate.message:0
 msgid "Emails"
-msgstr ""
+msgstr "Các thư điện tử"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -146,7 +147,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,name:0
 msgid "Name"
-msgstr ""
+msgstr "Tên"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
@@ -156,18 +157,18 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "Máy chủ POP"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Đặt thành Nháp"
 
 #. module: fetchmail
 #: field:email.server,message_ids:0
 #: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
 msgid "Messages"
-msgstr ""
+msgstr "Các thông điệp"
 
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
@@ -182,7 +183,7 @@ msgstr "Máy chủ"
 #. module: fetchmail
 #: field:email.server,active:0
 msgid "Active"
-msgstr ""
+msgstr "Hoạt động"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -203,18 +204,18 @@ msgstr "Địa chỉ máy chủ IMAP"
 #. module: fetchmail
 #: field:email.server,object_id:0
 msgid "Model"
-msgstr ""
+msgstr "Mô hình"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
 #. module: fetchmail
 #: view:email.server:0
 #: model:ir.model,name:fetchmail.model_email_server
 msgid "POP/IMAP Server"
-msgstr ""
+msgstr "Máy chủ POP/IMAP"
 
 #. module: fetchmail
 #: constraint:email.server:0
@@ -268,7 +269,7 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #. module: fetchmail
 #: help:email.server,action_id:0