7 files changed, 80 insertions, 78 deletions
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 04f9470af49..4d515650021 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -3,24 +3,26 @@
 # * base_setup
 # 
 # Translators:
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
-# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
+# Martin Trigaux <mat@odoo.com>, 2016
+# Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
+# Sergio Flores <vitavitae1@gmail.com>, 2016
+# Diego de la Torre <diego.delatorreh@gmail.com>, 2016
 # Antonio Trueba <atgayol@gmail.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
-# Ruben Dario Machado <ruben@vauxoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
-# Cristóbal Martí Oliver <info@moblesmarti.com>, 2017
-# Sergio Flores <vitavitae1@gmail.com>, 2017
-# Juan José Scarafía <scarafia.juanjose@gmail.com>, 2017
+# Luis M. Triana <luis.triana@jarsa.com.mx>, 2017
+# Ruben Dario Machado <ruben@vauxoo.com>, 2017
 # Pierre-Antoine Magnet <pma@odoo.com>, 2017
+# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# Juan José Scarafía <scarafia.juanjose@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Pierre-Antoine Magnet <pma@odoo.com>, 2017\n"
+"Last-Translator: Juan José Scarafía <scarafia.juanjose@gmail.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"
@@ -32,9 +34,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid ""
 "<strong>Save</strong> this page and come back here to set up the feature."
-msgstr ""
-"<strong>Guarde</strong> esa página y regrese aquí para configurar la "
-"función."
+msgstr "Guarde esa página y regrese aquí para configurar la función."
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -57,7 +57,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_res_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
-msgstr "Permite trabajar en un entorno moneda"
+msgstr "Permite trabajar en un entorno multidivisa"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_voip
@@ -205,7 +205,7 @@ msgstr "Google Drive"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_spreadsheet
 msgid "Google Spreadsheet"
-msgstr "Hoja de cálculo de Google"
+msgstr "Hojas de cálculo de Google"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -332,7 +332,7 @@ msgstr "Usa cuentas externas (Google, Facebook, etc.) para iniciar sesión"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_oauth
 msgid "Use external authentication providers (OAuth)"
-msgstr "Uso de proveedores de autenticación externos (OAuth)"
+msgstr "Uso de proveedor de autenticación externos (OAuth)"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 053fcb780f2..39fa69390f8 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -3,27 +3,28 @@
 # * base_setup
 # 
 # Translators:
-# Florian Hatat <mininet@wanadoo.fr>, 2017
-# Eloïse Stilmant <est@odoo.com>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# Clo <clo@odoo.com>, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Christophe Dubuit <cdubuit@yahoo.com>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Martin Trigaux <mat@odoo.com>, 2016
+# Florian Hatat <mininet@wanadoo.fr>, 2016
 # Xavier Brochard <xavier@alternatif.org>, 2017
-# Richard Mathot <rim@odoo.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Christophe Dubuit <cdubuit@yahoo.com>, 2017
 # Lucas Deliege <lud@odoo.com>, 2017
+# Fabien Pinckaers <fp@openerp.com>, 2017
+# Richard Mathot <rim@odoo.com>, 2017
+# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# Eloïse Stilmant <est@odoo.com>, 2017
+# Xavier Belmere <Info@cartmeleon.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
-# Clo <clo@odoo.com>, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
-# Xavier Belmere <Info@cartmeleon.com>, 2017
-# Fabien Pinckaers <fp@openerp.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Fabien Pinckaers <fp@openerp.com>, 2017\n"
+"Last-Translator: Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_base_import
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
-msgstr "Permettre aux utilisateurs d'importer des fichiers CSV/XLS/XLSX/ODS"
+msgstr "Permettre aux utilisateurs d'importer des fichiers CSV/KLS/XLSX/ODS"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_res_config_settings_group_multi_currency
@@ -88,7 +89,7 @@ msgid ""
 "By default, new users get highest access rights for all installed apps."
 msgstr ""
 "Par défaut, les nouveaux utilisateurs ont les droits d'accès les plus hauts "
-"pour toutes les applications installées."
+"pour toutes les applications installées"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -136,15 +137,13 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Create and attach Google Drive documents to any record"
-msgstr ""
-"Créez des documents Google Drive et attachez-les à n'importe quel "
-"enregistrement"
+msgstr "Créez et attachez des documents Google Drive à vos entrées"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_custom_report_footer
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_report_footer
 msgid "Custom Report Footer"
