[MERGE] merge from trunk addons

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

diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
old mode 100644 (file)
new mode 100755 (executable)
index 96360c4..65915ab
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-07-13 08:42+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
-msgstr ""
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " 会计属性"
 
 #. module: account_anglo_saxon
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
 msgstr ""
 
 #. module: account_anglo_saxon
@@ -54,6 +54,11 @@ msgid "Product Template"
 msgstr ""
 
 #. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
 msgstr ""
@@ -101,9 +106,6 @@ msgid ""
 "and cost price."
 msgstr "这科目将用于在采购价格和销售价格之间的价格差异"
 
-#~ msgid " Accounting Property"
-#~ msgstr " 会计属性"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"