[MERGE] forward port of branch 8.0 up to e883193

2 files changed, 87 insertions, 42 deletions

diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 84b4bea8771..cd6a0487b29 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-09-18 12:22+0000\n"
+"Last-Translator: Heike Vocks (openbig.org) <heike.vocks@big-consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-19 08:19+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "(reload fonts)"
-msgstr ""
+msgstr "(Schriftarten erneut laden)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
@@ -36,6 +36,7 @@ msgstr "Ermögliche Dokumentenfreigabe"
 #: field:base.config.settings,module_google_calendar:0
 msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
+"Benutzer können ihren Kalender mit dem Google Kalender synchronisieren."
 
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
@@ -51,7 +52,7 @@ msgstr "Anwenden"
 #. module: base_setup
 #: field:base.config.settings,module_google_drive:0
 msgid "Attach Google documents to any record"
-msgstr ""
+msgstr "Hängen Sie Google Dokumente an jeden beliebigen Datensatz an."
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -100,14 +101,14 @@ msgstr "Kontakte"
 #: field:base.setup.terminology,create_uid:0
 #: field:sale.config.settings,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "Erstellt von"
 
 #. module: base_setup
 #: field:base.config.settings,create_date:0
 #: field:base.setup.terminology,create_date:0
 #: field:sale.config.settings,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Erstellt am"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -145,6 +146,7 @@ msgstr "Allgemeine Einstellungen"
 #: help:sale.config.settings,module_mass_mailing:0
 msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
+"Erhalten Sie Zugang für die Massenmail Statistik, verwalten Sie Kampagnen."
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
@@ -159,12 +161,12 @@ msgstr "Erteilen Sie den Kunden Zugriff auf Ihre eigenen Dokumente."
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Calendar"
-msgstr ""
+msgstr "Google Kalender"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Drive"
-msgstr ""
+msgstr "Google Drive"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -181,7 +183,7 @@ msgstr "Wie bezeichnen Sie einen Kunden"
 #: field:base.setup.terminology,id:0
 #: field:sale.config.settings,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -193,19 +195,19 @@ msgstr "Import / Export"
 #: field:base.setup.terminology,write_uid:0
 #: field:sale.config.settings,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "Zuletzt aktualisiert von"
 
 #. module: base_setup
 #: field:base.config.settings,write_date:0
 #: field:base.setup.terminology,write_date:0
 #: field:sale.config.settings,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "Zuletzt aktualisiert am"
 
 #. module: base_setup
 #: field:sale.config.settings,module_mass_mailing:0
 msgid "Manage mass mailing campaigns"