-msgstr "Pied de page des rapports personnalisé"
+msgstr "Pied de page personnalisé"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_user_rights
@@ -187,7 +186,7 @@ msgstr "Format"
 #: model:ir.ui.menu,name:base_setup.menu_config
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "General Settings"
-msgstr "Paramètres généraux"
+msgstr "Paramètres Généraux"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -289,7 +288,7 @@ msgstr "Configuration"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_company_share_partner
 msgid "Share partners to all companies"
-msgstr "Partager les partenaires entre toutes les sociétés"
+msgstr "Partager les partenaires à toutes les sociétés"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_res_config_settings_company_share_partner
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index b8ff70d6d9e..a3435af2dbd 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -4,7 +4,6 @@
 # 
 # Translators:
 # Bole <bole@dajmi5.com>, 2017
-# Tina Milas <tina@uvid.hr>, 2017
 # Vladimir Olujić <olujic.vladimir@storm.hr>, 2017
 # Karolina Tonković <karolina.tonkovic@storm.hr>, 2017
 # Martin Trigaux <mat@odoo.com>, 2017
@@ -58,7 +57,7 @@ msgstr "Asterisk (VoIP)"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_drive
 msgid "Attach Google documents to any record"
-msgstr "Pridruži google dokumente bilokojem dokumentu"
+msgstr "Pridruži google dokumente bilokojem dokumentu u sustavu"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -181,12 +180,12 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Google Calendar"
-msgstr "Google kalendar"
+msgstr "Google Calendar"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Google Drive"
-msgstr "Google disk"
+msgstr "Google Disk"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_spreadsheet
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 317e099494b..3c21d5416af 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -3,11 +3,11 @@
 # * base_setup
 # 
 # Translators:
-# Cas Vissers <casvissers@brahoo.nl>, 2017
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
-# Eric Geens <ericgeens@yahoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
+# Martin Trigaux <mat@odoo.com>, 2016
+# Eric Geens <ericgeens@yahoo.com>, 2016
+# Cas Vissers <casvissers@brahoo.nl>, 2016
+# Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Melroy van den Berg <webmaster1989@gmail.com>, 2017
 msgid ""
 msgstr ""
@@ -29,7 +29,7 @@ msgid ""
 "<strong>Save</strong> this page and come back here to set up the feature."
 msgstr ""
 "<strong>Bewaar</strong> deze pagina en kom terug naar deze pagina om de "
-"optie in te stellen."
+"optie op te zetten."
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -105,7 +105,7 @@ msgstr "Pads voor samenwerking"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Common Contact Book"
-msgstr "Relaties delen tussen bedrijven"
+msgstr "Vaak voorkomende contact boek"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -115,7 +115,7 @@ msgstr "Bedrijven"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_company_id
 msgid "Company"
-msgstr "Bedijf"
+msgstr "Bedrijf"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -157,7 +157,7 @@ msgstr "Wijzig hoofding"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_external_email_server
 msgid "External Email Servers"
-msgstr "Externe e-mail servers"
+msgstr "Externe email servers"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -208,7 +208,7 @@ msgstr "Importeer & Exporteer"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Integrations"
-msgstr "Integraties"
+msgstr "integraties"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -295,7 +295,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Synchronize your calendar with Google Calendar"
-msgstr "Synchroniseer uw kalender met Google kalender"
+msgstr "Synchroniseer uw calendar met Google kalender"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 068e801dae9..ad48746bbf3 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,17 +7,18 @@
 # Sergey Vilizhanin <sv@grimmette.ru>, 2017
 # Максим Дронь <dronmax@gmail.com>, 2017
 # Martin Trigaux <mat@odoo.com>, 2017
-# Gennady Marchenko <gennadym@gmail.com>, 2017
 # Эдуард Манятовский <manyatovskiy@gmail.com>, 2017
 # KingOPl Slav <87slava13@gmail.com>, 2017
+# Gennady Marchenko <gennadym@gmail.com>, 2017
 # Андрей Гусев <gaussgss@gmail.com>, 2017
+# VItaly Skopin <skopin@lab49.ru>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Андрей Гусев <gaussgss@gmail.com>, 2017\n"
+"Last-Translator: VItaly Skopin <skopin@lab49.ru>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +58,7 @@ msgstr "Разрешена работа в мультивалютной сред
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_voip
 msgid "Asterisk (VoIP)"
