[I18N] Sync latest translations from Launchpad (not the final one)

2 files changed, 35 insertions, 28 deletions

diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 9393815a703..d19e5c5c5ef 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-01-21 14:07+0000\n"
-"PO-Revision-Date: 2015-02-14 18:09+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2015-05-06 13:51+0000\n"
+"Last-Translator: Murat Kaplan <muratk@projetgrup.com>\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: 2015-02-15 06:38+0000\n"
-"X-Generator: Launchpad (build 17341)\n"
+"X-Launchpad-Export-Date: 2015-05-07 05:37+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -250,7 +250,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
-msgstr "Şeçenekler"
+msgstr "Seçenekler"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -399,7 +399,7 @@ msgstr ""
 #: view:base.config.settings:base_setup.view_general_configuration
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "or"
-msgstr "ya da"
+msgstr "veya"
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index d74270364fb..e5cfb53b8a8 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-01-21 14:07+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-05-15 06:23+0000\n"
+"Last-Translator: 卓忆科技 <zhanghao@jointd.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: 2015-01-22 07:31+0000\n"
-"X-Generator: Launchpad (build 17306)\n"
+"X-Launchpad-Export-Date: 2015-05-16 05:44+0000\n"
+"X-Generator: Launchpad (build 17493)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "(reload fonts)"
-msgstr ""
+msgstr "(重新加载字体)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
@@ -35,7 +35,7 @@ msgstr "允许分享单据"
 #. module: base_setup
 #: field:base.config.settings,module_google_calendar:0
 msgid "Allow the users to synchronize their calendar  with Google Calendar"
-msgstr ""
+msgstr "允许用户同步他们的日历与谷歌日历"
 
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
@@ -51,7 +51,7 @@ msgstr "应用"
 #. module: base_setup
 #: field:base.config.settings,module_google_drive:0
 msgid "Attach Google documents to any record"
-msgstr ""
+msgstr "添加谷歌文档到任意记录中"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -100,14 +100,14 @@ msgstr "联系人"
 #: field:base.setup.terminology,create_uid:0
 #: field:sale.config.settings,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "创建者"
 
 #. module: base_setup
 #: field:base.config.settings,create_date:0
 #: field:base.setup.terminology,create_date:0
 #: field:sale.config.settings,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "创建于"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -144,7 +144,7 @@ msgstr "常规设置"
 #. module: base_setup
 #: help:sale.config.settings,module_mass_mailing:0
 msgid "Get access to statistics with your mass mailing, manage campaigns."
-msgstr ""
+msgstr "获得群发邮件的统计数据，管理您的营销活动。"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
@@ -159,12 +159,12 @@ msgstr "让你的客户访问他们的单据"
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Calendar"
-msgstr ""
+msgstr "谷歌日历"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Drive"
-msgstr ""
+msgstr "谷歌网盘"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -181,7 +181,7 @@ msgstr "你如何称呼您的客户"
 #: field:base.setup.terminology,id:0
 #: field:sale.config.settings,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -193,19 +193,19 @@ msgstr "导入/导出"
 #: field:base.setup.terminology,write_uid:0
 #: field:sale.config.settings,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "最新更新"
 
 #. module: base_setup
 #: field:base.config.settings,write_date:0
 #: field:base.setup.terminology,write_date:0
 #: field:sale.config.settings,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "最新更新日期"
 
 #. module: base_setup
 #: field:sale.config.settings,module_mass_mailing:0
 msgid "Manage mass mailing campaigns"
-msgstr ""
+msgstr "管理邮件群发"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
@@ -229,13 +229,18 @@ msgid ""
 "Odoo using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"Odoo允许自动创建线索(或者其他文档)\n"
+"                            在接收的电子邮件内。您可以使用正规的 POP/IMAP 帐号\n"
+"                            自动同步电子邮件到Odoo\n"
+"                            , 从您的电子邮件服务器直接发送邮件\n"
+"                            , 或使用您电子邮件客户端中的插件手动推送邮件。"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
 "Once installed, you can configure your API credentials for \"Google "
 "calendar\""
-msgstr ""
+msgstr "一旦安装后，您可以为\"谷歌日历\"设置您的API证书"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -265,7 +270,7 @@ msgstr "报价和销售订单"
 #. module: base_setup
 #: field:base.config.settings,font:0
 msgid "Report Font"
-msgstr ""
+msgstr "报表字体"
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
@@ -282,12 +287,12 @@ msgstr "销售特性"
 msgid ""
 "Set the font into the report header, it will be used as default font in the "
 "RML reports of the user company"
-msgstr ""
+msgstr "在报表头部设置字体，这会成为用户公司的RML报表中默认字体"
 
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of Odoo."
-msgstr ""
+msgstr "分享或嵌入任何Odoo的屏幕显示。"
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
@@ -307,12 +312,12 @@ msgstr "承租人"
 #. module: base_setup
 #: help:base.config.settings,module_google_calendar:0
 msgid "This installs the module google_calendar."
-msgstr ""
+msgstr "这会安装google_calendar模块。"
 
 #. module: base_setup
 #: help:base.config.settings,module_google_drive:0
 msgid "This installs the module google_docs."
-msgstr ""
+msgstr "这会安装google_docs模块。"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -352,6 +357,8 @@ msgid ""
 "companies.\n"
 "-This installs the module multi_company."
 msgstr ""
+"工作在多公司环境，公司之间有适当地安全访问权限 \n"
+"-会安装模块multi_company。"
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form