[MERGE] forward port branch saas-11.1 up to 726b91b9fbc

3 files changed, 17 insertions, 17 deletions

diff --git a/addons/theme_default/i18n/es.po b/addons/theme_default/i18n/es.po
index 9937354eba7..bddf4d49bf9 100644
--- a/addons/theme_default/i18n/es.po
+++ b/addons/theme_default/i18n/es.po
@@ -3,19 +3,18 @@
 # * theme_default
 # 
 # Translators:
-# Odoo developer at Praxya.com <sergio.estada@gmail.com>, 2017
+# Odoo developer at Praxya.com <sergio.estada@gmail.com>, 2016
+# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux <mat@odoo.com>, 2016
+# Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
-# Ivan Nieto <ivan.n.s@tuta.io>, 2017
-# RGB Consulting <odoo@rgbconsulting.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-25 09:00+0000\n"
 "PO-Revision-Date: 2015-08-25 09:00+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -104,4 +103,4 @@ msgstr "Piedra"
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
 msgid "×"
-msgstr "×"
+msgstr "x"
diff --git a/addons/theme_default/i18n/nl.po b/addons/theme_default/i18n/nl.po
index 0a0bab7735c..088e73dd16b 100644
--- a/addons/theme_default/i18n/nl.po
+++ b/addons/theme_default/i18n/nl.po
@@ -3,14 +3,14 @@
 # * theme_default
 # 
 # Translators:
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-25 09:00+0000\n"
 "PO-Revision-Date: 2015-08-25 09:00+0000\n"
-"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr ""
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
 msgid "Amethyst"
-msgstr "Amethist"
+msgstr "Violet"
 
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
@@ -64,7 +64,7 @@ msgstr "Personaliseer dit thema"
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
 msgid "Emerald"
-msgstr "Smaragdgroen"
+msgstr "smaragdgroen"
 
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
@@ -94,7 +94,7 @@ msgstr "HOOFDKLEUR"
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
 msgid "Stone"
-msgstr "Stee"
+msgstr "Steen"
 
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
diff --git a/addons/theme_default/i18n/zh_CN.po b/addons/theme_default/i18n/zh_CN.po
index 46c48402686..790e6e15754 100644
--- a/addons/theme_default/i18n/zh_CN.po
+++ b/addons/theme_default/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * theme_default
 # 
 # Translators:
-# Liping Wang <lynn.config@gmail.com>, 2017
-# liAnGjiA <liangjia@qq.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Liping Wang <lynn.config@gmail.com>, 2016
+# liAnGjiA <liangjia@qq.com>, 2016
+# Gary Wei <Gary.wei@elico-corp.com>, 2016
+# Martin Trigaux <mat@odoo.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-25 09:00+0000\n"
 "PO-Revision-Date: 2015-08-25 09:00+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +82,7 @@ msgstr "全宽"
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal
 msgid "Gold"
-msgstr "黄金"
+msgstr "金"
 
 #. module: theme_default
 #: model:ir.ui.view,arch_db:theme_default.customize_modal