[MERGE] forward port branch saas-14 up to 777a87cde8f

6 files changed, 833 insertions, 665 deletions

diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 27e7747e212..9d876a22b61 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -7,21 +7,24 @@
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
-# Oihane Crucelaegui <oihanecruce@gmail.com>, 2016
+# oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
-# José Vicente <txusev@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.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
+# Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
+# Antonio Trueba <atgayol@gmail.com>, 2017
+# RGB Consulting <odoo@rgbconsulting.com>, 2017
+# Luis M. Triana <luis.triana@jarsa.com.mx>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
-"Last-Translator: Sergio Flores <vitavitae1@gmail.com>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Luis M. Triana <luis.triana@jarsa.com.mx>, 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"
@@ -30,14 +33,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "Activar el portal de cliente"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "Permitir compartir documentos"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "Permisos de acceso"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -52,6 +56,7 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr ""
 "Permitir a los usuarios importar datos desde archivos CSV/XLS/XLSX/ODS"
@@ -59,12 +64,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "Aplicar"
+msgstr "Permite trabajar en un entorno multidivisa"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
@@ -72,24 +72,48 @@ msgid "Attach Google documents to any record"
 msgstr "Adjuntar documentos de Google a cualquier registro"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "Autentificación"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "Configurar servidores de correo saliente"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure your company data"
-msgstr "Configurar datos de su compañía"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "Compañía"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -102,45 +126,68 @@ msgid "Created on"
 msgstr "Creado el"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr "Pie de informe personalizado"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "Correo electrónico"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "Texto mostrado en el pie de página de todos los informes."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr "Opciones Generales"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "Dar a sus clientes acceso a sus documentos."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Calendario de Google"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Integración con Google"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "Hojas de cálculo de Google"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -148,14 +195,25 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "Importar / Exportar"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "Inter-compañía"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -183,38 +241,29 @@ msgid "Manage multiple companies"
 msgstr "Gestionar varias compañías"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "Multi compañía"
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "Multi-divisa"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
 msgstr ""
-"Una vez instalado, puede configurar sus credenciales de la API para el "
-"calendario de Google"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "Acceso portal"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "Guardar"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "Comparta o incruste cualquier pantalla de Odoo."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -233,64 +282,44 @@ msgstr ""
 "* Desmarcado: Cada compañía podrá ver solo sus empresas (empresas en las que la compañía está definida). Las empresas sin compañía establecida serán visibles para todas las compañías."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
-msgstr "Recursos compartidos"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "Esto instala el módulo google_calendar."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "Esto instala el módulo google_docs"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
 msgstr ""
-"Esto instala el módulo inter_company_rules.\n"
-"Configure reglas de compañía para crear automáticamente pedidos de venta o de compra cuando una de sus compañías venda/compre a otra de sus compañías."
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers (OAuth)"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+msgid "Use external authentication providers (OAuth)"
 msgstr ""
-"Cuando envía un documento a un cliente (presupuesto, factura), el cliente "
-"podrá ingresar para obtener todos sus documentos, leer las noticias de la "
-"compañía, comprobar sus proyectos, etc."
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
 msgstr ""
-"Trabaje en entornos multi-compañía, con reglas de acceso apropiadas entre "
-"las mismas."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Encontrará más opciones en los detalles de su compañía: dirección para la "
-"cabecera y pie, textos de recordatorio de pagos, etc."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "Usuarios"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index df6f9bc2824..433b8dc85ec 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,19 +7,19 @@
 # Clo <clo@odoo.com>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Xavier Symons <xsy@openerp.com>, 2016
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Christophe Dubuit <cdubuit@yahoo.com>, 2016
-# Maxime Solinas <msolinas@t2o.ca>, 2016
-# Guillaume Rancourt <guillaumerancourt971@gmail.com>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Florian Hatat <mininet@wanadoo.fr>, 2016
+# zeroheure <xavier@alternatif.org>, 2017
+# Lucas Deliege <lud@odoo.com>, 2017
+# Fabien Pinckaers <fp@openerp.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
-"Last-Translator: Florian Hatat <mininet@wanadoo.fr>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Fabien Pinckaers <fp@openerp.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"
@@ -28,14 +28,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "Activer le portail client"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "Autoriser le partage de documents"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "Droits d'accès"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -51,18 +52,14 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_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/KLS/XLSX/ODS"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "Appliquer"
+msgstr "Vous permet de travailler avec plusieurs devises"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
@@ -70,24 +67,48 @@ msgid "Attach Google documents to any record"
 msgstr "Attacher des documents Google à n'importe quel enregistrement"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "Authentification"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "Annuler"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "Paramétrer les serveurs de courriels sortants"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "Sociétés"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure your company data"
