[MERGE] forward port of branch 9.0 up to cb79297

2 files changed, 13 insertions, 10 deletions

diff --git a/addons/account_tax_python/i18n/es_MX.po b/addons/account_tax_python/i18n/es_MX.po
index d2f200a091e..b05f329be8f 100644
--- a/addons/account_tax_python/i18n/es_MX.po
+++ b/addons/account_tax_python/i18n/es_MX.po
@@ -3,13 +3,14 @@
 # * account_tax_python
 # 
 # Translators:
+# David Hernandez <davidhernandez.ctam@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 16:04+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2016-01-09 02:58+0000\n"
+"Last-Translator: David Hernandez <davidhernandez.ctam@gmail.com>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_tax_python.field_account_tax_python_applicable
 #: model:ir.model.fields,field_description:account_tax_python.field_account_tax_template_python_applicable
 msgid "Applicable Code"
-msgstr ""
+msgstr "Código Aplicable"
 
 #. module: account_tax_python
 #: model:ir.model.fields,help:account_tax_python.field_account_tax_python_compute
@@ -85,4 +86,4 @@ msgstr "Impuesto"
 #. module: account_tax_python
 #: model:ir.model,name:account_tax_python.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Plantillas para impuestos"
diff --git a/addons/account_tax_python/i18n/zh_CN.po b/addons/account_tax_python/i18n/zh_CN.po
index cdccbc6e199..b2113024167 100644
--- a/addons/account_tax_python/i18n/zh_CN.po
+++ b/addons/account_tax_python/i18n/zh_CN.po
@@ -3,13 +3,15 @@
 # * account_tax_python
 # 
 # Translators:
+# Gary Wei <Gary.wei@elico-corp.com>, 2016
+# jeffery9, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 16:04+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2016-01-06 03:50+0000\n"
+"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +36,7 @@ msgid ""
 ":param company: res.company recordset singleton\n"
 ":param product: product.product recordset singleton or None\n"
 ":param partner: res.partner recordset singleton or None"
-msgstr ""
+msgstr "通过设置变量‘结果’来计算税的总额\n\n:参数 base_amount: 浮点型, 税的实际额度\n:参数 price_unit: 浮点型\n:参数 quantity: 浮点型\n:参数 company: res.company 记录单\n:参数 product: product.product 记录单或者空\n:参数 partner: res.partner 记录单或者空"
 
 #. module: account_tax_python
 #: model:ir.model.fields,help:account_tax_python.field_account_tax_template_python_compute
@@ -46,7 +48,7 @@ msgid ""
 ":param quantity: float\n"
 ":param product: product.product recordset singleton or None\n"
 ":param partner: res.partner recordset singleton or None"
-msgstr ""
+msgstr "通过设置变量‘结果’来计算税的总额\n\n:参数 base_amount: 浮点型, 税的实际额度\n:参数 price_unit: 浮点型\n:参数 quantity: 浮点型\n:参数 company: res.company 记录单\n:参数 product: product.product 记录单或者空\n:参数 partner: res.partner 记录单或者空"
 
 #. module: account_tax_python
 #: model:ir.model.fields,help:account_tax_python.field_account_tax_python_applicable
@@ -58,7 +60,7 @@ msgid ""
 ":param company: res.company recordset singleton\n"
 ":param product: product.product recordset singleton or None\n"
 ":param partner: res.partner recordset singleton or None"
-msgstr ""
+msgstr "通过设置变量‘结果’的真或假来决定是否计算税的额度\n\n:参数 price_unit: 浮点型\n:参数 quantity: 浮点型\n:参数 company: res.company 记录单\n:参数 product: product.product 记录单或者空\n:参数 partner: res.partner 记录单或者空"
 
 #. module: account_tax_python
 #: model:ir.model.fields,help:account_tax_python.field_account_tax_template_python_applicable
@@ -69,7 +71,7 @@ msgid ""
 ":param quantity: float\n"
 ":param product: product.product recordset singleton or None\n"
 ":param partner: res.partner recordset singleton or None"
-msgstr ""
+msgstr "通过设置变量‘结果’的真或假来决定是否计算税的额度\n\n:参数 price_unit: 浮点型\n:参数 quantity: 浮点型\n:参数 company: res.company 记录单\n:参数 product: product.product 记录单或者空\n:参数 partner: res.partner 记录单或者空"
 
 #. module: account_tax_python
 #: model:ir.model.fields,field_description:account_tax_python.field_account_tax_python_compute