-msgstr ""
+msgstr "Verwalten Sie Kampagnen für Massenmailings"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
@@ -229,6 +231,14 @@ msgid ""
 "Odoo using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"Odoo ermöglicht die automatische Erstellung von Interessenten (und anderen "
+"Belegen)\n"
+"aus eingehenden E-Mails. Sie können Ihren E-Mail Posteingang regelmässig "
+"synchronisieren, indem\n"
+"Sie hierzu Ihre POP/IMAP Konten anbinden und dann ein Script zur direkten E-"
+"Mail Integration \n"
+"regelmässig anwenden, oder indem Sie selektiv mit Hilfe eines Plugins Ihre E-"
+"Mails von Ihrer präferierten E-Mail-Anwendung nach Odoo übertragen."
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -236,6 +246,8 @@ msgid ""
 "Once installed, you can configure your API credentials for \"Google "
 "calendar\""
 msgstr ""
+"Sobald die Installation abgeschlossen ist, können Sie Ihre API Einstellungen "
+"für den \"Google Kalender\" konfigurieren."
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -265,7 +277,7 @@ msgstr "Angebote und Aufträge"
 #. module: base_setup
 #: field:base.config.settings,font:0
 msgid "Report Font"
-msgstr ""
+msgstr "Schriftart"
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
@@ -283,6 +295,8 @@ msgid ""
 "Set the font into the report header, it will be used as default font in the "
 "RML reports of the user company"
 msgstr ""
+"Stellen Sie im Report-Header die Schriftart ein, Sie wird dann standardmäßig "
+"für die RML Reports Ihres Unternehmens verwendet."
 
 #. module: base_setup
 #: help:base.config.settings,module_share:0
@@ -302,17 +316,17 @@ msgstr "Spezifizieren Sie Ihre Terminologie"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr "Mieter"
+msgstr "Unternehmen"
 
 #. module: base_setup
 #: help:base.config.settings,module_google_calendar:0
 msgid "This installs the module google_calendar."
-msgstr ""
+msgstr "Bei Aktivierung wird das Modul Google Kalender installiert."
 
 #. module: base_setup
 #: help:base.config.settings,module_google_drive:0
 msgid "This installs the module google_docs."
-msgstr ""
+msgstr "Bei Aktivierung wird das Modul Google Docs installiert."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -358,6 +372,10 @@ msgid ""
 "companies.\n"
 "-This installs the module multi_company."
 msgstr ""
+"Arbeiten Sie in einer Multi-Company Umgebung, und wenden Sie die "
+"entsprechenden Berechtigungen für den wechselseitigen Unternehmenszugriff "
+"einfach an. \n"
+"- Sie installieren hier das Modul multi_company."
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index cfe694503d2..e6625a73792 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-09-18 12:12+0000\n"
+"Last-Translator: Opencloud - PT <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-19 08:19+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "(reload fonts)"
-msgstr ""
+msgstr "(recarregar fontes)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
@@ -36,6 +36,8 @@ msgstr "Permitir a partilha de documentos"
 #: field:base.config.settings,module_google_calendar:0
 msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
+"Permitir que os utilizadores sincronizem o seu calendário com o Google "
+"Calendar"
 
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
@@ -51,7 +53,7 @@ msgstr "Aplicar"
 #. module: base_setup
 #: field:base.config.settings,module_google_drive:0
 msgid "Attach Google documents to any record"
-msgstr ""
+msgstr "Anexe documentos google a qualquer registo"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -78,7 +80,7 @@ msgstr "Cliente"
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Configure Sales"
-msgstr ""
+msgstr "Configurar Vendas"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -100,14 +102,14 @@ msgstr "Contactos"
 #: field:base.setup.terminology,create_uid:0
 #: field:sale.config.settings,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "Criado por"
 
 #. module: base_setup
 #: field:base.config.settings,create_date:0
 #: field:base.setup.terminology,create_date:0
 #: field:sale.config.settings,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "Criado em"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -117,7 +119,7 @@ msgstr "Cliente"
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
-msgstr ""
+msgstr "Funcionalidades de Cliente"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -145,6 +147,7 @@ msgstr "Configurações Gerais"
 #: help:sale.config.settings,module_mass_mailing:0
 msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
+"Tenha acesso a estatísticas com o envio de emails em massa , gira campanhas ."
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
@@ -154,17 +157,17 @@ msgstr "Conseguir os contactos automaticamente (através do linkedIn)"
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Dê aos seus clientes o acesso aos seus documentos ."
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Calendar"
-msgstr ""
+msgstr "Calendário Google"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Drive"
-msgstr ""
+msgstr "Google Drive"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -181,7 +184,7 @@ msgstr "Como vai chamar o cliente"
 #: field:base.setup.terminology,id:0
 #: field:sale.config.settings,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -193,19 +196,19 @@ msgstr "Importar / Exportar"
 #: field:base.setup.terminology,write_uid:0
 #: field:sale.config.settings,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "Última Actualização por"
 
 #. module: base_setup
 #: field:base.config.settings,write_date:0
 #: field:base.setup.terminology,write_date:0
 #: field:sale.config.settings,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "Última Actualização em"
 
 #. module: base_setup
 #: field:sale.config.settings,module_mass_mailing:0
 msgid "Manage mass mailing campaigns"
-msgstr ""
+msgstr "Gerir Campanhas de Emails em Massa"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
@@ -229,6 +232,14 @@ msgid ""
 "Odoo using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"Odoo permite criar automaticamente dicas (ou outros documentos )\n"
+"                            de e-mails recebidos . Você pode sincronizar "
+"automaticamente e-mails com Odoo\n"
+"                            usando contas normais POP / IMAP , usando um "
+"script direto integração de e-mail para o seu\n"
+"                            servidor de e-mail , ou empurrando manualmente e-"
+"mails para Odoo usando específico\n"
+"                            plugins para o seu aplicativo de e-mail preferido"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -236,6 +247,8 @@ msgid ""
 "Once installed, you can configure your API credentials for \"Google "
 "calendar\""
 msgstr ""
+"Uma vez instalado , você pode configurar as suas credenciais de API para \" "
+"Google Calendar \""
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -255,7 +268,7 @@ msgstr "Paciente"
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Portal access"
-msgstr ""
+msgstr "Acesso portal"
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
@@ -265,17 +278,17 @@ msgstr "Orçamentos e ordens de venda"
 #. module: base_setup
 #: field:base.config.settings,font:0
 msgid "Report Font"
-msgstr ""
+msgstr "Fonte do Relatório"
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "VENDA"
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Sale Features"
-msgstr ""
+msgstr "Funcionalidades das Vendas"
 
 #. module: base_setup
 #: help:base.config.settings,font:0
@@ -283,11 +296,13 @@ msgid ""
 "Set the font into the report header, it will be used as default font in the "
 "RML reports of the user company"
 msgstr ""
+"Definir a fonte no cabeçalho do relatório , ele será usado como fonte padrão "
+"nos relatórios de RML da empresa do utilizador"
 
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Compartilhe ou embbed qualquer vista do odoo."
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
@@ -307,12 +322,12 @@ msgstr "Inquilino"
 #. module: base_setup
 #: help:base.config.settings,module_google_calendar:0
 msgid "This installs the module google_calendar."
-msgstr ""
+msgstr "Instala o módulo google_calendar."
 
 #. module: base_setup
 #: help:base.config.settings,module_google_drive:0
 msgid "This installs the module google_docs."
-msgstr ""
+msgstr "Instala o módulo google_docs"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -347,6 +362,13 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Quando enviar um documento para um cliente\n"
+"                                    ( cotação, fatura) , 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"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -355,6 +377,9 @@ msgid ""
 "companies.\n"
 "-This installs the module multi_company."
 msgstr ""
+"Trabalhar em ambiente multi- empresa, com acesso de segurança adequado entre "
+"empresas .\n"
+"-Instala o módulo Multi_Company."
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form
@@ -371,6 +396,8 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Vai encontrar mais opções em detalhes da sua empresa : endereço para o "
+"cabeçalho e rodapé , textos pagamentos em atraso , etc"
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form