-msgstr "Configurer les données de la société"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "Société"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -100,45 +121,68 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "Courriel"
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "Pied de page de tous les rapports."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr "Paramètres Généraux"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "Donner à vos clients l'accès à leur documents"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Calendrier Google"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Intégration Google"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "Feuille de calcul Google"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -146,14 +190,25 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "Import / Export"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "inter-compagnie"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -181,38 +236,29 @@ msgid "Manage multiple companies"
 msgstr "Gérer plusieurs sociétés"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "Multi société"
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "Multi-devises"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
 msgstr ""
-"Une fois l'API installée, vous pouvez la configurer avec les informations "
-"d'identification pour \"Google Calendar\""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "Accès au portail"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "Sauvegarder"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "Partagez ou embarquez n'importe quel écran d'Odoo."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -231,67 +277,44 @@ msgstr ""
 "* Non coché : Chaque société ne peut voir que ses partenaires (partenaires pour lesquels la société est définie). Les partenaires non reliés à une société sont visibles par toutes les sociétés."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
-msgstr "Ressources partagées"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "Ceci installe le module google_calendar."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "Ceci installe le module google_docs."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
 msgstr ""
-"Ceci installe le module inter_company_rules.\n"
-"Configurez les règles de votre société pour créer automatiquement des bons de commande d'achats/ventes quand elle vend / achète à une autre de vos sociétés."
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers (OAuth)"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+msgid "Use external authentication providers (OAuth)"
 msgstr ""
-"Lorsque vous envoyez un document à un client\n"
-"                                    (devis, facture), votre client pourra\n"
-"                                     s'inscrire pour obtenir tous ses documents, \n"
-"                                     lire les nouvelles de la société, consulter ses projets, \n"
-"                                    etc."
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
 msgstr ""
-"Travailler en mode multi-sociétés, avec une sécurité d'accès appropriée "
-"entre les sociétés."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"D'autres options sont disponibles dans les détails de votre société : "
-"adresse pour les en-têtes et pieds de page, textes de relances de paiements,"
-" etc."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "Utilisateurs"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 1bd493dd7a2..a0e084cd587 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -8,10 +8,10 @@
 # Martin Trigaux <mat@odoo.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "Ügyfélportál aktiválása"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "Dokumentumok megosztásának engedélyezése"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "Hozzáférési jogok"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -44,6 +45,7 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr ""
 "Engedélyezze felhasználók számára adatok betöltését CSV/XLS/XLSX/ODS "
@@ -55,34 +57,53 @@ msgid "Allows to work in a multi currency environment"
 msgstr "Több pénznemes környezetet tesz elérhetővé"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "Alkalmaz"
-
-#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
 msgid "Attach Google documents to any record"
 msgstr "Csatoljon Google dokumentumokat bármilyen rekordhoz"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "Azonosítás"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "Mégse"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "Kimenő e-mail szerverek beállítása"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "Vállalatok"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.view_general_configuration
-msgid "Configure your company data"
-msgstr "A vállalata adatainak beállítása"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -95,45 +116,68 @@ msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr "Egyedi kimutatás lábléc"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "Megjelenített név"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
-msgstr "Szerkessze az új felhasználó alapértelmezett hozzáférési jogait"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "E-mail"
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "Lábjegyzet szövege megjelenítve minden kimutatás alján."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr "Általános beállítások"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "Adjon hozzáférést a vevőknek a dokumentumaikhoz."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Google naptár"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Google integráció"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "Google táblázatkezelő"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -141,14 +185,25 @@ msgid "ID"
 msgstr "Azonosító ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "Importálás / Exportálás"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "Belső vállalat"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -176,38 +231,29 @@ msgid "Manage multiple companies"
 msgstr "Több vállalkozás kezelése"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "Többszintű vállalkozás"
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "Többféle pénznem"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
-msgstr "Új felhasználó hozzáférési jogai"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
 msgstr ""
-"Telepítése után beállíthatóak az API interfész engedélyek a \"Google "
-"naptár\" alkalmazáshoz"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "Portál hozzáférés"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "Mentés"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "Bármely Odoo képernyő megosztása vagy beágyazása"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -226,28 +272,29 @@ msgstr ""
 " * Nem bejelölt: Mindegyik vállalat csak a saját partnereit látja  (partnerek, melyek a vállalathoz kapcsoltak). Partnerek, melyek egyik vállalathoz sem tartoznak azok az összes vállalat számára láthatóak."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