-msgstr ""
+msgstr "Астериск (VoIP)"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_drive
@@ -83,7 +84,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Change Document Template"
-msgstr ""
+msgstr "Изменить шаблон документа"
 
 #. module: base_setup
 #: code:addons/base_setup/models/res_config_settings.py:100
@@ -94,7 +95,7 @@ msgstr "Выберите шаблон документа"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Choose your document's header and footer layout"
-msgstr ""
+msgstr "Выберите расположение заголовка и нижнего колонтитула"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_pad
@@ -122,6 +123,9 @@ msgid ""
 "Configure company rules to automatically create SO/PO when one of your "
 "company sells/buys to another of your company."
 msgstr ""
+"Настройка правил компании для автоматического создания заказов на продажу "
+"или поставку, в случаях когда одна из ваших компаний продаёт или покупает у "
+"другой вашей компании."
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -149,12 +153,12 @@ msgstr "Шаблон документа"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Edit Header"
-msgstr ""
+msgstr "Редактировать Заголовок"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_external_email_server
 msgid "External Email Servers"
-msgstr ""
+msgstr "Внешние Почтовые Сервера"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -200,23 +204,23 @@ msgstr "Google Электронные таблицы"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Import & Export"
-msgstr ""
+msgstr "Импорт и Экспорт"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Integrations"
-msgstr ""
+msgstr "Интеграции"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Inter-Company Transactions"
-msgstr ""
+msgstr "Внутренние транзакции"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_ldap
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "LDAP Authentication"
-msgstr ""
+msgstr "LDAP Авторизация"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_inter_company_rules
@@ -246,7 +250,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "OAuth Authentication"
-msgstr ""
+msgstr "OAuth Авторизация"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_paperformat_id
@@ -256,17 +260,17 @@ msgstr "Размер бумаги"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Preview Document"
-msgstr ""
+msgstr "Просмотр Документа"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Set custom access rights for new users"
-msgstr ""
+msgstr "Настройка прав доступа для новых пользователей"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Set the paper format of printed documents"
-msgstr ""
+msgstr "Установите формат бумаги для печати документов"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
@@ -292,7 +296,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Synchronize your calendar with Google Calendar"
-msgstr ""
+msgstr "Синхронизация вашего календаря с Календарем Google"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index e3f9a03884d..d5a75cb69cb 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,15 @@
 # Martin Trigaux <mat@odoo.com>, 2017
 # Ediz Duman <neps1192@gmail.com>, 2017
 # Ramiz Deniz Öner <deniz@denizoner.com>, 2017
+# Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2017
+# Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Ramiz Deniz Öner <deniz@denizoner.com>, 2017\n"
+"Last-Translator: Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -106,7 +108,7 @@ msgstr "Ortak Kişiler (Kontaklar)"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Companies"
-msgstr "Şirketler"
+msgstr "Firmalar"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_company_id
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index d2e0162d99e..82be09cf92f 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -3,25 +3,23 @@
 # * base_setup
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
-# 苏州远鼎 <tiexinliu@126.com>, 2017
+# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# 苏州远鼎 <tiexinliu@126.com>, 2016
+# Oliver Yuan <oliver.yuan@openstone.cn>, 2016
+# Xu Lei <xulei8@qq.com>, 2017
+# Martin Trigaux <mat@odoo.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
-# Gary Wei <Gary.wei@elico-corp.com>, 2017
-# 卓忆科技 <zhanghao@jointd.com>, 2017
-# Rona Lin <ssauapw@qq.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # Siyuan Gu <siyuancn@hotmail.com>, 2017
-# Xu Lei <xulei8@qq.com>, 2017
+# 卓忆科技 <zhanghao@jointd.com>, 2017
 # Talway <9010446@qq.com>, 2017
-# Oliver Yuan <oliver.yuan@openstone.cn>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Talway <9010446@qq.com>, 2017\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"
@@ -38,7 +36,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Access Rights"
-msgstr "访问权"
+msgstr "访问权限"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_google_calendar
@@ -339,4 +337,4 @@ msgstr "用户"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_res_config_settings
 msgid "res.config.settings"
-msgstr "res.config.settings"
+msgstr "设置-基础设置"