[MERGE] forward port branch saas-10 up to fc0f023

4 files changed, 9 insertions, 8 deletions

diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 25dc40aae07..0a0097f9ba0 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-10-06 08:56+0000\n"
+"PO-Revision-Date: 2016-07-23 05:03+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/odoo/odoo-9/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -198,7 +198,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_light_multi_company
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Gestionar varias compañias"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/i18n/he.po b/addons/base_setup/i18n/he.po
index 62e0f6528e2..55e1e0c8527 100644
--- a/addons/base_setup/i18n/he.po
+++ b/addons/base_setup/i18n/he.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2016-07-07 22:54+0000\n"
+"PO-Revision-Date: 2016-07-23 16:37+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Hebrew (http://www.transifex.com/odoo/odoo-9/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -104,7 +104,7 @@ msgstr "לקוח"
 #: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_display_name
 #: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "השם המוצג"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 2e75ab416f3..cdcc31239e6 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # takuan_osho <shimizu.taku@gmail.com>, 2015
+# Yoshi Tashiro <tashiro@roomsfor.hk>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-11-09 12:41+0000\n"
-"Last-Translator: takuan_osho <shimizu.taku@gmail.com>\n"
+"PO-Revision-Date: 2016-07-14 07:14+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -131,7 +132,7 @@ msgstr "顧客に文書へのアクセスを与えます。"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.view_general_configuration
 msgid "Google Calendar"
-msgstr "Google カレンダー"
+msgstr "Google カレンダ"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.view_general_configuration
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml
index b45a4909c97..afb0bec573e 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/res_config_views.xml
@@ -74,7 +74,7 @@
                         <label for="module_inter_company_rules" string="Inter company"/>
                         <div name="inter_company">
                             <div name="module_inter_company_rules">
-                                <field name="module_inter_company_rules" class="oe_inline"/>
+                                <field name="module_inter_company_rules" class="oe_inline" widget="upgrade_boolean"/>
                                 <label for="module_inter_company_rules"/>
                             </div>
                         </div>