-msgstr "Megosztott erőforrások "
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "Ez előkészíti a google_calendar modult."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "Ez előkészíti a google_docs modult."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
-"Ez a inter_company_rules modult telepíti. \n"
-" Állítsa be a vállalati szabályokat az automatikus VM - Vevői Megrendelés / BM -Szállítói Megrendelés létrehozásához ha az egyik vállalat értékesít/vásárol a másik vállalatától."
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
@@ -255,37 +302,14 @@ msgid "Use external authentication providers (OAuth)"
 msgstr "Külső azonosító szolgáltatók használata (OAuth)"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
 msgstr ""
-"Ha egy dokumentumot küld egy Vevőhöz\n"
-"                                    (árajánlat, számla), a Vevő feliratkozhat\n"
-"                                    a dokumentumainak eléréséhez,\n"
-"                                    a vállalati új hírek elolvasásához, projektek ellenőrzéséhez,\n"
-"                                    stb."
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
-msgstr ""
-"Több vállalkozásos környezetben, a vállalatok közti megfelelő biztonsági "
-"hozzáférésekkel."
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Több lehetőséget fog találni a vállalata részleteinél: a fejléc és "
-"lábjegyzet címek, határidő túllépés szöveges üzenete, stb."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "Felhasználók"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 34fb4f395fa..02302211d81 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -7,13 +7,14 @@
 # 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
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 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"
@@ -22,14 +23,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "Activeer het klantenportaal"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "Delen van documenten toestaan"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "Toegangsrechten"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -43,6 +45,7 @@ msgstr "Toestaan dat gebruikers hun agenda synchroniseren met Google Agenda"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr ""
 "Sta gebruikers toe om data te importeren vanuit CSV/XLS/XLSX/ODS bestanden"
@@ -53,34 +56,53 @@ msgid "Allows to work in a multi currency environment"
 msgstr "Dit geeft u de mogelijkheid van het gebruik van meerdere valuta's"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "Toepassen"
-
-#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
 msgid "Attach Google documents to any record"
 msgstr "Voeg Google documenten toe aan ieder record"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "Authenticatie"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "Annuleer"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "Uitgaande e-mail servers instellen"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure your company data"
-msgstr "Uw bedrijfsgegevens instellen"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -93,45 +115,68 @@ msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr "Aangepaste voettekst"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "E-mail"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "Voettekst, weergegeven aan de onderzijde van alle rapportages."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr "Algemene instellingen"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "Geef uw klanten toegang tot hun documenten."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr "Gengo vertalingen"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Google Agenda"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Google integratie"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "Google Spreadsheet"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -139,14 +184,25 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "Import / Export"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr "Importeer & Exporteer"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr "integraties"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "Inter-bedrijf"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr "LDAP authenticatie"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -174,38 +230,29 @@ msgid "Manage multiple companies"
 msgstr "Beheer meerdere bedrijven"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "Multi-bedrijf"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "Meerdere valuta's"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
+msgstr "Meerdere bedrijven"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
-msgstr ""
-"Wanneer geïnstalleerd, kunt u de API instellingen maken voor de Google "
-"Agenda."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
+msgstr "OAuth authenticatie"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "Portaal toegang"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "Opslaan"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "Deel of sluit een scherm van Odoo in."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr "Stel aangepaste toegangsrechten in voor nieuwe gebruikers"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -224,66 +271,44 @@ msgstr ""
 "* Uitgevinkt: Elk bedrijf kan elke zijn eigen relaties zien (relaties waar bedrijf is gedefinieerd). Relaties die niet gerelateerd zijn aan een bedrijf zijn zichtbaar voor alle bedrijven."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
-msgstr "Gedeelde bronnen"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "Dit installeert de module google_calendar."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr "Vertaal uw website met Gengo"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "Dit installeert de module google_drive"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr "Vertaal uw website met Gengo"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
-msgstr ""
-"Dit installeert de module inter_company_rules.\n"
-"Configureer bedrijfsregels om automatisch SO/PO te genereren wanneer één van uw bedrijven verkoopt/koopt aan één van uw andere bedrijven."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
+msgstr "Gebruik LDAP authenticatie om aan te melden"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers (OAuth)"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
-msgstr ""
-"Wanneer u een document naar een klant stuurt,\n"
-"                                    (offerte, factuur), kan uw klant\n"
-"                                    inloggen en inzage krijgen in zijn documenten,\n"
-"                                    uw bedrijfsnieuws lezen, zijn projecten controleren,\n"
-"                                    enz.."
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+msgid "Use external authentication providers (OAuth)"
+msgstr "Gebruik externe authenticatie providers (OAuth)"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
-msgstr ""
-"Werk in multi-bedrijfsomgeving, met de nodige beveiligingrestricties tussen "
-"bedrijven."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
+msgstr "Gebruik externe paden in Odoo Notities"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"U vind meer opties bij de bedrijfsgegevens: adres voor de kop- en voettekst,"
-" teksten voor achterstallige betalingen, enz."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "Gebruikers"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 8fb50b5cfd3..0748d609c6c 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -3,17 +3,18 @@
 # * base_setup
 # 
 # Translators:
