[MERGE] merge from trunk addons

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

diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
old mode 100644 (file)
new mode 100755 (executable)
index 3c69cc7..739067e
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/i18n/zh_CN.po
@@ -7,17 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-12-07 19:24+0000\n"
 "Last-Translator: Roger Zeng <Unknown>\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: 2010-12-09 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
 msgstr "制造商产品代码"
@@ -80,3 +85,19 @@ msgstr "制造商产品名称"
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr "制造商"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "描述视图架构的XML文件无效"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "模块的认证ID必须唯一"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "模块名必须是唯一的！"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "字段的长度不小于1"