[MERGE] from master

[odoo/odoo.git] / addons / web / i18n / zh_CN.po

diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 4f12ac9..7d5855b 100644 (file)
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-20 02:49+0000\n"
+"PO-Revision-Date: 2014-10-19 11:50+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: 2014-09-24 10:06+0000\n"
+"X-Launchpad-Export-Date: 2014-10-20 07:20+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
 #. module: web
@@ -170,7 +170,7 @@ msgstr "（任何已存在的同名过滤器都会被替换）"
 #: code:addons/web/static/src/xml/base.xml:381
 #, python-format
 msgid "(Formerly OpenERP)"
-msgstr ""
+msgstr "（原 OpenERP）"
 
 #. module: web
 #. openerp-web
@@ -226,7 +226,7 @@ msgstr "1. 导入 .CSV 文件"
 #: code:addons/web/static/src/xml/base.xml:418
 #, python-format
 msgid "1367 Grand-Rosière"
-msgstr ""
+msgstr "1367 Grand-Rosière"
 
 #. module: web
 #. openerp-web
@@ -421,7 +421,7 @@ msgstr "备份还原"
 #: code:addons/web/static/src/xml/base.xml:419
 #, python-format
 msgid "Belgium"
-msgstr ""
+msgstr "比利时"
 
 #. module: web
 #. openerp-web
@@ -532,7 +532,7 @@ msgstr "已更改密码"
 #: code:addons/web/static/src/xml/base.xml:417
 #, python-format
 msgid "Chaussée de Namur 40"
-msgstr ""
+msgstr "Chaussée de Namur 40"
 
 #. module: web
 #. openerp-web
@@ -875,7 +875,7 @@ msgstr "放弃"
 #: code:addons/web/static/src/xml/base.xml:426
 #, python-format
 msgid "Discover Events of Odoo around the world..."
-msgstr ""
+msgstr "发现世界范围里的 Odoo 活动..."
 
 #. module: web
 #. openerp-web
@@ -1254,7 +1254,7 @@ msgstr "过滤器"
 #: code:addons/web/static/src/xml/base.xml:430
 #, python-format
 msgid "Follow Us..."
-msgstr ""
+msgstr "关注我们..."
 
 #. module: web
 #. openerp-web
@@ -1739,7 +1739,7 @@ msgstr "Odoo"
 #: code:addons/web/static/src/xml/base.xml:377
 #, python-format
 msgid "Odoo (Formerly OpenERP)"
-msgstr ""
+msgstr "Odoo（原 OpenERP）"
 
 #. module: web
 #: view:website:web.qunit_suite
@@ -1811,7 +1811,7 @@ msgstr "打开： "
 #: code:addons/web/static/src/xml/base.xml:416
 #, python-format
 msgid "OpenERP S.A."
-msgstr ""
+msgstr "OpenERP S.A."
 
 #. module: web
 #. openerp-web
@@ -1832,14 +1832,14 @@ msgstr "原来的数据库名:"
 #: code:addons/web/static/src/xml/base.xml:427
 #, python-format
 msgid "Our next Events"
-msgstr ""
+msgstr "我们近期的活动"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:423
 #, python-format
 msgid "Our website"
-msgstr ""
+msgstr "我们的网站"
 
 #. module: web
 #. openerp-web