-# grazziano <g.negocios@outlook.com.br>, 2016
+# grazziano <gra.negocia@gmail.com>, 2016
 # Mateus Lopes <mateus1@gmail.com>, 2016
 # Martin Trigaux <mat@odoo.com>, 2016
-# Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2016
+# Manel Tinoco <maneltinoco@gmail.com>, 2016
+# Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
-"Last-Translator: Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,14 +23,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "Ativar o Portal de Cliente"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "Permite compartilhar documentos"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "Permissões de Acesso"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -43,18 +45,14 @@ msgstr "Permite que usuários sincronizem suas agendas com a agenda do Google"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr "Permite aos usuários importar dados de arquivos CSV/XLS/XLSX/ODS"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "Aplicar"
+msgstr "Permite-lhe trabalhar num ambiente multi-moeda"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
@@ -62,24 +60,48 @@ msgid "Attach Google documents to any record"
 msgstr "Anexar documentos do Google para qualquer registro"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "Autenticação"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "Configurar servidor de e-mail de saida"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure your company data"
-msgstr "Configure os dados de sua empresa"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "Empresa"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -92,45 +114,68 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "Nome para Exibição"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "E-mail"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "Texto a ser mostrado no rodapé de todos os relatórios."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "Dê a seus clientes o acesso a seus documentos."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Agenda do Google"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Integração com Google"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "Google Spreadsheet"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -138,14 +183,25 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "Importar / Exportar"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "Multi-empresa"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -173,37 +229,29 @@ msgid "Manage multiple companies"
 msgstr "Gerenciar múltiplas Empresas"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "Multi Empresa"
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "Multiplas Moedas"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
 msgstr ""
-"Instalado, você poderá configurar suas permissões para a Agenda do Google"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "Acesso ao Portal"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "Salvar"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "Compartilhar ou incorporar qualquer tela do Odoo."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -222,66 +270,44 @@ msgstr ""
 "* Desmarcado: Cada empresa pode ver apenas seus parceiros (parceiros onde empresa está definida). Os parceiros não relacionados a uma empresa são visíveis para todas as empresas."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "Isto instala o módulo google_calendar"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "Isto instala o módulo google_docs."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
 msgstr ""
-"Isso instala o módulo inter_company_rules.\n"
-"Configure as regras da empresa para criar automaticamente SO/PO quando uma de suas empresa vende/compra para outra de suas empresas."
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers (OAuth)"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
-msgstr ""
-"Quando você enviar um documento para um cliente\n"
-"(fatura, cotação), seu cliente será\n"
-"capaz de se inscrever para obter todos os seus documentos,\n"
-"ler as notícias da empresa, verificar seus projetos,\n"
-"etc"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+msgid "Use external authentication providers (OAuth)"
+msgstr "Usar provedores de autenticação externos (OAuth)"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
 msgstr ""
-"Trabalhar em ambientes multi-empresa, com acessos de segurança adequados "
-"entre empresas."
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Você vai encontrar mais opções em detalhes da sua empresa: endereço para o "
-"cabeçalho e rodapé, textos atraso de pagamentos, etc"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "Usuários"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 53f1d96fbf5..3e3093243d7 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -3,14 +3,18 @@
 # * base_setup
 # 
 # Translators:
-# Jeffery Chenn <jeffery9@gmail.com>, 2016
+# 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
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 10:26+0000\n"
-"PO-Revision-Date: 2016-08-26 10:26+0000\n"
-"Last-Translator: Jeffery Chenn <jeffery9@gmail.com>, 2016\n"
+"POT-Creation-Date: 2017-02-15 09:49+0000\n"
+"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"Last-Translator: Martin Trigaux <mat@odoo.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"
@@ -19,14 +23,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr "激活客户门户"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"<strong>Save</strong> this page and come back here to set up the feature."
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr "允许单据分享"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Access Rights"
+msgstr "访问权限"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
@@ -40,18 +45,14 @@ msgstr "允许用户同步Google日历"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
 msgstr "允许用过通过 CSV/XLS/XLSX/ODS文档导入数据"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
 msgid "Allows to work in a multi currency environment"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Apply"
-msgstr "应用"
+msgstr "允许在多货币环境中使用"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_drive
@@ -59,24 +60,48 @@ msgid "Attach Google documents to any record"
 msgstr "附加Google文档到记录"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Authentication"
-msgstr "身份验证"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Automate inter-companies transactions"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid ""
+"By default, new users get highest access rights for all installed apps."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Cancel"
 msgstr "取消"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure outgoing email servers"
-msgstr "配置发信邮件服务器"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Common Contact Book"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Configure your company data"
-msgstr "配置公司数据"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Companies"
+msgstr "公司"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_id
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Company"
+msgstr "公司"
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+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.base_config_settings_view_form
+msgid "Create and attach Google Drive documents to any record"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
@@ -89,45 +114,68 @@ msgid "Created on"
 msgstr "创建时间"
 
 #. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_custom_report_footer
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_rml_footer
+msgid "Custom Report Footer"
+msgstr "自定义报表页脚"
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_user_rights
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Default Access Rights"
+msgstr ""
+
+#. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Edit default access rights for new users"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_default_external_email_server
+msgid "External Email Servers"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_pad
+msgid "External Pads"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Extract and analyze Odoo data from Google Spreadsheet"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Email"
-msgstr "Email"
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_rml_footer
+msgid "Footer text displayed at the bottom of all reports."
+msgstr "显示在所有报告下方的页脚文字。"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_config
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "General Settings"
-msgstr "通用设置"
+msgstr "常规设置"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr "让你的客户访问他们的单据"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Gengo Translations"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Calendar"
 msgstr "Google日历"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
 msgid "Google Drive"
 msgstr "Google网盘"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Google Integration"
-msgstr "Google集成"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_spreadsheet
+msgid "Google Spreadsheet"
+msgstr "谷歌电子表格"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
@@ -135,14 +183,25 @@ msgid "ID"
 msgstr "ID"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Import / Export"
-msgstr "导入/导出"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Import & Export"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Integrations"
+msgstr "集成"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Inter company"
-msgstr "公司间关联交易"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Inter-Companies Transactions"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_ldap
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "LDAP Authentification"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
@@ -170,36 +229,29 @@ msgid "Manage multiple companies"
 msgstr "管理多公司"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Company"
-msgstr "多公司"
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Multi Currencies"
-msgstr "多币种"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Manage multiple legal entities with separate accounting"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "New users access rights"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Multi-Companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"Once installed, you can configure your API credentials for \"Google "
-"calendar\""
-msgstr "一旦安装。您可以为\"Google日历\"设置您的API证书"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "OAuth Authentification"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Portal access"
-msgstr "门户访问"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Save"
+msgstr "保存"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr "共享或嵌入odoo页面"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Set custom access rights for new users"
+msgstr ""
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner
@@ -218,55 +270,44 @@ msgstr ""
 "公司）。但是没有关联到某一公司的产品对全部的公司都是可见的"
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Shared resources"
-msgstr "共享的资源"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Synchronize your calendar with Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr "安装模块 google_calendar"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_gengo
+msgid "Translate Your Website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr "安装模块 google_docs"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Translate your website with Gengo"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_inter_company_rules
-msgid ""
-"This installs the module inter_company_rules.\n"
-" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
-msgstr "需要安装inter_company_rules。当其中的一个公司卖给其它另外一家公司的时候可以配置自动创建SO/PO"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use LDAP credentials to log in"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers (OAuth)"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external accounts to log in (Google, Facebook, etc.)"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will be\n"
-"                                    able to signup to get all his documents,\n"
-"                                    read your company news, check his projects,\n"
-"                                    etc."
-msgstr "当你发送单据给客户(报价单，发票)，你的可登录并获取他的单据以及阅读你的公司内部新闻，兼且能检查他的项目等。。"
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
+msgid "Use external authentication providers (OAuth)"
+msgstr "使用外部验证提供者 (OAuth)"
 
 #. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
-msgid ""
-"Work in multi-company environments, with appropriate security access between"
-" companies."
-msgstr "在有安全访问设置的前提下在多公司环境下运行"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Use external pads in Odoo Notes"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr "你能在你的公司明细里找到多个选项：用于页首和页脚的地址，逾期支付文本等"
+#: model:ir.ui.view,arch_db:base_setup.base_config_settings_view_form
+msgid "Users"
+msgstr "用户"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings