[MERGE] forward port branch saas-11.2 up to 0f02dcb6391

author: Christophe Simonis <chs@odoo.com> 2018-02-12 18:34:43 +0100
committer: Christophe Simonis <chs@odoo.com> 2018-02-12 18:34:43 +0100
commit: adeea2a88db4443b2b426877a28bb1471c2f5db1 (patch)
tree: 2f43fecc9649947d3061e8c482219fa167b3385a /addons
parent: 317f5f11112266128ac2292ecfafcd92cda74fd0 (diff)
parent: 0f02dcb63918228d48df50f2d5805b7fda25c14a (diff)
430 files changed, 9626 insertions, 4637 deletions
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6e02c98cf0f..78687cf475b 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -1141,6 +1141,8 @@ msgid ""
 "Account that will be set on invoice tax lines for credit notes. Leave empty "
 "to use the expense account."
 msgstr ""
+"Konto, das für Gutschriften auf Rechnungs-Steuerposten eingestellt wird. "
+"Lassen Sie diesen Bereich leer, um das Spesenkonto zu verwenden."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_account_id
@@ -1174,6 +1176,8 @@ msgid ""
 "Account used as counterpart for the journal entry, for taxes eligible based "
 "on payments."
 msgstr ""
+"Konto als Gegenposten für den Journaleintrag verwendet, für auf der "
+"Grundlage von Zahlungen berechnete Steuern."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_cron_reverse_entry_ir_actions_server
@@ -1191,7 +1195,7 @@ msgstr "Finanzen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Accounting App Options"
-msgstr ""
+msgstr "App-Optionen für Buchung"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
@@ -1406,7 +1410,7 @@ msgstr "Alle Rechnungen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_all_lines_reconciled
 msgid "All Lines Reconciled"
-msgstr ""
+msgstr "alle Positionen ausgeglichen"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -1491,7 +1495,7 @@ msgstr "Storno erlauben"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
 msgid "Allow Currency Rate Live"
-msgstr ""
+msgstr "Währungskurs Live zulassen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
@@ -1501,7 +1505,7 @@ msgstr "Genehmigen Sie den Ausgleich der Rechnungen & Buchungen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_product_margin
 msgid "Allow Product Margin"
-msgstr ""
+msgstr "Produkt-Margin erlauben"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_reconcile
@@ -1516,12 +1520,12 @@ msgstr "Ermögliche Scheckdruck und -hinterlegung"
 #. module: account
 #: model:res.groups,name:account.group_cash_rounding
 msgid "Allow the cash rounding management"
-msgstr ""
+msgstr "Bargeldrundungs-Management zulassen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Allow to configure taxes using cash basis"
-msgstr ""
+msgstr "Die Konfiguration von Steuern auf Bargeldgrundlage zulassen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1762,7 +1766,7 @@ msgstr "Steuerzuordnung generell anwenden"
 #: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id
 #: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
 msgid "Apply only if delivery or invoicing country match the group."
-msgstr ""
+msgstr "Nur anwenden, wenn Gruppe in Rechnung oder Lieferung zutrifft."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
@@ -1797,7 +1801,7 @@ msgstr "Archiviert"
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Ask for a Credit Note"
-msgstr ""
+msgstr "Nach Gutschrift fragen"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -1822,7 +1826,7 @@ msgstr "Mindestens ein Eingang"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_outbound
 msgid "At Least One Outbound"
-msgstr ""
+msgstr "Mindestens ein Ausgang"
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -1838,6 +1842,7 @@ msgstr "Automatisch erkennen"
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Automate deferred revenues entries for multi-year contracts"
 msgstr ""
+"Einträge zu Umsatzabgrenzungsposten bei Mehrjahresverträgen automatisieren"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1855,12 +1860,12 @@ msgstr ""
 #: code:addons/account/wizard/setup_wizards.py:79
 #, python-format
 msgid "Automatic Balancing Line"
-msgstr ""
+msgstr "Automatischer Ausgleichsposten"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Automatic Currency Rates"
-msgstr ""
+msgstr "Automatische Währungssätze"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1916,7 +1921,7 @@ msgstr "Saldo"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_balance_cash_basis
 msgid "Balance Cash Basis"
-msgstr ""
+msgstr "Saldo - Istversteuerung"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -2102,7 +2107,7 @@ msgstr "Grundbetrag"
 #: selection:account.tax,tax_exigibility:0
 #: selection:account.tax.template,tax_exigibility:0
 msgid "Based on Invoice"
-msgstr ""
+msgstr "Auf der Grundlage einer Rechnung"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_tax_exigibility
@@ -2111,12 +2116,14 @@ msgid ""
 "Based on Invoice: the tax is due as soon as the invoice is validated.\n"
 "Based on Payment: the tax is due as soon as the payment of the invoice is received."
 msgstr ""
+"Auf der Grundlage einer Rechnung: Die Steuer ist fällig, sobald die Rechnung validiert ist.\n"
+"Auf der Grundlage einer Zahlung: Die Steuer ist fällig, sobald die Rechnung eingeht."
 
 #. module: account
 #: selection:account.tax,tax_exigibility:0
 #: selection:account.tax.template,tax_exigibility:0
 msgid "Based on Payment"
-msgstr ""
+msgstr "Auf der Grundlage einer Zahlung"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -2153,7 +2160,7 @@ msgstr "Abrechnung"
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Billing Manager"
-msgstr ""
+msgstr "Abrechnungsmanager"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -2215,7 +2222,7 @@ msgstr "Nach Land"
 #. module: account
 #: model:ir.filters,name:account.filter_invoice_refund
 msgid "By Credit Note"
-msgstr ""
+msgstr "Nach Gutschrift"
 
 #. module: account
 #: model:ir.filters,name:account.filter_invoice_product
@@ -2247,12 +2254,12 @@ msgstr ""
 #: code:addons/account/models/chart_template.py:197
 #, python-format
 msgid "CABA"
-msgstr ""
+msgstr "CABA"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "CAMT Import"
-msgstr ""
+msgstr "CAMT-Import"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -2318,6 +2325,8 @@ msgstr ""
 #, python-format
 msgid "Cannot create credit note for the draft/cancelled invoice."
 msgstr ""
+"Für den Entwurf kann keine Gutschrift erstellt werden/Rechnung wurde "
+"storniert."
 
 #. module: account
 #: code:addons/account/models/account_move.py:198
@@ -2378,13 +2387,13 @@ msgstr "Einnahme-Überschuss-Rechnung (EÜR)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
 msgid "Cash Basis Journal"
-msgstr ""
+msgstr "Journal auf Bargeld-Grundlage"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:197
 #, python-format
 msgid "Cash Basis Tax Journal"
-msgstr ""
+msgstr "Steuer-Journal auf Bargeld-Grundlage"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:210
@@ -2406,19 +2415,19 @@ msgstr "Barkassen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_group_cash_rounding
 msgid "Cash Rounding"
-msgstr ""
+msgstr "Bargeld-Runden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_cash_rounding_id
 msgid "Cash Rounding Method"
-msgstr ""
+msgstr "Methode zum Bargeld-Runden"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.rounding_list_action
 #: model:ir.ui.menu,name:account.menu_action_rounding_form_view
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Cash Roundings"
-msgstr ""
+msgstr "Bargeld-Runden"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -2440,7 +2449,7 @@ msgstr "Beim Zählen (%s) festgestellte Bargelddifferenz"
 #: code:addons/account/models/account_journal_dashboard.py:37
 #, python-format
 msgid "Cash: Balance"
-msgstr ""
+msgstr "Bargeld: Saldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
@@ -2471,6 +2480,8 @@ msgstr "Kategorie des Erlöskontos"
 #: model:ir.model.fields,help:account.field_account_payment_writeoff_label
 msgid "Change label of the counterpart that will hold the payment difference"
 msgstr ""
+"Beschriftung des Gegenpostens ändern, der den Zahlungsunterschied halten "
+"wird"
 
 #. module: account
 #: code:addons/account/controllers/portal.py:148
@@ -2510,7 +2521,7 @@ msgstr "Buchungsvorlagen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_account_setup_coa_done
 msgid "Chart of Account Checked"
-msgstr ""
+msgstr "Markierter Kontenplan"
 
 #. module: account
 #. openerp-web
@@ -2563,6 +2574,8 @@ msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
 " credit notes made from this journal"
 msgstr ""
+"Wählen Sie diese Option, wenn Sie für Rechnungen und Gutschriften aus diesem"
+" Journal nicht den gleichen Nummernkreis verwenden wollen"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_update_posted
@@ -2640,7 +2653,7 @@ msgstr "Klicken Sie, um ein neues Konto hinzuzufügen."
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_out_refund
 msgid "Click to create a credit note."
-msgstr ""
+msgstr "Klicken Sie, um eine Gutschrift zu erstellen."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -2675,7 +2688,7 @@ msgstr "Klicken Sie, um eine neue Lieferantenrechnung aufzuzeichnen."
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_in_refund
 msgid "Click to record a new vendor credit note."
-msgstr ""
+msgstr "Klicken Sie, um eine neue Lieferanten-Gutschrift aufzuzeichnen."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2700,7 +2713,7 @@ msgstr "Schließen"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:60
 #, python-format
 msgid "Close statement"
-msgstr ""
+msgstr "Abschlussbericht"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_date_done
@@ -2722,7 +2735,7 @@ msgstr "Code"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_group_code_prefix
 msgid "Code Prefix"
-msgstr ""
+msgstr "Code-Präfix"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line_coin_value
@@ -2833,12 +2846,12 @@ msgstr "Betriebl. Währung"
 #: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:30
 #, python-format
 msgid "Company Data"
-msgstr ""
+msgstr "Unternehmensdaten"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_account_setup_company_data_done
 msgid "Company Setup Marked As Done"
-msgstr ""
+msgstr "Unternehmens-Konfiguration als erledigt markiert"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_has_chart_of_accounts
@@ -2859,7 +2872,7 @@ msgstr "Unternehmen für dieses Journal"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Compare actual revenues &amp; costs with budgets"
-msgstr ""
+msgstr "Tatsächliche Einnahmen und Kosten mit Haushalten vergleichen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.accounting_report_view
@@ -2993,7 +3006,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_reconciliation.xml:52
 #, python-format
 msgid "Congrats, you're all done!"
-msgstr ""
+msgstr "Glückwunsch, Sie sind fertig!"
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner
@@ -3033,6 +3046,8 @@ msgid ""
 "Could not install new chart of account as there are already accounting "
 "entries existing"
 msgstr ""
+"Neuer Kontenplan konnte nicht installiert werden, da bereits "
+"Buchungseinträge vorhanden sind"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_counterpart
@@ -3100,7 +3115,7 @@ msgstr "Model erstellen"
 #. module: account
 #: model:ir.actions.act_window,help:account.rounding_list_action
 msgid "Create the first cash rounding"
-msgstr ""
+msgstr "Erste Bargeld-Rundung erstellen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_create_uid
@@ -3252,12 +3267,12 @@ msgstr "Kreditkarte"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_credit_cash_basis
 msgid "Credit Cash Basis"
-msgstr ""
+msgstr "Haben - Istversteuerung"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_credit_move_id
 msgid "Credit Move"
-msgstr ""
+msgstr "Gutschriftbewegung"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:446
@@ -3280,12 +3295,12 @@ msgstr "Gutschrift"
 #: code:addons/account/models/account_invoice.py:447
 #, python-format
 msgid "Credit Note - %s"
-msgstr ""
+msgstr "Gutschreibung - %s"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Credit Note Bill"
-msgstr ""
+msgstr "Bescheinigung Gutschrift"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice
@@ -3295,7 +3310,7 @@ msgstr "Gutschrift-Datum"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id
 msgid "Credit Note Entry Sequence"
-msgstr ""
+msgstr "Eingabesequenz Gutschrift"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -3306,7 +3321,7 @@ msgstr "Gutschriften"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_number_next
 msgid "Credit Notes: Next Number"
-msgstr ""
+msgstr "Gutschriften: Nächste Zahl"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
@@ -3409,13 +3424,13 @@ msgstr "Kunde"
 #: code:addons/account/models/account_payment.py:661
 #, python-format
 msgid "Customer Credit Note"
-msgstr ""
+msgstr "Kunden-Gutschrift"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_out_refund
 #: model:ir.ui.menu,name:account.menu_action_invoice_out_refund
 msgid "Customer Credit Notes"
-msgstr ""
+msgstr "Kunden Gutschriften"
 
 #. module: account
 #: selection:account.invoice,type:0 selection:account.invoice.report,type:0
@@ -3466,7 +3481,7 @@ msgstr "Kunden"
 #. module: account
 #: selection:account.cash.rounding,rounding_method:0
 msgid "DOWN"
-msgstr ""
+msgstr "NACH UNTEN"
 
 #. module: account
 #. openerp-web
@@ -3508,6 +3523,8 @@ msgid ""
 "Date at which the opening entry of this company's accounting has been "
 "posted."
 msgstr ""
+"Datum, an dem der Eröffnungseintrag der Buchführung dieses Unternehmens "
+"gepostet wurde."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_financial_year_op_opening_date
@@ -3515,6 +3532,8 @@ msgid ""
 "Date from which the accounting is managed in Odoo. It is the date of the "
 "opening entry."
 msgstr ""
+"Datum, ab dem die Buchführung in Odoo verwaltet wird. Das ist das Datum des "
+"Eröffnungseintrags."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_reverse_date
@@ -3567,7 +3586,7 @@ msgstr "Soll"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_debit_cash_basis
 msgid "Debit Cash Basis"
-msgstr ""
+msgstr "Soll - Istversteuerung"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_inbound_payment_method_ids
@@ -3577,7 +3596,7 @@ msgstr "Abbuchungsmethoden"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_debit_move_id
 msgid "Debit Move"
-msgstr ""
+msgstr "Lastschriftbewegung"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_debit_account_id
@@ -3602,7 +3621,7 @@ msgstr "Dezember"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence
 msgid "Dedicated Credit Note Sequence"
-msgstr ""
+msgstr "Fest zugeordnete Gutschrift-Sequenz"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_default_credit_account_id
@@ -3649,12 +3668,14 @@ msgstr "Standardsteuern für inländische Transaktionen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Deferred Revenues Management"
-msgstr ""
+msgstr "Verwaltung von Umsatzabgrenzungsposten"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Define the smallest coinage of the currency used to pay by cash."
 msgstr ""
+"Die kleinste Münze der Währung definieren, die verwendet wurde, um per "
+"Bargeld zu zahlen."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_cash_rounding_id
@@ -3662,6 +3683,8 @@ msgid ""
 "Defines the smallest coinage of the currency that can be used to pay by "
 "cash."
 msgstr ""
+"Hierüber wird die kleinste Münze der Währung definiert, die verwendet werden"
+" kann, um per Bargeld zu zahlen."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_template_form
@@ -3876,7 +3899,7 @@ msgstr "Verwendung auf Rechnungen"
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_print_docsaway
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Docsaway"
-msgstr ""
+msgstr "Docsaway"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_overdue_document
@@ -3946,7 +3969,7 @@ msgstr "Fällig"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report_residual
 msgid "Due Amount"
-msgstr ""
+msgstr "Fälliger Betrag"
 
 #. module: account
 #. openerp-web
@@ -3998,16 +4021,18 @@ msgid ""
 "Duplicated vendor reference detected. You probably encoded twice the same "
 "vendor bill/credit note."
 msgstr ""
+"Duplizierte Lieferanten-Referenz wurde erkannt. Wahrscheinlich haben Sie "
+"zweimal dieselbe Lieferantenrechnung/Gutschrift verschlüsselt."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports
 msgid "Dynamic Reports"
-msgstr ""
+msgstr "Dynamische Berichte"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_l10n_eu_service
 msgid "EU Digital Goods VAT"
-msgstr ""
+msgstr "EU-MwSt. Digitale Produkte"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:171
@@ -4128,7 +4153,7 @@ msgstr "Journal Kursgewinn oder Verlust"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_exchange_move_id
 msgid "Exchange Move"
-msgstr ""
+msgstr "Wechselbewegung"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_expects_chart_of_accounts
@@ -4224,7 +4249,7 @@ msgstr "Finanzberichte"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_account_setup_fy_data_done
 msgid "Financial Year Setup Marked As Done"
-msgstr ""
+msgstr "Konfiguration des Geschäftsjahrs als erledigt markiert"
 
 #. module: account
 #: model:ir.actions.report,name:account.action_report_financial
@@ -4234,7 +4259,7 @@ msgstr "Finanzbericht"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op_account_setup_fy_data_done
 msgid "Financial year setup marked as done"
-msgstr ""
+msgstr "Konfiguration des Geschäftsjahrs als erledigt markiert"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_partner_property_form
@@ -4244,7 +4269,7 @@ msgstr "Steuerinformation"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Fiscal Localization"
-msgstr ""
+msgstr "Steuerliche Lokalisierung"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template_position_id
@@ -4254,7 +4279,7 @@ msgstr "Steuer-Umschlüsselung"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Fiscal Periods"
-msgstr ""
+msgstr "Steuer-Zeiträume"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -4299,13 +4324,13 @@ msgstr "Geschäftsjahr"
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_day
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_day
 msgid "Fiscalyear Last Day"
-msgstr ""
+msgstr "Geschäftsjahr letzter Tag"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_month
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_month
 msgid "Fiscalyear Last Month"
-msgstr ""
+msgstr "Geschäftsjahr letzter Monat"
 
 #. module: account
 #: selection:account.reconcile.model,amount_type:0
@@ -4387,7 +4412,7 @@ msgstr "Erzwinge diese alternative Währung bei allen Buchungen dieses Kontos."
 #: code:addons/account/report/account_tax.py:13
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
-msgstr ""
+msgstr "Der Inhalt fehlt; dieser Bericht kann nicht gedruckt werden."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:100
@@ -4475,7 +4500,7 @@ msgstr "Erzeuge Buchungen"
 #. module: account
 #: model:ir.ui.menu,name:account.account_reports_legal_statements_menu
 msgid "Generic Statements"
-msgstr ""
+msgstr "Allgemeine Bankbelege"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -4490,6 +4515,11 @@ msgid ""
 "“Bank Synchronization” in bank account settings. Then, click “Configure” on "
 "the online account to enter your bank credentials."
 msgstr ""
+"Mithilfe von Yodlee- und Plaid-Diensten können Sie automatisch alle 4 "
+"Stunden Ihre Bankbelege importieren lassen oder in nur einem Klick erhalten."
+" Sobald dies installiert ist, können Sie in den Bankkonto-Einstellungen "
+"„Bank Feeds“ auf „Bank-Synchronisation“ einstellen. Klicken Sie dann im "
+"Online-Konto auf „Konfigurieren“, um Ihre Bank-Anmeldedaten einzugeben."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line_sequence
@@ -4513,13 +4543,15 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of payment terms lines."
 msgstr ""
+"Zeigt die Reihenfolge an, wenn eine Liste mit Zahlungsbedingungspositionen "
+"angezeigt wird."
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_reconciliation.xml:57
 #, python-format
 msgid "Go to bank statement(s)"
-msgstr ""
+msgstr "Bankauszüge aufrufen"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:650
@@ -4573,40 +4605,40 @@ msgstr "Steuergruppe"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Group received checks before depositing them to the bank"
-msgstr ""
+msgstr "Gruppe erhielt Schecks, bevor sie diese bei der Bank hinterlegte"
 
 #. module: account
 #: selection:account.cash.rounding,rounding_method:0
 msgid "HALF-UP"
-msgstr ""
+msgstr "HALF-UP"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_has_accounting_entries
 msgid "Has Accounting Entries"
-msgstr ""
+msgstr "Hat Buchungsposten"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment_has_invoices
 msgid "Has Invoices"
-msgstr ""
+msgstr "Rechnungen vorhanden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_has_outstanding
 msgid "Has Outstanding"
-msgstr ""
+msgstr "Offene Posten vorhanden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner_has_unreconciled_entries
 #: model:ir.model.fields,field_description:account.field_res_users_has_unreconciled_entries
 msgid "Has Unreconciled Entries"
-msgstr ""
+msgstr "Nicht ausgeglichene Einträge vorhanden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_hide_payment_method
 #: model:ir.model.fields,field_description:account.field_account_payment_hide_payment_method
 #: model:ir.model.fields,field_description:account.field_account_register_payments_hide_payment_method
 msgid "Hide Payment Method"
-msgstr ""
+msgstr "Zahlungsmethode verbergen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_account_hide_setup_bar
@@ -4616,7 +4648,7 @@ msgstr "Setupleiste ausblenden"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_hide_tax_exigibility
 msgid "Hide Use Cash Basis Option"
-msgstr ""
+msgstr "Option „Bargeld-Grundlage verwenden“ verbergen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -4626,12 +4658,13 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "How do account types affect your reports?"
-msgstr ""
+msgstr "Wie wirken sich Konto-Typen auf Ihre Berichte aus?"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "How total tax amount is computed in orders and invoices"
 msgstr ""
+"Wie der gesamte Steuerbetrag in Bestellungen und Rechnungen berechnet wird"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_id
@@ -4761,6 +4794,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "terms without removing it."
 msgstr ""
+"Wenn dieses Feld deaktiviert wird, können die Zahlungsbedingungen ohne "
+"Entfernung einfach ausgeblendet werden."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_group_invoice_lines
@@ -4784,12 +4819,16 @@ msgid ""
 "If you check this box, you will be able to collect payments using SEPA "
 "Direct Debit mandates."
 msgstr ""
+"Wenn Sie diese Option ankreuzen, können Sie Zahlungen mit SEPA-"
+"Einzugsermächtigungen entgegennehmen."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid ""
 "If you check this box, you will be able to register your payment using SEPA."
 msgstr ""
+"Wenn Sie diese Option ankreuzen, können Sie Ihre Zahlung mit SEPA "
+"registrieren."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_report_general_ledger_initial_balance
@@ -4819,6 +4858,11 @@ msgid ""
 " date empty, it means direct payment. The payment terms may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Wenn Sie Zahlungsbedingungen verwenden, wird das Fälligkeitsdatum bei der "
+"Erstellung von Buchungsposten automatisch berechnet. Wenn Sie die "
+"Zahlungsbedingungen und das Fälligkeitsdatum leer lassen, bedeutet dies "
+"direkte Zahlung. Die Zahlungsbedingungen können mehrere Fälligkeitstermine "
+"berechnen, z. B. 50 % jetzt, 50 % in einem Monat."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_date_due
@@ -4829,6 +4873,13 @@ msgid ""
 " due date, make sure that the payment term is not set on the invoice. If you"
 " keep the Payment terms and the due date empty, it means direct payment."
 msgstr ""
+"Wenn Sie Zahlungsbedingungen verwenden, wird das Fälligkeitsdatum bei der "
+"Erstellung von Buchungsposten automatisch berechnet. Die Zahlungsbedingungen"
+" können mehrere Fälligkeitstermine berechnen, z. B. 50 % jetzt und 50 % in "
+"einem Monat, aber wenn Sie ein Fälligkeitsdatum festlegen wollen, stellen "
+"sicher, dass die Zahlungsfrist nicht auf der Rechnung festgesetzt wird. Wenn"
+" Sie die Zahlungsbedingungen und das Fälligkeitsdatum leer lassen, bedeutet "
+"dies direkte Zahlung."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -4839,6 +4890,13 @@ msgid ""
 "telecommunications, and services that are electronically supplied instead of"
 " shipped. Gift cards sent online are not included in the definition."
 msgstr ""
+"Wenn Sie digitale Waren an Kunden in der EU verkaufen, müssen Sie die MwSt. "
+"auf der Grundlage Ihrer Kunden-Standorte berechnen. Diese Regel gilt "
+"unabhängig davon, wo Ihr Standort ist. Digitale Waren werden in den "
+"Rechtsvorschriften definiert als Rundfunk, Telekommunikation und "
+"Dienstleistungen, die elektronisch erbracht werden, anstatt ausgeliefert zu "
+"werden. Geschenkkarten, die online versendet werden, entsprechen nicht "
+"dieser Definition."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line_product_image
@@ -4874,7 +4932,7 @@ msgstr "Importiere im .ofx-Format"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_bank_statement_import_camt
 msgid "Import in CAMT.053 format"
-msgstr ""
+msgstr "In CAMT.053-Format importieren"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -4884,22 +4942,22 @@ msgstr "Kontoauszüge automatisch importieren"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in CAMT.053"
-msgstr ""
+msgstr "Importieren Sie Ihre Bankauszüge in CAMT.053"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in CSV"
-msgstr ""
+msgstr "Importieren Sie Ihre Bankauszüge in CSV"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in OFX"
-msgstr ""
+msgstr "Importieren Sie Ihre Bankauszüge in OFX"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in QIF"
-msgstr ""
+msgstr "Importieren Sie Ihre Bankauszüge in QIF"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:409
@@ -5000,7 +5058,7 @@ msgstr "Informationsanhang"
 #: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:10
 #, python-format
 msgid "Initial Balances"
-msgstr ""
+msgstr "Anfangsbilanz"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_input_categ_id
@@ -5011,7 +5069,7 @@ msgstr "Bestandskonto für Wareneingang und Inventur"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Install More Packages"
-msgstr ""
+msgstr "Mehr Pakete installieren"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_transfer_account_id
@@ -5089,7 +5147,7 @@ msgstr "Rechnung #"
 #: code:addons/account/models/account_invoice.py:445
 #, python-format
 msgid "Invoice - %s"
-msgstr ""
+msgstr "Rechnung - %s"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_created
@@ -5133,7 +5191,7 @@ msgstr "Die Rechnungsnummer muss je Firma eindeutig sein"
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
 msgid "Invoice Number:"
-msgstr ""
+msgstr "Rechnungsnummer:"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_invoice_id
@@ -5153,7 +5211,7 @@ msgstr "Umsatzsteuer"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_invoice_id
 msgid "Invoice for which this invoice is the credit note"
-msgstr ""
+msgstr "Rechnung, für welche diese Gutschrift ausgestellt wurde"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:761
@@ -5168,12 +5226,16 @@ msgstr ""
 #, python-format
 msgid "Invoice must be in draft or open state in order to be cancelled."
 msgstr ""
+"Die Rechnung muss im Entwurfs- oder offenen Zustand sein, um storniert "
+"werden zu können."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:783
 #, python-format
 msgid "Invoice must be in draft state in order to validate it."
 msgstr ""
+"Die Rechnung muss sich im Entwurfs-Status befinden, um validiert werden zu "
+"können."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:803
@@ -5263,7 +5325,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report,name:account.account_invoices_without_payment
 msgid "Invoices without Payment"
-msgstr ""
+msgstr "Rechnungen ohne Zahlung"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -5275,12 +5337,12 @@ msgstr "Abrechnung"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_is_unaffected_earnings_line
 msgid "Is Unaffected Earnings Line"
-msgstr ""
+msgstr "Ist eine nicht betroffene Ertragsposition"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line_is_rounding_line
 msgid "Is a rounding line in case of cash rounding."
-msgstr ""
+msgstr "Ist eine Rundungsposition bei Bargeld-Rundung."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_is_difference_zero
@@ -5511,6 +5573,8 @@ msgid ""
 "Journal where the opening entry of this company's accounting has been "
 "posted."
 msgstr ""
+"Journal, in dem der Eröffnungseintrag der Buchführung dieses Unternehmens "
+"gepostet wurde."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
@@ -5547,12 +5611,12 @@ msgstr "Begründung"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard
 msgid "Kanban Dashboard"
-msgstr ""
+msgstr "Kanban Übersicht"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard_graph
 msgid "Kanban Dashboard Graph"
-msgstr ""
+msgstr "Kanban grafische Ansicht"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
@@ -5580,6 +5644,8 @@ msgstr "Offen halten"
 msgid ""
 "Keep this field empty to use the default value from the product category."
 msgstr ""
+"Lassen Sie dieses Feld leer, um den Standardwert aus der Produktkategorie zu"
+" verwenden."
 
 #. module: account
 #. openerp-web
@@ -5685,7 +5751,7 @@ msgstr "Letzter Monat"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:119
 #, python-format
 msgid "Last Reconciliation:"
-msgstr ""
+msgstr "Letzter Abgleich:"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_tag_write_uid
@@ -5927,7 +5993,7 @@ msgstr "Rechtsweg"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:29
 #, python-format
 msgid "Load more"
-msgstr ""
+msgstr "Mehr laden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_lock_date
@@ -6020,6 +6086,9 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"Manuell: Lassen Sie sich per Bargeld, Scheck oder über eine andere Methode außerhalb von Odoo bezahlen.\n"
+"Elektronisch: Lassen Sie sich automatisch durch einen Zahlungs-Akquierer bezahlen, indem Sie eine Transaktion auf einer Karte anfordern, die vom Kunden gespeichert wird, wenn dieser online einen Kauf oder ein Abonnement tätigt (Zahlungs-Token).\n"
+"Batch Deposit: Über ein Batch Deposit, das an Ihre Bank gesendet wird, können Sie mehrere Kunden-Schecks auf einmal entgegennehmen. Wenn Sie den Bankauszug auf Odoo kodieren, sollten Sie die Transaktion mit dem Batch Deposit abgleichen. Diese Option aktivieren Sie aus den Einstellungen."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
@@ -6032,6 +6101,12 @@ msgid ""
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
 "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed "
 msgstr ""
+"Manuell: Lassen Sie sich per Bargeld, Scheck oder über eine andere Methode außerhalb von Odoo bezahlen.\n"
+"Elektronisch: Lassen Sie sich automatisch durch einen Zahlungs-Akquierer bezahlen, indem Sie eine Transaktion auf einer Karte anfordern, die vom Kunden gespeichert wird, wenn dieser online einen Kauf oder ein Abonnement tätigt (Zahlungs-Token).\n"
+"Scheck: Zahlen Sie die Rechnung per Scheck und drucken Sie das Ganze in Odoo aus.\n"
+"\n"
+"Batch Deposit: Über ein Batch Deposit, das an Ihre Bank gesendet wird, können Sie mehrere Kunden-Schecks auf einmal entgegennehmen. Wenn Sie den Bankauszug in Odoo kodieren, sollten Sie die Transaktion mit dem Batch Deposit abgleichen. Sie können den Batch Deposit nur aktivieren, wenn das Modul account_batch_deposit installiert ist.\n"
+"SEPA-Überweisung: Sie können die Rechnung über eine SEPA-Überweisungsdatei bezahlen, die Sie an Ihre Bank senden. Sie können die SEPA-Überweisung nur aktivieren, wenn das Modul account_sepa installiert ist"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
@@ -6040,6 +6115,9 @@ msgid ""
 "Check:Pay bill by check and print it from Odoo.\n"
 "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings."
 msgstr ""
+"Manuell: Bezahlen Sie die Rechnung per Bargeld oder über eine andere Methode außerhalb von Odoo.\n"
+"Scheck: Bezahlen Sie die Rechnung per Scheck und drucken Sie das Ganze in Odoo aus.\n"
+"SEPA-Überweisung: Bezahlen Sie die Rechnung über eine SEPA-Überweisungsdatei, die Sie Ihrer Bank übermitteln. Diese Option aktivieren Sie aus den Einstellungen."
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -6049,7 +6127,7 @@ msgstr "März"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Margin Analysis"
-msgstr ""
+msgstr "Spielraum-Analyse"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.setup_bank_journal_form
@@ -6072,12 +6150,12 @@ msgstr "Stammdaten"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_matched_credit_ids
 msgid "Matched Credit"
-msgstr ""
+msgstr "Zugeordneter Kredit"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_matched_debit_ids
 msgid "Matched Debit"
-msgstr ""
+msgstr "Zugeordnete Lastschrift"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile_reconciled_line_ids
@@ -6099,7 +6177,7 @@ msgstr "Anzahl Übereinstimmungen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_max_date
 msgid "Max Date of Matched Lines"
-msgstr ""
+msgstr "Maximaler Termin für zugeordnete Posten"
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -6180,7 +6258,7 @@ msgstr "Buchungsvorlagen ändern"
 #. module: account
 #: selection:account.cash.rounding,strategy:0
 msgid "Modify tax amount"
-msgstr ""
+msgstr "Steuerbetrag bearbeiten"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -6192,7 +6270,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Monitor your product margins from invoices"
-msgstr ""
+msgstr "Überwachen Sie Ihre Produktmargen über Rechnungen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -6216,12 +6294,12 @@ msgstr "Buchungszeile"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_move_line_count
 msgid "Move Line Count"
-msgstr ""
+msgstr "Zählung Bewegung Positionen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment_move_reconciled
 msgid "Move Reconciled"
-msgstr ""
+msgstr "Bewegung ausgeglichen"
 
 #. module: account
 #: code:addons/account/models/account_move.py:1373
@@ -6232,7 +6310,7 @@ msgstr "Buchungs-Bezeichnung (id): %s (%s)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_register_payments_multi
 msgid "Multi"
-msgstr ""
+msgstr "Multi"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -6291,6 +6369,8 @@ msgstr "Interne Notiz"
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Navigate easily through reports and see what is behind the numbers"
 msgstr ""
+"Navigieren Sie ganz einfach durch Berichte und sehen Sie, was sich hinter "
+"den Zahlen verbirgt"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_tax
@@ -6358,12 +6438,14 @@ msgid ""
 "No miscellaneous journal could be found. Please create one before "
 "proceeding."
 msgstr ""
+"Es konnte kein sonstiges Journal gefunden werden. Bitte erstellen Sie eines,"
+" bevor Sie fortfahren."
 
 #. module: account
 #: code:addons/account/models/account.py:116
 #, python-format
 msgid "No opening move defined !"
-msgstr ""
+msgstr "Keine Öffnungs-Bewegung definiert!"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_fiscalyear_lock_date
@@ -6410,7 +6492,7 @@ msgstr "Normaler Text"
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_credit_notes
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_invoices
 msgid "Not Draft"
-msgstr ""
+msgstr "Kein Entwurf"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -6431,6 +6513,8 @@ msgid ""
 "Note that the easiest way to create a credit note is to do it directly form\n"
 "                the customer invoice, to refund it totally or partially."
 msgstr ""
+"Beachten Sie, dass die einfachste Art, eine Gutschrift zu erstellen, darin besteht, sie direkt aus\n"
+" der Kundenrechnung zu erstellen und eine vollständige oder teilweise Rückerstattung zu gewähren."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_note
@@ -6450,7 +6534,7 @@ msgstr "Alle Zahlungen wurden abgeglichen"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:34
 #, python-format
 msgid "Nothing to do!"
-msgstr ""
+msgstr "Sie müssen nichts tun!"
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -6482,7 +6566,7 @@ msgstr "Anzahl der Tage"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "OFX Import"
-msgstr ""
+msgstr "OFX-Import"
 
 #. module: account
 #. openerp-web
@@ -6562,6 +6646,9 @@ msgid ""
 "Once installed, set 'Bank Feeds' to 'File Import' in bank account "
 "settings.This adds a button to import from the Accounting dashboard."
 msgstr ""
+"Sobald dies installiert ist, stellen Sie in den Bankkonto-Einstellungen "
+"„Bank-Feeds“ auf „Dateiimport“ ein. Hierüber fügen Sie eine Schaltfläche "
+"hinzu, über die Sie aus dem Buchhaltungs-Dashboard importieren können."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_payment
@@ -6578,7 +6665,7 @@ msgstr "Nur eine Kontenplanvorlage verfügbar"
 #: code:addons/account/models/account_payment.py:469
 #, python-format
 msgid "Only a draft payment can be posted."
-msgstr ""
+msgstr "Nur ein Zahlungsentwurf kann gepostet werden."
 
 #. module: account
 #: code:addons/account/models/chart_template.py:860
@@ -6623,7 +6710,7 @@ msgstr "Eröffnungsdatum"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_account_opening_journal_id
 msgid "Opening Journal"
-msgstr ""
+msgstr "Journal wird geöffnet"
 
 #. module: account
 #: code:addons/account/models/company.py:271
@@ -6631,17 +6718,17 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_res_company_account_opening_move_id
 #, python-format
 msgid "Opening Journal Entry"
-msgstr ""
+msgstr "Journal-Eintrag wird geöffnet"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_opening_opening_move_line_ids
 msgid "Opening Journal Items"
-msgstr ""
+msgstr "Journal-Positionen werden geöffnet"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op_opening_move_posted
 msgid "Opening Move Posted"
-msgstr ""
+msgstr "Gepostete Bewegung wird geöffnet"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_cashbox_line_number
@@ -6652,27 +6739,27 @@ msgstr "Eröffnungsnummer"
 #: code:addons/account/models/account.py:138
 #, python-format
 msgid "Opening balance"
-msgstr ""
+msgstr "Startsaldo"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_opening_credit
 msgid "Opening credit"
-msgstr ""
+msgstr "Kredit wird geöffnet"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account_opening_credit
 msgid "Opening credit value for this account."
-msgstr ""
+msgstr "Gutschriftswert für dieses Konto wird geöffnet."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_opening_debit
 msgid "Opening debit"
-msgstr ""
+msgstr "Lastschrift wird geöffnet"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account_opening_debit
 msgid "Opening debit value for this account."
-msgstr ""
+msgstr "Abbuchung für dieses Konto wird geöffnet."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -6756,7 +6843,7 @@ msgstr "Bestandskonto für Warenabgänge"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_outstanding_credits_debits_widget
 msgid "Outstanding Credits Debits Widget"
-msgstr ""
+msgstr "Offene Posten Widget"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:135
@@ -6840,7 +6927,7 @@ msgstr "Übergeordneter Bericht"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_parent_state
 msgid "Parent State"
-msgstr ""
+msgstr "Übergeordneter Status"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partial_reconcile
@@ -6896,7 +6983,7 @@ msgstr "Partner Name"
 #: model:ir.model.fields,field_description:account.field_account_payment_partner_type
 #: model:ir.model.fields,field_description:account.field_account_register_payments_partner_type
 msgid "Partner Type"
-msgstr ""
+msgstr "Partnertyp"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_result_selection
@@ -6987,7 +7074,7 @@ msgstr "Zahlungsjournal"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_payment_form
 msgid "Payment Matching"
-msgstr ""
+msgstr "Zahlungsabgleich"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_payment_search
@@ -7022,12 +7109,12 @@ msgstr "Zahlungsbuchungszeilen"
 #. module: account
 #: model:ir.actions.report,name:account.action_report_payment_receipt
 msgid "Payment Receipt"
-msgstr ""
+msgstr "Zahlungseingang"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_payment_receipt
 msgid "Payment Receipt:"
-msgstr ""
+msgstr "Zahlungseingang:"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_reference_type
@@ -7054,7 +7141,7 @@ msgstr "Zahlungsbedingungen"
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Terms Line"
-msgstr ""
+msgstr "Posten Zahlungsbedingungen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_payment_type
@@ -7072,7 +7159,7 @@ msgstr "Beschreibung der Zahlungsbedingungen für den Kunden..."
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "Payment terms: 15 Days"
-msgstr ""
+msgstr "Zahlungsbedingungen: 15 Tage"
 
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_2months
@@ -7082,7 +7169,7 @@ msgstr ""
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "Payment terms: 30 Net Days"
-msgstr ""
+msgstr "Zahlungsbedingungen: 30 Tage netto"
 
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_45days
@@ -7092,7 +7179,7 @@ msgstr ""
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Payment terms: Immediate Payment"
-msgstr ""
+msgstr "Zahlungsbedindungen: Sofortige Zahlung"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_payment_id
@@ -7121,7 +7208,7 @@ msgstr "Abstimmen"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_payments_widget
 msgid "Payments Widget"
-msgstr ""
+msgstr "Zahlungen Widget"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_payments
@@ -7226,7 +7313,7 @@ msgstr "Bitte erstellen Sie Rechnungspositionen."
 #: code:addons/account/models/account_move.py:160
 #, python-format
 msgid "Please define a sequence for the credit notes"
-msgstr ""
+msgstr "Bitte definieren Sie eine Reihenfolge für Gutschriften"
 
 #. module: account
 #: code:addons/account/models/account_move.py:165
@@ -7437,6 +7524,8 @@ msgstr "Gewinn und Verlust"
 msgid ""
 "Programming error: wizard action executed without active_ids in context."
 msgstr ""
+"Programmierfehler: Assistenten-Aktion wurde ohne den Kontext von active_ids "
+"ausgeführt."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_form
@@ -7477,7 +7566,7 @@ msgstr "Vorsteuer (%)"
 #: code:addons/account/models/account_journal_dashboard.py:35
 #, python-format
 msgid "Purchase: Untaxed Total"
-msgstr ""
+msgstr "Kauf: Unversteuerter Gesamtbetrag"
 
 #. module: account
 #: selection:account.tax,type_tax_use:0
@@ -7503,7 +7592,7 @@ msgstr "Python Code"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "QIF Import"
-msgstr ""
+msgstr "QIF-Import"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_quantity
@@ -7659,7 +7748,7 @@ msgstr "Manuell aufzeichnen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Record transactions in foreign currencies"
-msgstr ""
+msgstr "Transaktionen in Fremdwährungen aufzeichnen"
 
 #. module: account
 #. openerp-web
@@ -7719,7 +7808,7 @@ msgstr "Referenz/Beschreibung"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_invoice_ids
 msgid "Refund Invoices"
-msgstr ""
+msgstr "Rechnungen erstatten"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_filter_refund
@@ -7813,7 +7902,7 @@ msgstr "Berichtswesen"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_cash_rounding_rounding
 msgid "Represent the non-zero value smallest coinage (for example, 0.05)."
-msgstr ""
+msgstr "Die kleinste Münze mit einem Nicht-Null-Wert darstellen (z. B. 0,05)."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
@@ -7904,12 +7993,12 @@ msgstr "In Zeile runden"
 #. module: account
 #: model:ir.ui.view,arch_db:account.rounding_form_view
 msgid "Rounding Form"
-msgstr ""
+msgstr "Rundungs-Formular"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line_is_rounding_line
 msgid "Rounding Line"
-msgstr ""
+msgstr "Rundungsposition"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_cash_rounding_rounding_method
@@ -7925,17 +8014,17 @@ msgstr "Rundungsgenauigkeit"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_cash_rounding_strategy
 msgid "Rounding Strategy"
-msgstr ""
+msgstr "Rundungsstrategie"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.rounding_tree_view
 msgid "Rounding Tree"
-msgstr ""
+msgstr "Rundungsbaum"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "SEPA Credit Transfer (SCT)"
-msgstr ""
+msgstr "SEPA-Überweisung (SCT)"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -8016,6 +8105,8 @@ msgstr "Speichern und Neu"
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Save this page and come back here to set up the feature."
 msgstr ""
+"Speichern Sie diese Seite und kommen Sie hierher zurück, um die Funktion zu "
+"konfigurieren."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_journal_search
@@ -8146,6 +8237,7 @@ msgstr "Wähle einen Partner oder Kollegen"
 #: model:ir.model.fields,help:account.field_account_payment_term_line_value
 msgid "Select here the kind of valuation related to this payment terms line."
 msgstr ""
+"Wählen Sie hier die Art der Bewertung dieser Zahlungsbedingungsposition."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -8153,6 +8245,9 @@ msgid ""
 "Select this if the taxes should use cash basis, which will create an entry "
 "for such taxes on a given account during reconciliation."
 msgstr ""
+"Wählen Sie dies, wenn die Steuern auf Bargeldgrundlage berechnet werden "
+"sollen, was zur Folge hat, dass erst bei Zahlungsausgleich eine "
+"Steuerbuchung auf gegebenes Konto vorgenommen wird."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:21
@@ -8160,6 +8255,8 @@ msgstr ""
 msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' state."
 msgstr ""
+"Die gewählte(n) Rechnung(en) kann/können nicht bestätigt werden, da sie sich"
+" nicht im Status „Entwurf“ befinden."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner_invoice_warn
@@ -8191,7 +8288,7 @@ msgstr "Geld schicken"
 #. module: account
 #: model:ir.actions.act_window,name:account.account_send_payment_receipt_by_email_action
 msgid "Send Receipt By Email"
-msgstr ""
+msgstr "Quittung per E-Mail senden"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
@@ -8237,11 +8334,15 @@ msgstr "Setze auf Entwurf"
 #: model:ir.model.fields,help:account.field_account_account_tag_active
 msgid "Set active to false to hide the Account Tag without removing it."
 msgstr ""
+"Deaktivieren Sie die Option, um das Account Tag auszublenden, ohne es zu "
+"entfernen."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_active
 msgid "Set active to false to hide the Journal without removing it."
 msgstr ""
+"Deaktivieren Sie die Option, um das Journal Tag auszublenden, ohne es zu "
+"entfernen."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_active
@@ -8293,7 +8394,7 @@ msgstr "Einrichtung"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company_account_setup_bar_closed
 msgid "Setup Bar Closed"
-msgstr ""
+msgstr "Einrichtungsleiste geschlossen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_code
@@ -8308,7 +8409,7 @@ msgstr "Zeige vollständige Finanzbuchhaltung"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_search
 msgid "Show active taxes"
-msgstr ""
+msgstr "Aktive Steuern anzeigen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -8318,7 +8419,7 @@ msgstr "Alle Datensätze mit vor heute geplanten Aktionen anzeigen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_tax_search
 msgid "Show inactive taxes"
-msgstr ""
+msgstr "Nichtaktive Steuern anzeigen"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard
@@ -8361,6 +8462,8 @@ msgid ""
 "Specify which way will be used to round the invoice amount to the rounding "
 "precision"
 msgstr ""
+"Geben Sie an, welche Art verwendet wird, um den Rechnungsbetrag auf die "
+"Rundungsgenauigkeit abzurunden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_date_from
@@ -8396,7 +8499,7 @@ msgstr "Bundesland"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_parent_state
 msgid "State of the parent account.move"
-msgstr ""
+msgstr "Status von parent account.move"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_statement_id
@@ -8435,7 +8538,7 @@ msgstr "Bundesländer"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_states_count
 msgid "States Count"
-msgstr ""
+msgstr "Anzahl Stati"
 
 #. module: account
 #: code:addons/account/controllers/portal.py:75
@@ -8482,7 +8585,7 @@ msgstr "Stichwörter"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Tags for Multidimensional Analytics"
-msgstr ""
+msgstr "Tags für Multidimensionale Analytics"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_cash_box_out
@@ -8538,7 +8641,7 @@ msgstr "Steuerkonto"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_refund_account_id
 msgid "Tax Account on Credit Notes"
-msgstr ""
+msgstr "Steuerkonto auf Gutschriften"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_template_refund_account_id
@@ -8549,13 +8652,13 @@ msgstr "Steuerkonto für Erstattungen / Gutschriften"
 #: model:ir.model.fields,field_description:account.field_account_tax_tax_adjustment
 #: model:ir.model.fields,field_description:account.field_account_tax_template_tax_adjustment
 msgid "Tax Adjustment"
-msgstr ""
+msgstr "Steueranpassung"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.tax_adjustments_form
 #: model:ir.ui.menu,name:account.menu_action_tax_adjustment
 msgid "Tax Adjustments"
-msgstr ""
+msgstr "Steueranpassungen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_journal
@@ -8602,7 +8705,7 @@ msgstr "Steuerbezeichnung"
 #: model:ir.model.fields,field_description:account.field_account_tax_tax_exigibility
 #: model:ir.model.fields,field_description:account.field_account_tax_template_tax_exigibility
 msgid "Tax Due"
-msgstr ""
+msgstr "Fällige Steuer"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_tax_group_id
@@ -8645,7 +8748,7 @@ msgstr "Umsatzsteuerbericht"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_report
 msgid "Tax Reports"
-msgstr ""
+msgstr "Steuerberichte"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax_template_type_tax_use
@@ -8696,7 +8799,7 @@ msgstr "Verfügbare Steuer"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "TaxCloud"
-msgstr ""
+msgstr "TaxCloud"
 
 #. module: account
 #: selection:account.account.tag,applicability:0
@@ -8739,7 +8842,7 @@ msgstr "Steuern für Verkäufe"
 msgid ""
 "Taxes, fiscal positions, chart of accounts &amp; legal statements for your "
 "country"
-msgstr ""
+msgstr "Steuern, Steuerpositionen, Kontenpläne und Rechtsauszüge für Ihr Land"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_balance
@@ -8786,21 +8889,29 @@ msgstr ""
 #: model:ir.model.fields,help:account.field_res_company_account_setup_bank_data_done
 msgid "Technical field holding the status of the bank setup step."
 msgstr ""
+"Technisches Feld, in dem der Status des Banken-Konfigurations-Schrittes "
+"festgehalten wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_account_setup_coa_done
 msgid "Technical field holding the status of the chart of account setup step."
 msgstr ""
+"Technisches Feld, in dem der Status des Kontenplan-Konfigurations-Schrittes "
+"festgehalten wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_account_setup_company_data_done
 msgid "Technical field holding the status of the company setup step."
 msgstr ""
+"Technisches Feld, in dem der Status des Unternehmens-Konfigurations-"
+"Schrittes festgehalten wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_account_setup_fy_data_done
 msgid "Technical field holding the status of the financial year setup step."
 msgstr ""
+"Technisches Feld, in dem der Status des Geschäftsjahr-Konfigurations-"
+"Schrittes festgehalten wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_register_payments_multi
@@ -8808,12 +8919,16 @@ msgid ""
 "Technical field indicating if the user selected invoices from multiple "
 "partners or from different types."
 msgstr ""
+"Technisches Feld, aus dem hervorgeht, ob der Benutzer Rechnungen von "
+"mehreren Partnern oder von verschiedenen Typen ausgewählt hat."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_account_setup_bar_closed
 msgid ""
 "Technical field set to True when setup bar has been closed by the user."
 msgstr ""
+"Technisches Feld, das auf „wahr“ eingestellt wird, wenn die "
+"Einrichtungsleiste vom Benutzer geschlossen wurde."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund_refund_only
@@ -8838,6 +8953,8 @@ msgstr "Hilfs-Feld zur Verwendung bei Einnahmenüberschussrechnung"
 #: model:ir.model.fields,help:account.field_account_journal_account_setup_bank_data_done
 msgid "Technical field used in the special view for the setup bar step."
 msgstr ""
+"Technisches Feld, das für die spezielle Ansicht des Einrichtungsleisten-"
+"Schrittes verwendet wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_code
@@ -8855,6 +8972,8 @@ msgid ""
 "Technical field used to determine at which date this reconciliation needs to"
 " be shown on the aged receivable/payable reports."
 msgstr ""
+"Technisches Feld, in dem festgelegt wird, zu welchem Datum der Ausgleich im "
+"Fälligkeits-Debitoren-/Kreditorenbericht angezeigt werden muss."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_hide_payment_method
@@ -8887,12 +9006,19 @@ msgid ""
 "items are directly exigible, but with the feature cash_basis on taxes, some "
 "will become exigible only when the payment is recorded."
 msgstr ""
+"Technisches Feld, das verwendet wird, um einen Steuerposten im "
+"Mehrwertsteuer-Bericht als fällig oder nicht fällig zu markieren (nur "
+"fällige Journal-Positionen werden angezeigt). Standardmäßig sind alle neuen "
+"Journalpositionen direkt fällig, aber mit der Funktion cash_basis auf "
+"Steuern werden einige erst fällig, wenn die Zahlung verbucht wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line_is_unaffected_earnings_line
 msgid ""
 "Tells whether or not this line belongs to an unaffected earnings account"
 msgstr ""
+"Gibt an, ob dieser Posten einem nicht betroffenen Gewinnkonto angehört oder "
+"nicht"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_chart_template_id
@@ -8968,7 +9094,7 @@ msgstr ""
 #: code:addons/account/models/account_move.py:1220
 #, python-format
 msgid "The account %s (%s) is deprecated !"
-msgstr ""
+msgstr "Das Konto %s (%s) ist veraltet!"
 
 #. module: account
 #: code:addons/account/models/account_move.py:1039
@@ -8987,6 +9113,8 @@ msgid ""
 "The accounting journal where automatic exchange differences will be "
 "registered"
 msgstr ""
+"Das Buchungsjournal, in dem automatische Wechselkursdifferenzen registriert "
+"werden"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line_amount_currency
@@ -9039,6 +9167,8 @@ msgid ""
 "The cash rounding cannot be computed because the difference must be added on the biggest tax found and no tax are specified.\n"
 "Please set up a tax or change the cash rounding method."
 msgstr ""
+"Die Bargeld-Rundung kann nicht berechnet werden, da der Unterschied zur größten gefundenen Steuer hinzugefügt werden muss und keine Steuer angegeben ist.\n"
+"Bitte legen Sie eine Steuer fest oder ändern Sie die Bargeld-Rundungsmethode."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company_chart_template_id
@@ -9110,6 +9240,10 @@ msgid ""
 "expense (Cost of Goods Sold account) is recognized at the customer invoice "
 "validation."
 msgstr ""
+"Die Kosten werden berechnet, wenn eine Lieferantenrechnung validiert wird, "
+"außer im angelsächsischen Rechnungswesen mit kontinuierlicher "
+"Bestandsführung, bei der die Kosten (Umsatzkosten-Konto) bei der Validierung"
+" der Kundenrechnung erkannt werden."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_product_product_property_account_expense_id
@@ -9121,6 +9255,11 @@ msgid ""
 "validation. If the field is empty, it uses the one defined in the product "
 "category."
 msgstr ""
+"Die Kosten werden berechnet, wenn eine Lieferantenrechnung validiert wird, "
+"außer im angelsächsischen Rechnungswesen mit kontinuierlicher "
+"Bestandsführung, bei der die Kosten (Umsatzkosten-Konto) bei der Validierung"
+" der Kundenrechnung erkannt werden. Ist das Feld leer, wird der in der "
+"Produktkategorie definierte Eintrag verwendet."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner_property_account_position_id
@@ -9164,6 +9303,8 @@ msgid ""
 "The journal entry containing the initial balance of all this company's "
 "accounts."
 msgstr ""
+"Der Journaleintrag, der die ursprüngliche Bilanz aller Konten des "
+"Unternehmens enthält."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_financial_year_op_fiscalyear_last_day
@@ -9196,12 +9337,12 @@ msgstr "Der Name, der in Buchungspositionen verwendet wird"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
 msgid "The next sequence number will be used for the next credit note."
-msgstr ""
+msgstr "Die nächste Sequenznummer wird für die nächste Gutschrift verwendet."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_sequence_number_next
 msgid "The next sequence number will be used for the next invoice."
-msgstr ""
+msgstr "Die nächste Sequenznummer wird für die nächste Rechnung verwendet."
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1821
@@ -9259,7 +9400,7 @@ msgstr "Referenz des Partners für diese Rechnung."
 #: code:addons/account/models/account_payment.py:60
 #, python-format
 msgid "The payment amount cannot be negative."
-msgstr ""
+msgstr "Der Zahlungsbetrag darf nicht negativ sein."
 
 #. module: account
 #: code:addons/account/models/account_payment.py:472
@@ -9322,12 +9463,12 @@ msgstr "Die Nummernfolge im Journal %s ist deaktiviert."
 #. module: account
 #: model:ir.model.fields,help:account.field_account_cash_rounding_rounding_method
 msgid "The tie-breaking rule used for float rounding operations"
-msgstr ""
+msgstr "Die anwendbare Regel für Rundungen mit Gleitkommazahlen."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.portal_my_invoices
 msgid "There are currently no invoices and payments for your account."
-msgstr ""
+msgstr "Derzeit sind keine Rechnungen und Zahlungen für Ihr Konto vorhanden."
 
 #. module: account
 #: code:addons/account/models/company.py:118
@@ -9379,7 +9520,7 @@ msgstr "Es gab einen Fehler bei der Bearbeitung der Seite."
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "These taxes are set in any new product created."
-msgstr ""
+msgstr "Diese Steuern werden bei jedem neu erstellten Produkt festgelegt."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account_template_user_type_id
@@ -9439,7 +9580,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,help:account.field_product_category_property_account_income_categ_id
 msgid "This account will be used when validating a customer invoice."
-msgstr ""
+msgstr "Dieses Konto wird für die Validierung einer Kundenrechnung verwendet."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -9448,6 +9589,10 @@ msgid ""
 " master budgets and the budgets are defined, the project managers can set "
 "the planned amount on each analytic account."
 msgstr ""
+"Hierüber können Buchhalter analytische und übergeordnete Haushalte "
+"verwalten. Sobald die Master- und allgemeinen Haushaltspläne festgelegt "
+"sind, können die Projektmanager den geplanten Betrag auf jedem analytischen "
+"Konto einstellen."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_config_settings_module_account_batch_deposit
@@ -9465,6 +9610,10 @@ msgid ""
 "keeps track of the depreciation occurred on those assets, and creates "
 "account move for those depreciation lines."
 msgstr ""
+"Hierüber können Sie die Vermögenswerte verwalten, die im Besitz eines "
+"Unternehmens oder einer Person sind. Die Abschreibung auf diese "
+"Vermögenswerte wird verfolgt und Kontobewegungen für diese "
+"Abschreibungspositionen generiert."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -9473,6 +9622,9 @@ msgid ""
 "keeps track of the installments occurred on those revenue recognitions, and "
 "creates account moves for those installment lines."
 msgstr ""
+"Dies ermöglicht Ihnen die Verwaltung der Umsatzrealisierung für verkaufte "
+"Produkte. Verfolgt werden die Raten auf die Umsatzrealisierungen und "
+"Kontobewegungen werden für diese Ratenpositionen generiert."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_chart_template_complete_tax_set
@@ -9502,6 +9654,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "This feature is useful if you issue a high amounts of invoices."
 msgstr ""
+"Diese Funktion ist nützlich, wenn Sie eine hohe Anzahl an Rechnungen "
+"ausgeben."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id
@@ -9509,6 +9663,8 @@ msgid ""
 "This field contains the information related to the numbering of the credit "
 "note entries of this journal."
 msgstr ""
+"In diesem Feld finden Sie Angaben zum Nummernkreis, der für die Nummerierung"
+" der Posten in dieser Gutschrift verwendet wird."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_sequence_id
@@ -9591,6 +9747,8 @@ msgstr ""
 msgid ""
 "This method should only be called to process a single invoice's payment."
 msgstr ""
+"Diese Methode sollte nur aufgerufen werden, um die Zahlung einer einzigen "
+"Rechnung zu verarbeiten."
 
 #. module: account
 #. openerp-web
@@ -9664,6 +9822,8 @@ msgid ""
 "This payment term will be used instead of the default one for sales orders "
 "and customer invoices"
 msgstr ""
+"Diese Zahlungsbedinung wird anstelle der Standardzahlungsbedingung für "
+"Verkaufsaufträge und Kundenrechnungen verwendet"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement_line_account_id
@@ -9808,6 +9968,7 @@ msgstr "Nettobetrag"
 #: model:ir.model.fields,help:account.field_account_invoice_line_price_subtotal_signed
 msgid "Total amount in the currency of the company, negative for credit note."
 msgstr ""
+"Gesamtbetrag in der Unternehmenswährung, negativ bei einer Gutschrift."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed
@@ -9831,12 +9992,12 @@ msgstr "Gesamtschulden dieses Kunden"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line_price_total
 msgid "Total amount with taxes"
-msgstr ""
+msgstr "Gesamtbetrag mit Steuern"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line_price_subtotal
 msgid "Total amount without taxes"
-msgstr ""
+msgstr "Gesamtbetrag ohne Steuern"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner_debit
@@ -9862,7 +10023,7 @@ msgstr "Summe der Transaktionspositionen."
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Track costs &amp; revenues by project, department, etc."
-msgstr ""
+msgstr "Kosten und Einnahmen nach Projekt, Abteilung usw. verfolgen"
 
 #. module: account
 #. openerp-web
@@ -9946,7 +10107,7 @@ msgstr "Typ"
 #. module: account
 #: selection:account.cash.rounding,rounding_method:0
 msgid "UP"
-msgstr ""
+msgstr "HOCH"
 
 #. module: account
 #: selection:account.journal,bank_statements_source:0
@@ -9991,7 +10152,7 @@ msgstr "Unbekannter Partner"
 #: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
 #: model:ir.ui.view,arch_db:account.setup_view_company_form
 msgid "Unmark as done"
-msgstr ""
+msgstr "Markierung „erledigt“ aufheben"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -10056,7 +10217,7 @@ msgstr "Nettobetrag in Unternehmenswährung"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Update exchange rates automatically"
-msgstr ""
+msgstr "Wechselkurse automatisch aktualisieren"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_use_anglo_saxon
@@ -10076,7 +10237,7 @@ msgstr "Berechnung der Steuer nach vereinnahmten Entgelten"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa_direct_debit
 msgid "Use SEPA Direct Debit"
-msgstr ""
+msgstr "SEPA-Lastschrift verwenden"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
@@ -10101,12 +10262,12 @@ msgstr "Nutze Stapelbuchungen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Use depreciation boards, automate amortization entries"
-msgstr ""
+msgstr "Abschreibungs-Boards verwenden, Abschreibungsposten automatisieren"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Use follow-up levels and schedule actions"
-msgstr ""
+msgstr "Folgemaßnahmen verwenden und Aktionen planen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_refund
@@ -10271,25 +10432,25 @@ msgstr "Eingangsrechnungen"
 #: model:ir.ui.view,arch_db:account.report_invoice_document
 #, python-format
 msgid "Vendor Credit Note"
-msgstr ""
+msgstr "Lieferanten-Gutschrift"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:451
 #, python-format
 msgid "Vendor Credit Note - %s"
-msgstr ""
+msgstr "Lieferanten-Gutschrift - %s"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_in_refund
 #: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
 msgid "Vendor Credit Notes"
-msgstr ""
+msgstr "Lieferanten-Gutschriften"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1243
 #, python-format
 msgid "Vendor Credit note"
-msgstr ""
+msgstr "Lieferanten-Gutschrift"
 
 #. module: account
 #: code:addons/account/models/account_payment.py:666
@@ -10456,7 +10617,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.setup_bank_journal_form
 msgid "You can define additional accounts here"
-msgstr ""
+msgstr "Hier können Sie zusätzliche Konten definieren"
 
 #. module: account
 #: code:addons/account/models/product.py:51
@@ -10566,6 +10727,8 @@ msgid ""
 "You cannot delete an invoice which is not draft or cancelled. You should "
 "create a credit note instead."
 msgstr ""
+"Eine Rechnung kann nicht gelöscht werden, die weder ein Entwurf noch "
+"storniert ist. Stattdessen sollten Sie eine Gutschrift erstellen."
 
 #. module: account
 #: code:addons/account/models/res_config_settings.py:112
@@ -10574,6 +10737,9 @@ msgid ""
 "You cannot disable this setting because some of your taxes are cash basis. "
 "Modify your taxes first before disabling this setting."
 msgstr ""
+"Diese Einstellung können Sie nicht deaktivieren, weil für einige Ihrer "
+"Steuern eine Bargeldgrundlage gilt. Ändern Sie Ihre Steuern zuerst, bevor "
+"Sie diese Einstellung deaktivieren."
 
 #. module: account
 #: code:addons/account/models/account.py:282
@@ -10608,6 +10774,7 @@ msgstr ""
 #, python-format
 msgid "You cannot empty the bank account once set."
 msgstr ""
+"Sie können das Bankkonto nicht austragen, wenn es einmal eingerichtet ist."
 
 #. module: account
 #: code:addons/account/models/account.py:55
@@ -10616,6 +10783,8 @@ msgid ""
 "You cannot have a receivable/payable account that is not reconcilable. "
 "(account code: %s)"
 msgstr ""
+"Sie können kein Debitoren- oder Kreditorenkonto anlegen, welches keinen "
+"Ausgleich erlaubt. (Konto-Code: %s)"
 
 #. module: account
 #. openerp-web
@@ -10694,6 +10863,8 @@ msgid ""
 "You cannot validate an invoice with a negative total amount. You should "
 "create a credit note instead."
 msgstr ""
+"Sie können keine Rechnung mit einem negativen Gesamtbetrag validieren. "
+"Stattdessen sollten Sie eine Gutschrift erstellen."
 
 #. module: account
 #. openerp-web
@@ -10701,6 +10872,7 @@ msgstr ""
 #, python-format
 msgid "You did not configure any reconcile model yet, you can do it"
 msgstr ""
+"Sie haben noch kein Ausgleichsmodell konfiguriert, können es aber jetzt tun"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_form
@@ -10743,7 +10915,7 @@ msgstr "Definieren Sie ein Startdatum"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:53
 #, python-format
 msgid "You reconciled"
-msgstr ""
+msgstr "Sie haben ausgeglichen"
 
 #. module: account
 #: code:addons/account/models/account_move.py:1897
@@ -10825,17 +10997,17 @@ msgstr "account.bank.accounts.wizard"
 #. module: account
 #: model:ir.model,name:account.model_account_financial_year_op
 msgid "account.financial.year.op"
-msgstr ""
+msgstr "account.financial.year.op"
 
 #. module: account
 #: model:ir.model,name:account.model_account_group
 msgid "account.group"
-msgstr ""
+msgstr "account.group"
 
 #. module: account
 #: model:ir.model,name:account.model_account_opening
 msgid "account.opening"
-msgstr ""
+msgstr "account.opening"
 
 #. module: account
 #: model:ir.model,name:account.model_account_reconcile_model_template
@@ -10909,7 +11081,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_reconciliation.xml:41
 #, python-format
 msgid "o_manual_statement"
-msgstr ""
+msgstr "o_manual_statement"
 
 #. module: account
 #: selection:account.payment.term.line,option:0
@@ -10969,7 +11141,7 @@ msgstr "report.account.report_partnerledger"
 #. module: account
 #: model:ir.model,name:account.model_report_account_report_tax
 msgid "report.account.report_tax"
-msgstr ""
+msgstr "report.account.report_tax"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_report_trialbalance
@@ -10998,14 +11170,14 @@ msgstr "der Mutterkonzern"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:158
 #, python-format
 msgid "there"
-msgstr ""
+msgstr "dort"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_reconciliation.xml:53
 #, python-format
 msgid "transactions in"
-msgstr ""
+msgstr "Transaktionen in"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 810d467a0ee..e7ba18a434a 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -1236,6 +1236,8 @@ msgid ""
 "Account used as counterpart for the journal entry, for taxes eligible based "
 "on payments."
 msgstr ""
+"Compte utilisé comme contrepartie pour la pièce comptable, pour les taxes "
+"exigibles en fonction des paiements."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_cron_reverse_entry_ir_actions_server
@@ -1253,7 +1255,7 @@ msgstr "Comptabilité"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Accounting App Options"
-msgstr ""
+msgstr "Options d'application Comptabilité"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
@@ -1580,7 +1582,7 @@ msgstr "Activer l'impression et le dépôt de chèques "
 #. module: account
 #: model:res.groups,name:account.group_cash_rounding
 msgid "Allow the cash rounding management"
-msgstr ""
+msgstr "Autoriser la gestion d'arrondi d'espèces"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1830,6 +1832,8 @@ msgstr "Appliquer automatiquement cette position fiscale"
 #: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
 msgid "Apply only if delivery or invoicing country match the group."
 msgstr ""
+"Appliquer seulement si le pays de livraison ou de facturation correspond au "
+"groupe."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
@@ -6164,6 +6168,9 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
+"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
+"Dépôt groupé : encaissez plusieurs chèques clients à la fois en générant un dépôt groupé à envoyer à votre banque. Lors de l'encodage du relevé bancaire dans Odoo, vous pouvez rapprocher la transaction et le dépôt groupé. Activez cette option dans les paramètres."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
@@ -6176,6 +6183,11 @@ msgid ""
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
 "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed "
 msgstr ""
+"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
+"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
+"Chèque : payez par chèque en l'imprimant depuis Odoo.\n"
+"Dépôt groupé : encaissez plusieurs chèques clients à la fois en générant un dépôt groupé à envoyer à votre banque. Lors de l'encodage du relevé bancaire dans Odoo, vous pouvez rapprocher la transaction et le dépôt groupé. Pour activer le dépôt groupé, vous devez installer le module account_batch_deposit (compte-dépôt-groupé).\n"
+"Virement SEPA : payez en envoyant un fichier de virement SEPA à votre banque. Pour activer les virements SEPA, vous devez installer le module account_sepa (compte-sepa)"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
@@ -6507,6 +6519,8 @@ msgid ""
 "No miscellaneous journal could be found. Please create one before "
 "proceeding."
 msgstr ""
+"Aucun journal des opérations diverses n'a été trouvé. Veuillez en créer un "
+"avant de continuer."
 
 #. module: account
 #: code:addons/account/models/account.py:116
@@ -7592,6 +7606,8 @@ msgstr "Compte de résultat"
 msgid ""
 "Programming error: wizard action executed without active_ids in context."
 msgstr ""
+"Erreur de programmation : action de l'assistant exécutée sans active_ids "
+"dans le contexte."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_chart_template_form
@@ -8866,7 +8882,7 @@ msgstr "Taxe à appliquer"
 #. module: account
 #: model:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "TaxCloud"
-msgstr ""
+msgstr "TaxCloud"
 
 #. module: account
 #: selection:account.account.tag,applicability:0
@@ -9526,6 +9542,8 @@ msgstr "La séquence du journal %s est désactivée."
 #: model:ir.model.fields,help:account.field_account_cash_rounding_rounding_method
 msgid "The tie-breaking rule used for float rounding operations"
 msgstr ""
+"Règle utilisée en cas d'égalité pour les opérations d'arrondi de nombre "
+"décimal"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.portal_my_invoices
@@ -10339,6 +10357,10 @@ msgid ""
 "                                with the current invoice. A new draft invoice will be created\n"
 "                                so that you can edit it."
 msgstr ""
+"Utilisez cette option si vous voulez annuler une facture et en créer une\n"
+" nouvelle. La note de crédit sera créée, validée et rapprochée\n"
+" avec la facture actuelle. Une nouvelle facture brouillon\n"
+" que vous pourrez modifier sera créée."
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_refund
@@ -10837,6 +10859,8 @@ msgid ""
 "You cannot have a receivable/payable account that is not reconcilable. "
 "(account code: %s)"
 msgstr ""
+"Vous ne pouvez pas avoir de compte client/fournisseur qui ne peut pas faire "
+"l'objet d'un rapprochement. (code de compte : %s)"
 
 #. module: account
 #. openerp-web
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index a7ee971b546..4512e841687 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -5890,6 +5890,10 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"手动：通过现金、支票或除 Odoo 以外的其他方法获取报酬。\n"
+" 电子方式：在客户线上购买或订阅时（支付令），在已保存的卡中请求交易，通过付款受让人自动获取报酬。\n"
+" 批量存款：\n"
+" 批量存款：几个客户同时支票付款时，可生成批量存款提交到银行中。当在 Odoo 进行编码银行对账单时，建议您协调批量存款与交易之间的关系。从设置中启用该选项。"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
@@ -9260,7 +9264,7 @@ msgstr "如果有大量的发票，这个功能很有用。"
 msgid ""
 "This field contains the information related to the numbering of the credit "
 "note entries of this journal."
-msgstr ""
+msgstr "该字段包含此日记账中与信用清单目录数量相关的信息。"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal_sequence_id
diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index 05141e2e857..a5fb776f6f7 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -539,7 +539,7 @@ class AccountJournal(models.Model):
                 if not 'default_credit_account_id' in vals and self.default_credit_account_id:
                     self.default_credit_account_id.currency_id = vals['currency_id']
             if 'bank_account_id' in vals and not vals.get('bank_account_id'):
-                raise UserError(_('You cannot empty the bank account once set.'))
+                raise UserError(_('You cannot remove the bank account from the journal once set.'))
         result = super(AccountJournal, self).write(vals)
 
         # Create the bank_account_id if necessary
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index 479fd18ff2d..192e0d2ea4a 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -510,6 +510,7 @@ class account_payment(models.Model):
                 (transfer_credit_aml + transfer_debit_aml).reconcile()
 
             rec.write({'state': 'posted', 'move_name': move.name})
+        return True
 
     @api.multi
     def action_draft(self):
@@ -524,7 +525,7 @@ class account_payment(models.Model):
         if any(len(record.invoice_ids) != 1 for record in self):
             # For multiple invoices, there is account.register.payments wizard
             raise UserError(_("This method should only be called to process a single invoice's payment."))
-        self.post();
+        return self.post()
 
     def _create_payment_entry(self, amount):
         """ Create a journal entry corresponding to a payment, if the payment references invoice(s) they are reconciled.
diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index fe682c77807..93f17153fa8 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -768,7 +768,7 @@ class WizardMultiChartsAccounts(models.TransientModel):
             if company_id:
                 company = self.env['res.company'].browse(company_id)
                 currency_id = company.on_change_country(company.country_id.id)['value']['currency_id']
-                res.update({'currency_id': currency_id.id})
+                res.update({'currency_id': currency_id})
 
         chart_templates = account_chart_template.search([('visible', '=', True)])
         if chart_templates:
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index d840872f840..189304b6747 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -638,7 +638,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
     /**
      * @private
      */
-    _onFilterChange: function () {
+    _onFilterChange: function (event) {
         this.trigger_up('change_filter', {'data': _.str.strip($(event.target).val())});
     },
     /**
diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml
index c0f30184b7a..1969432eb77 100644
--- a/addons/account/static/src/xml/account_reconciliation.xml
+++ b/addons/account/static/src/xml/account_reconciliation.xml
@@ -155,7 +155,7 @@
             <t t-foreach="state.reconcileModels" t-as="reconcileModel">
                 <button class="btn btn-primary" t-att-data-reconcile-model-id="reconcileModel.id"><t t-esc="reconcileModel.name"/></button>
             </t>
-            <p t-if="!state.reconcileModels.length" style="color: #bbb;">You did not configure any reconcile model yet, you can do it <a style="cursor: pointer;" class="reconcile_model_create">there</a>.</p>
+            <p t-if="!state.reconcileModels.length" style="color: #bbb;">You did not configure any reconcile model yet, you can do it <a style="cursor: pointer;" class="reconcile_model_create">here</a>.</p>
         </div>
         <div class="dropdown pull-right">
             <a data-toggle="dropdown" href="#"><span class="fa fa-cog"/></a>
diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
index 1146ec50fe1..5331fb09c0f 100644
--- a/addons/account/static/tests/reconciliation_tests.js
+++ b/addons/account/static/tests/reconciliation_tests.js
@@ -511,6 +511,7 @@ odoo.define('account.reconciliation_tests', function (require) {
 
 var ReconciliationClientAction = require('account.ReconciliationClientAction');
 var demoData = require('account.reconciliation_tests.data');
+
 var testUtils = require('web.test_utils');
 
 QUnit.module('account', {
@@ -738,7 +739,7 @@ QUnit.module('account', {
         // We also create a line which is the open balance.
         testUtils.intercept(clientAction, 'call_service', function (event) {
             assert.deepEqual(event.data.args[1].args,
-                [[5],[{partner_id: 8, 
+                [[5],[{partner_id: 8,
                                     counterpart_aml_dicts: [{
                                         counterpart_aml_id: 109,
                                         credit: 650,
@@ -746,7 +747,7 @@ QUnit.module('account', {
                                         name: 'INV/2017/0002',
                                         analytic_tag_ids: [[6, null, []]]
                                     }],
-                                    payment_aml_ids: [], 
+                                    payment_aml_ids: [],
                                     new_aml_dicts: [{
                                         account_id: 287,
                                         credit: 525,
@@ -892,7 +893,7 @@ QUnit.module('account', {
         var widget = clientAction.widgets[0];
         assert.strictEqual(widget.$('.o_input_dropdown input').val(), "Agrolait", "the partner many2one should display agrolait");
         assert.strictEqual(widget.$('.match table tr').length, 2, "agrolait should have 2 propositions for reconciliation");
-        
+
         // Adding the two propositions
         // This is in order to try that after changing partner the propositions are emptied
         widget.$('.match .cell_account_code:first').trigger('click');
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index f85eaf1c4b7..41f052a9fad 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -97,7 +97,7 @@ msgstr "Erstellt am"
 #. module: account_analytic_default
 #: model:ir.ui.view,arch_db:account_analytic_default.res_config_settings_view_form
 msgid "Default Analytic Values"
-msgstr ""
+msgstr "Standard-Analysewerte"
 
 #. module: account_analytic_default
 #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_date_stop
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 50c60303127..89a6af74829 100644
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -4,30 +4,31 @@
 # 
 # Translators:
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: Bülent Tiknas <btiknas@googlemail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +68,7 @@ msgstr "# der Teilzahlungsraten"
 #: model:ir.cron,cron_name:account_asset.account_asset_cron
 #: model:ir.cron,name:account_asset.account_asset_cron
 msgid "Account Asset: Generate asset entries"
-msgstr ""
+msgstr "Konto-Vermögenswert: Generieren Sie Vermögenswert-Einträge"
 
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_date
@@ -105,7 +106,7 @@ msgstr "Anlagenkonto, zum Buchen der Anlage zu ihren Anschaffungskosten."
 #: code:addons/account_asset/static/src/js/account_asset.js:52
 #, python-format
 msgid "Accounting entries waiting for manual verification"
-msgstr ""
+msgstr "Buchhaltungseinträge, die auf eine manuelle Überprüfung warten"
 
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_active
@@ -338,6 +339,9 @@ msgid ""
 "  * Number of Entries: Fix the number of entries and the time between 2 depreciations.\n"
 "  * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
 msgstr ""
+"Wählen Sie die Methode, die zur Berechnung der Daten und der Anzahl der Einträge verwendet werden soll.\n"
+" * Anzahl an Einträgen: Legen Sie die Anzahl an Einträgen und die Zeit zwischen 2 Abschreibungen fest\n"
+" * Enddatum: Wählen Sie die Zeit zwischen 2 Abschreibungen und das Datum, über das Abschreibungen nicht hinausgehen."
 
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_asset_depreciation_confirmation_wizard_date
@@ -1013,6 +1017,8 @@ msgid ""
 "The number of depreciations or the period length of your asset category "
 "cannot be null."
 msgstr ""
+"Die Anzahl der Abschreibungen oder die Dauer Ihrer Vermögenswertkategorie "
+"darf nicht null sein."
 
 #. module: account_asset
 #: code:addons/account_asset/models/account_asset.py:482
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 9d2582184a5..a60f5ea5408 100644
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
 # Not Telling <levequevincel2@gmail.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Clo <clo@odoo.com>, 2016
 # Sébastien LANGE (SYLEAM) <sebastien.lange@syleam.fr>, 2016
 # lap.odoo <lap@odoo.com>, 2016
@@ -29,13 +29,14 @@
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Micky Jault <micky037@hotmail.fr>, 2017
 # Florent de Labarre <florent@iguanayachts.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: Florent de Labarre <florent@iguanayachts.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -1033,6 +1034,8 @@ msgid ""
 "This depreciation is already linked to a journal entry! Please post or "
 "delete it."
 msgstr ""
+"Cet amortissement est déjà associé à une écriture ! Veuillez le publier ou "
+"le supprimer."
 
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_asset_depreciation_confirmation_wizard
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index 73b6dbe44d8..856e2915657 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -9,13 +9,14 @@
 # Ted Wang <feiyuwang2012@gmail.com>, 2016
 # Rangy Chen <rangychen@163.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -319,6 +320,9 @@ msgid ""
 "  * Number of Entries: Fix the number of entries and the time between 2 depreciations.\n"
 "  * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
 msgstr ""
+"选择使用方法计算日期和注册数量。\n"
+" * 注册数量：确定 2 个折旧期间的注册数量和时间 \n"
+" * 终止日期：在 2 个折旧期间选择时间并且不能超过折旧的折旧日期。"
 
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_asset_depreciation_confirmation_wizard_date
@@ -978,7 +982,7 @@ msgstr "被折旧资产的折旧数量"
 msgid ""
 "The number of depreciations or the period length of your asset category "
 "cannot be null."
-msgstr ""
+msgstr "折旧的数量或财产类别的期间长度不能是无效的。"
 
 #. module: account_asset
 #: code:addons/account_asset/models/account_asset.py:482
diff --git a/addons/account_bank_statement_import/i18n/de.po b/addons/account_bank_statement_import/i18n/de.po
index 5dc89f46b93..e7e9a1b9339 100644
--- a/addons/account_bank_statement_import/i18n/de.po
+++ b/addons/account_bank_statement_import/i18n/de.po
@@ -4,28 +4,29 @@
 # 
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Pascal Künzli <p.kuenzli@pk-its.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Pascal Künzli <p.kuenzli@pk-its.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +97,7 @@ msgstr "Mindestens ein Eingang"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_at_least_one_outbound
 msgid "At Least One Outbound"
-msgstr ""
+msgstr "Mindestens ein Ausgang"
 
 #. module: account_bank_statement_import
 #: code:addons/account_bank_statement_import/account_bank_statement_import.py:78
@@ -162,6 +163,8 @@ msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
 " credit notes made from this journal"
 msgstr ""
+"Wählen Sie diese Option, wenn Sie für Rechnungen und Gutschriften aus diesem"
+" Journal nicht den gleichen Nummernkreis verwenden wollen"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_update_posted
@@ -217,12 +220,12 @@ msgstr "Erstellt am"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
 msgid "Credit Note Entry Sequence"
-msgstr ""
+msgstr "Eingabesequenz Gutschrift"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_number_next
 msgid "Credit Notes: Next Number"
-msgstr ""
+msgstr "Gutschriften: Nächste Zahl"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id
@@ -237,7 +240,7 @@ msgstr "Abbuchungsmethoden"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence
 msgid "Dedicated Credit Note Sequence"
-msgstr ""
+msgstr "Fest zugeordnete Gutschrift-Sequenz"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_default_credit_account_id
@@ -374,12 +377,12 @@ msgstr ""
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_kanban_dashboard
 msgid "Kanban Dashboard"
-msgstr ""
+msgstr "Kanban Übersicht"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_kanban_dashboard_graph
 msgid "Kanban Dashboard Graph"
-msgstr ""
+msgstr "Kanban grafische Ansicht"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import___last_update
@@ -411,6 +414,9 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"Manuell: Lassen Sie sich per Bargeld, Scheck oder über eine andere Methode außerhalb von Odoo bezahlen.\n"
+"Elektronisch: Lassen Sie sich automatisch durch einen Zahlungs-Akquierer bezahlen, indem Sie eine Transaktion auf einer Karte anfordern, die vom Kunden gespeichert wird, wenn dieser online einen Kauf oder ein Abonnement tätigt (Zahlungs-Token).\n"
+"Batch Deposit: Über ein Batch Deposit, das an Ihre Bank gesendet wird, können Sie mehrere Kunden-Schecks auf einmal entgegennehmen. Wenn Sie den Bankauszug auf Odoo kodieren, sollten Sie die Transaktion mit dem Batch Deposit abgleichen. Diese Option aktivieren Sie aus den Einstellungen."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_outbound_payment_method_ids
@@ -419,6 +425,9 @@ msgid ""
 "Check:Pay bill by check and print it from Odoo.\n"
 "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings."
 msgstr ""
+"Manuell: Bezahlen Sie die Rechnung per Bargeld oder über eine andere Methode außerhalb von Odoo.\n"
+"Scheck: Bezahlen Sie die Rechnung per Scheck und drucken Sie das Ganze in Odoo aus.\n"
+"SEPA-Überweisung: Bezahlen Sie die Rechnung über eine SEPA-Überweisungsdatei, die Sie Ihrer Bank übermitteln. Diese Option aktivieren Sie aus den Einstellungen."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_number_next
@@ -473,6 +482,8 @@ msgstr "Reihenfolge"
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_active
 msgid "Set active to false to hide the Journal without removing it."
 msgstr ""
+"Deaktivieren Sie die Option, um das Journal Tag auszublenden, ohne es zu "
+"entfernen."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code
@@ -488,6 +499,8 @@ msgstr "Journal im Dashboard anzeigen"
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_account_setup_bank_data_done
 msgid "Technical field used in the special view for the setup bar step."
 msgstr ""
+"Technisches Feld, das für die spezielle Ansicht des Einrichtungsleisten-"
+"Schrittes verwendet wird."
 
 #. module: account_bank_statement_import
 #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
@@ -533,12 +546,12 @@ msgstr ""
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_number_next
 msgid "The next sequence number will be used for the next credit note."
-msgstr ""
+msgstr "Die nächste Sequenznummer wird für die nächste Gutschrift verwendet."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_number_next
 msgid "The next sequence number will be used for the next invoice."
-msgstr ""
+msgstr "Die nächste Sequenznummer wird für die nächste Rechnung verwendet."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
@@ -546,6 +559,8 @@ msgid ""
 "This field contains the information related to the numbering of the credit "
 "note entries of this journal."
 msgstr ""
+"In diesem Feld finden Sie Angaben zum Nummernkreis, der für die Nummerierung"
+" der Posten in dieser Gutschrift verwendet wird."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id
diff --git a/addons/account_bank_statement_import/i18n/fr.po b/addons/account_bank_statement_import/i18n/fr.po
index 84e679d7b92..977ffdb97ed 100644
--- a/addons/account_bank_statement_import/i18n/fr.po
+++ b/addons/account_bank_statement_import/i18n/fr.po
@@ -4,9 +4,9 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # Clo <clo@odoo.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
@@ -16,7 +16,7 @@
 # Olivier Dony <odo@odoo.com>, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Omar Mezga <omar.mezgrane@aldaway.com>, 2017
 # Lucas Deliege <lud@openerp.com>, 2017
@@ -28,13 +28,14 @@
 # fr rev <e2ffr04@hotmail.com>, 2017
 # Saad Thaifa <saad.thaifa@gmail.com>, 2017
 # FR R4 <e2ffr1111@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: FR R4 <e2ffr1111@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -423,6 +424,9 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
+"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
+"Dépôt groupé : encaissez plusieurs chèques clients à la fois en générant un dépôt groupé à envoyer à votre banque. Lors de l'encodage du relevé bancaire dans Odoo, vous pouvez rapprocher la transaction et le dépôt groupé. Activez cette option dans les paramètres."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_outbound_payment_method_ids
diff --git a/addons/account_bank_statement_import/i18n/zh_CN.po b/addons/account_bank_statement_import/i18n/zh_CN.po
index 090e4509f94..a45946bd18c 100644
--- a/addons/account_bank_statement_import/i18n/zh_CN.po
+++ b/addons/account_bank_statement_import/i18n/zh_CN.po
@@ -3,18 +3,19 @@
 # * account_bank_statement_import
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # 文 李 <leroyen913@cenniao.com>, 2017
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -387,6 +388,10 @@ msgid ""
 "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
 "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
 msgstr ""
+"手动：通过现金、支票或除 Odoo 以外的其他方法获取报酬。\n"
+" 电子方式：在客户线上购买或订阅时（支付令），在已保存的卡中请求交易，通过付款受让人自动获取报酬。\n"
+" 批量存款：\n"
+" 批量存款：几个客户同时支票付款时，可生成批量存款提交到银行中。当在 Odoo 进行编码银行对账单时，建议您协调批量存款与交易之间的关系。从设置中启用该选项。"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_outbound_payment_method_ids
@@ -513,7 +518,7 @@ msgstr "下一号码将用于下一张发票"
 msgid ""
 "This field contains the information related to the numbering of the credit "
 "note entries of this journal."
-msgstr ""
+msgstr "该字段包含此日记账中与信用清单目录数量相关的信息。"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id
diff --git a/addons/account_check_printing/i18n/de.po b/addons/account_check_printing/i18n/de.po
index 90b5070bf97..6ae8778fa99 100644
--- a/addons/account_check_printing/i18n/de.po
+++ b/addons/account_check_printing/i18n/de.po
@@ -4,25 +4,26 @@
 # 
 # Translators:
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Mathias Neef <mn@copado.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +68,7 @@ msgstr "Scheckdruck"
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_printing_payment_method_selected
 msgid "Check Printing Payment Method Selected"
-msgstr ""
+msgstr "Scheckdruck-Zahlungsweg ausgewählt"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_sequence_id
@@ -173,7 +174,7 @@ msgstr "Manuelle Nummerierungen"
 #. module: account_check_printing
 #: model:ir.ui.view,arch_db:account_check_printing.view_account_bank_journal_form_inherited_check_printing
 msgid "Manual Numbering of check"
-msgstr ""
+msgstr "Manuelle Nummerierung des Schecks"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_next_number
diff --git a/addons/account_check_printing/i18n/zh_CN.po b/addons/account_check_printing/i18n/zh_CN.po
index 7bbad758d8a..345e7aebce8 100644
--- a/addons/account_check_printing/i18n/zh_CN.po
+++ b/addons/account_check_printing/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * account_check_printing
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -160,7 +161,7 @@ msgstr "手动编号"
 #. module: account_check_printing
 #: model:ir.ui.view,arch_db:account_check_printing.view_account_bank_journal_form_inherited_check_printing
 msgid "Manual Numbering of check"
-msgstr ""
+msgstr "手动编号检查"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_next_number
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 0e2dde84850..06f42c56da6 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -173,17 +173,17 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid ""
 "There was an error processing your payment: impossible to validate invoice."
-msgstr ""
+msgstr "您有一个付款的错误：无法验证发票。"
 
 #. module: account_payment
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid "There was an error processing your payment: invalid invoice state."
-msgstr ""
+msgstr "您有一个付款的错误：无效的发票状态"
 
 #. module: account_payment
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid "There was an error processing your payment: invalid invoice."
-msgstr ""
+msgstr "您有一个付款的错误：无效发票。"
 
 #. module: account_payment
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index aa6c24324de..33efbf34d17 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -13,17 +13,18 @@
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Sébastien LANGE (SYLEAM) <sebastien.lange@syleam.fr>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Xavier Symons <xsy@openerp.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -454,7 +455,7 @@ msgstr "Montant de la taxe"
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_tax_correction
 msgid "Tax Correction"
-msgstr ""
+msgstr "Correction de la taxe"
 
 #. module: account_voucher
 #: model:ir.model.fields,help:account_voucher.field_account_voucher_paid
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 61e964d7b40..0d91bb8d3fd 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
@@ -14,13 +14,14 @@
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # lap.odoo <lap@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: lap.odoo <lap@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -124,7 +125,7 @@ msgstr "Balance"
 #. module: analytic
 #: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_kanban
 msgid "Balance:"
-msgstr ""
+msgstr "Solde :"
 
 #. module: analytic
 #: model:ir.actions.act_window,name:analytic.action_analytic_account_form
@@ -313,6 +314,10 @@ msgid ""
 "                (fixed price invoices), on timesheets (based on the work done) or\n"
 "                on expenses (e.g. reinvoicing of travel costs)."
 msgstr ""
+"Les revenus seront créés automatiquement quand vous créerez des factures\n"
+" clients. Les factures clients peuvent être créées en fonction des bons de commande\n"
+" (factures au forfait), des feuilles de temps (sur la base du travail effectué) ou\n"
+" des dépenses (p. ex. : la refacturation des frais de déplacement)."
 
 #. module: analytic
 #: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
@@ -323,6 +328,8 @@ msgstr "Chercher des lignes analytiques"
 #: model:ir.model.fields,help:analytic.field_account_analytic_tag_active
 msgid "Set active to false to hide the Analytic Tag without removing it."
 msgstr ""
+"Définissez le champ actif sur False pour masquer l'étiquette de l'analytique"
+" sans la supprimer."
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_tag_ids
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index bde6d46cbbe..a651538a0b6 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -239,6 +240,9 @@ msgid ""
 "                analytic accounts. You can track costs and revenues to analyse\n"
 "                your margins easily."
 msgstr ""
+"在 Odoo 中，使用\n"
+" 分析账户实施销售订单和项目。您可以跟踪成本和收入，轻松分析\n"
+" 您的利润"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account___last_update
@@ -296,6 +300,10 @@ msgid ""
 "                (fixed price invoices), on timesheets (based on the work done) or\n"
 "                on expenses (e.g. reinvoicing of travel costs)."
 msgstr ""
+"创建客户\n"
+" 发票时将自动创建收入。可基于销售订单\n"
+" （固定价格发票）、时间表（基于已完成工作）或\n"
+" 费用（例如差旅费的再开票）创建客户发票。"
 
 #. module: analytic
 #: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
@@ -305,7 +313,7 @@ msgstr "搜索分析行"
 #. module: analytic
 #: model:ir.model.fields,help:analytic.field_account_analytic_tag_active
 msgid "Set active to false to hide the Analytic Tag without removing it."
-msgstr ""
+msgstr "将“有效”字段设置为“否”可隐藏分析标签，而无需将其删除。"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_tag_ids
diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po
index eb8db8a9abc..1dd08e21340 100644
--- a/addons/anonymization/i18n/fr.po
+++ b/addons/anonymization/i18n/fr.po
@@ -402,6 +402,8 @@ msgid ""
 "This is the file created by the anonymization process. It should have the "
 "extension '.json' or '.pickle'."
 msgstr ""
+"Ceci est le fichier créé par le processus d'anonymisation. Il devrait "
+"présenter l'extension « .json » ou « .pickle »."
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 163aa3afaf1..98b724f15c5 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -6,13 +6,14 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
 # Rangy Chen <rangychen@163.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Rangy Chen <rangychen@163.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -369,7 +370,7 @@ msgstr "数据库目前没有匿名，你不能逆转匿名"
 msgid ""
 "This is the file created by the anonymization process. It should have the "
 "extension '.json' or '.pickle'."
-msgstr ""
+msgstr "这是通过匿名流程创建的文件。该文件应具有扩展名 '.json' 或 '.pickle'。"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
diff --git a/addons/auth_ldap/i18n/fr.po b/addons/auth_ldap/i18n/fr.po
index 50c9e3b69e1..5958a6796b3 100644
--- a/addons/auth_ldap/i18n/fr.po
+++ b/addons/auth_ldap/i18n/fr.po
@@ -4,17 +4,18 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -81,7 +82,7 @@ msgstr "Paramètres LDAP"
 #. module: auth_ldap
 #: model:ir.ui.view,arch_db:auth_ldap.res_config_settings_view_form
 msgid "LDAP Server"
-msgstr ""
+msgstr "Serveur LDAP"
 
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap_ldap_server
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index 089330c8b80..232fc5dfc04 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * auth_ldap
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -77,7 +78,7 @@ msgstr "LDAP 参数"
 #. module: auth_ldap
 #: model:ir.ui.view,arch_db:auth_ldap.res_config_settings_view_form
 msgid "LDAP Server"
-msgstr ""
+msgstr "LDAP 服务器"
 
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap_ldap_server
diff --git a/addons/auth_oauth/i18n/fr.po b/addons/auth_oauth/i18n/fr.po
index d8089ec2220..6d22f0eeaf6 100644
--- a/addons/auth_oauth/i18n/fr.po
+++ b/addons/auth_oauth/i18n/fr.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -73,7 +74,7 @@ msgstr "Id. client"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Client ID:"
-msgstr ""
+msgstr "Identifiant client :"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_create_uid
@@ -98,7 +99,7 @@ msgstr "Nom affiché"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Google Authentication"
-msgstr ""
+msgstr "Authentification Google"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_id
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
index 627fb967379..7df8b810092 100644
--- a/addons/auth_oauth/i18n/zh_CN.po
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * auth_oauth
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Si Ling Lau <happy8645@hotmail.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,7 +40,7 @@ msgstr "允许用户通过google登录"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Allow users to sign in with their Google account"
-msgstr ""
+msgstr "允许用户使用其 Google 账户登录"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_enabled
@@ -70,7 +71,7 @@ msgstr "客户端 ID"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Client ID:"
-msgstr ""
+msgstr "客户端 ID："
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_create_uid
@@ -95,7 +96,7 @@ msgstr "显示名称"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Google Authentication"
-msgstr ""
+msgstr "Google 认证"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_id
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 9ace95a74b2..17afb5868c4 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -299,7 +299,7 @@ msgstr "Kundenkonto"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Default Access Rights"
-msgstr ""
+msgstr "Standard-Zugriffsrechte"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
@@ -315,7 +315,7 @@ msgstr "Passwort zurücksetzen von der Login-Seite erlauben"
 #. module: auth_signup
 #: selection:res.config.settings,auth_signup_uninvited:0
 msgid "Free sign up (B2C)"
-msgstr ""
+msgstr "Kostenlose Registrierung (B2C)"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_ir_http
@@ -347,12 +347,12 @@ msgstr "Noch nie angemeldet"
 #: code:addons/auth_signup/controllers/main.py:73
 #, python-format
 msgid "No login provided."
-msgstr ""
+msgstr "Keine Anmeldung vorhanden."
 
 #. module: auth_signup
 #: selection:res.config.settings,auth_signup_uninvited:0
 msgid "On invitation (B2B)"
-msgstr ""
+msgstr "Auf Einladung (B2B)"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.fields
@@ -373,7 +373,7 @@ msgstr "Passwort zurücksetzen"
 #: code:addons/auth_signup/controllers/main.py:121
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "Passwörter stimmen nicht überein; bitte geben Sie sie erneut ein."
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
@@ -443,13 +443,13 @@ msgstr ""
 #: code:addons/auth_signup/models/res_partner.py:146
 #, python-format
 msgid "Signup token '%s' is no longer valid"
-msgstr ""
+msgstr "Registrierungstoken „%s“ ist nicht mehr gültig"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:142
 #, python-format
 msgid "Signup token '%s' is not valid"
-msgstr ""
+msgstr "Registrierungstoken „%s“ ist ungültig"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users_state
@@ -465,7 +465,7 @@ msgstr "Vorlage 'Benutzer' für neue registrierte Benutzer"
 #: code:addons/auth_signup/controllers/main.py:119
 #, python-format
 msgid "The form was not properly filled in."
-msgstr ""
+msgstr "Das Formular wurde nicht ordnungsgemäß ausgefüllt."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
diff --git a/addons/auth_signup/i18n/es.po b/addons/auth_signup/i18n/es.po
index 9a85d652ef5..2e6b148f5f2 100644
--- a/addons/auth_signup/i18n/es.po
+++ b/addons/auth_signup/i18n/es.po
@@ -461,13 +461,13 @@ msgstr "El acceso no está permitido a usuarios que no hayan sido invitados"
 #: code:addons/auth_signup/models/res_partner.py:146
 #, python-format
 msgid "Signup token '%s' is no longer valid"
-msgstr ""
+msgstr "La ficha de registro '%s' ya no es válida"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:142
 #, python-format
 msgid "Signup token '%s' is not valid"
-msgstr ""
+msgstr "La ficha de registro '%s' no es válida"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users_state
diff --git a/addons/auth_signup/i18n/fr.po b/addons/auth_signup/i18n/fr.po
index 858b7a193cf..a7f8829fdf5 100644
--- a/addons/auth_signup/i18n/fr.po
+++ b/addons/auth_signup/i18n/fr.po
@@ -229,7 +229,7 @@ msgstr ""
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.signup
 msgid "Already have an account?"
-msgstr ""
+msgstr "Vous avez déjà un compte ?"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:78
@@ -287,7 +287,7 @@ msgstr "Contact"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Copy access rights from"
-msgstr ""
+msgstr "Copier les droits d'accès de"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:55
@@ -304,7 +304,7 @@ msgstr "Impossible de réinitialiser votre mot de passe"
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_uninvited
 msgid "Customer Account"
-msgstr ""
+msgstr "Compte client"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
@@ -314,7 +314,7 @@ msgstr "Droits d'accès par défaut"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
 msgid "Don't have an account?"
-msgstr ""
+msgstr "Vous n'avez pas de compte ?"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_reset_password
@@ -361,7 +361,7 @@ msgstr "Jamais connecté"
 #: code:addons/auth_signup/controllers/main.py:73
 #, python-format
 msgid "No login provided."
-msgstr ""
+msgstr "Aucun identifiant fourni."
 
 #. module: auth_signup
 #: selection:res.config.settings,auth_signup_uninvited:0
@@ -388,6 +388,7 @@ msgstr "Réinitialisation du mot de passe"
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
+"Les mots de passe ne correspondent pas, veuillez les saisir à nouveau."
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
@@ -451,19 +452,19 @@ msgstr "Url d'authentification"
 #: code:addons/auth_signup/models/res_users.py:88
 #, python-format
 msgid "Signup is not allowed for uninvited users"
-msgstr ""
+msgstr "Les utilisateurs non invités ne sont pas autorisés à s'inscrire"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:146
 #, python-format
 msgid "Signup token '%s' is no longer valid"
-msgstr ""
+msgstr "Le jeton d'inscription « %s » n'est plus valide"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:142
 #, python-format
 msgid "Signup token '%s' is not valid"
-msgstr ""
+msgstr "Le jeton d'inscription « %s » n'est pas valide"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users_state
@@ -480,7 +481,7 @@ msgstr ""
 #: code:addons/auth_signup/controllers/main.py:119
 #, python-format
 msgid "The form was not properly filled in."
-msgstr ""
+msgstr "Le formulaire n'est pas correctement rempli."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -490,7 +491,7 @@ msgstr "Utilisateurs"
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.mail_template_user_signup_account_created
 msgid "Welcome to ${object.company_id.name}!"
-msgstr ""
+msgstr "Bienvenue sur ${object.company_id.name} !"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.fields
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index b56ee31362e..eb403db603d 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -211,7 +211,7 @@ msgstr "<strong>包含以下订阅链接的邀请函发出：</strong>"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.signup
 msgid "Already have an account?"
-msgstr ""
+msgstr "已经具有账户？"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:78
@@ -265,7 +265,7 @@ msgstr "联系人"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Copy access rights from"
-msgstr ""
+msgstr "复制访问权限"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:55
@@ -282,7 +282,7 @@ msgstr "无法重置密码"
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_uninvited
 msgid "Customer Account"
-msgstr ""
+msgstr "顾客账号"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
@@ -292,7 +292,7 @@ msgstr "默认访问权限"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
 msgid "Don't have an account?"
-msgstr ""
+msgstr "还没有账户？"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings_auth_signup_reset_password
@@ -303,7 +303,7 @@ msgstr "允许在登录页开启密码重置功能"
 #. module: auth_signup
 #: selection:res.config.settings,auth_signup_uninvited:0
 msgid "Free sign up (B2C)"
-msgstr ""
+msgstr "免费注册 (B2C)"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_ir_http
@@ -335,12 +335,12 @@ msgstr "从未连接"
 #: code:addons/auth_signup/controllers/main.py:73
 #, python-format
 msgid "No login provided."
-msgstr ""
+msgstr "未提供登录账号。"
 
 #. module: auth_signup
 #: selection:res.config.settings,auth_signup_uninvited:0
 msgid "On invitation (B2B)"
-msgstr ""
+msgstr "应邀 (B2B)"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.fields
@@ -350,7 +350,7 @@ msgstr "密码"
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Password Reset"
-msgstr ""
+msgstr "密码重置"
 
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.reset_password_email
@@ -361,7 +361,7 @@ msgstr "密码重置"
 #: code:addons/auth_signup/controllers/main.py:121
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "密码不匹配；请重新输入密码。"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.login
@@ -423,19 +423,19 @@ msgstr "注册网址"
 #: code:addons/auth_signup/models/res_users.py:88
 #, python-format
 msgid "Signup is not allowed for uninvited users"
-msgstr ""
+msgstr "不允许未邀请的用户进行注册"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:146
 #, python-format
 msgid "Signup token '%s' is no longer valid"
-msgstr ""
+msgstr "注册令牌 '%s' 不再有效"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:142
 #, python-format
 msgid "Signup token '%s' is not valid"
-msgstr ""
+msgstr "注册令牌 '%s' 无效"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users_state
@@ -451,7 +451,7 @@ msgstr "用作通过注册创建的新用户的模版"
 #: code:addons/auth_signup/controllers/main.py:119
 #, python-format
 msgid "The form was not properly filled in."
-msgstr ""
+msgstr "未正确填写表格。"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -461,7 +461,7 @@ msgstr "用户"
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.mail_template_user_signup_account_created
 msgid "Welcome to ${object.company_id.name}!"
-msgstr ""
+msgstr "欢迎访问 ${object.company_id.name}！"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.fields
diff --git a/addons/barcodes/i18n/fr.po b/addons/barcodes/i18n/fr.po
index cc8bc2e1b15..9618ad67f6a 100644
--- a/addons/barcodes/i18n/fr.po
+++ b/addons/barcodes/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
@@ -19,13 +19,14 @@
 # Xavier Brochard <xavier@alternatif.org>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
 # Mohammed SK <medkamar@blutec.ma>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Mohammed SK <medkamar@blutec.ma>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -213,7 +214,7 @@ msgstr "Encodage"
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:301
 #, python-format
 msgid "Error : Barcode command is undefined"
-msgstr ""
+msgstr "Erreur : la commande de code-barres n'est pas définie"
 
 #. module: barcodes
 #. openerp-web
diff --git a/addons/base_address_city/i18n/fr.po b/addons/base_address_city/i18n/fr.po
index 26c568ecd5b..cb22004b273 100644
--- a/addons/base_address_city/i18n/fr.po
+++ b/addons/base_address_city/i18n/fr.po
@@ -5,20 +5,21 @@
 # Translators:
 # Olivier Dony <odo@odoo.com>, 2017
 # Xavier Belmere <Info@cartmeleon.com>, 2017
-# ShevAbam <shevabam@gmail.com>, 2017
+# ShevAbam, 2017
 # Lucas Deliege <lud@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2017
 # Fabien Pinckaers <fp@openerp.com>, 2017
 # Xavier Symons <xsy@openerp.com>, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -89,6 +90,9 @@ msgid ""
 "                your partner records. Note that an option can be set on each country separately\n"
 "                to enforce any address of it to have a city in this list."
 msgstr ""
+"Affichez et gérez la liste de toutes les villes qui peuvent être associées\n"
+" à vos partenaires. Notez qu'une option peut être configurée indépendamment pour chaque pays\n"
+" pour faire en sorte qu'une adresse correspondante présente une ville dans cette liste."
 
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_country_enforce_cities
diff --git a/addons/base_address_extended/i18n/fr.po b/addons/base_address_extended/i18n/fr.po
index 4145d30e8f6..742f5ed5582 100644
--- a/addons/base_address_extended/i18n/fr.po
+++ b/addons/base_address_extended/i18n/fr.po
@@ -3,16 +3,18 @@
 # * base_address_extended
 # 
 # Translators:
-# Eloïse Stilmant <est@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2017
+# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
+# Eloïse Stilmant <est@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Daniel & Delphine <dd2013@leschoupinous.net>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,6 +28,8 @@ msgid ""
 "Change how the system computes the full street field based on the different "
 "street subfields"
 msgstr ""
+"Modifier la façon dont le système calcule le champ relatif à la rue complète"
+" en fonction des différents champs secondaires relatifs à la rue"
 
 #. module: base_address_extended
 #: model:ir.model,name:base_address_extended.model_res_company
@@ -59,6 +63,12 @@ msgid ""
 "%(street_number)s: the house number\n"
 "%(street_number2)s: the door number"
 msgstr ""
+"Format à utiliser pour les rues de ce pays.\n"
+"\n"
+"Vous pouvez utiliser le modèle de chaîne de type python avec tous les champs associés à la rue (par exemple, utilisez « %(street_name)s, %(street_number)s » si vous souhaitez afficher le nom de la rue, suivie d'une virgule et le numéro du logement)\n"
+"%(street_name)s : nom de la rue\n"
+"%(street_number)s : numéro du logement\n"
+"%(street_number2)s : numéro de la porte"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number
@@ -70,7 +80,7 @@ msgstr "Numéro de maison"
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_country_street_format
 msgid "Street Format"
-msgstr ""
+msgstr "Format de rue"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_name
@@ -89,11 +99,11 @@ msgstr "Nom de la rue..."
 #. module: base_address_extended
 #: model:ir.ui.view,arch_db:base_address_extended.view_res_country_extended_form
 msgid "Street format..."
-msgstr ""
+msgstr "Format de rue…"
 
 #. module: base_address_extended
 #: code:addons/base_address_extended/models/base_address_extended.py:60
 #: code:addons/base_address_extended/models/base_address_extended.py:126
 #, python-format
 msgid "Unrecognized field %s in street format."
-msgstr ""
+msgstr "Champ %s non reconnu dans le format de rue."
diff --git a/addons/base_automation/i18n/de.po b/addons/base_automation/i18n/de.po
index 6d9d009a0f4..dcd253f76e2 100644
--- a/addons/base_automation/i18n/de.po
+++ b/addons/base_automation/i18n/de.po
@@ -3,14 +3,14 @@
 # * base_automation
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Renzo Meister, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
@@ -18,13 +18,14 @@
 # Henry Mineehen <info@mineehen.de>, 2017
 # Florian R. A. Angermeier <fa@brunner.at>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: AppleMentalist <felix.schnatbaum@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +82,7 @@ msgstr "Abonnenten hinzufügen"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_filter_domain
 msgid "Apply on"
-msgstr ""
+msgstr "Anzuwenden auf"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_is_assigned_to_admin
@@ -165,7 +166,7 @@ msgstr "Abgrenzung vor Aktualisierung"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_model_id
 msgid "Binding Model"
-msgstr ""
+msgstr "Verbindliches Modell"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_type
@@ -392,7 +393,7 @@ msgstr ""
 #. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_model_id
 msgid "Model on which the server action runs."
-msgstr ""
+msgstr "Modell, auf dem die Server-Aktion läuft."
 
 #. module: base_automation
 #: selection:base.automation,trg_date_range_type:0
@@ -538,6 +539,13 @@ msgid ""
 "- 'Add Followers': add followers to a record (available in Discuss)\n"
 "- 'Send Email': automatically send an email (available in email_template)"
 msgstr ""
+"Typ der Serveraktion. Folgende Werte sind verfügbar:\n"
+"- „Execute Python Code“ (Python-Code ausführen): ein Python-Code-Block, der ausgeführt wird\n"
+"- „Create or Copy a new Record“ (Neuen Datensatz erstellen oder kopieren): einen neuen Datensatz mit neuen Werten erstellen oder einen existierenden Datensatz in Ihre Datenbank kopieren\n"
+"- „Write on a Record“ (auf einen Datensatz schreiben): die Werte eines Datensatzes aktualisieren\n"
+"- „Execute several actions“ (Mehrere Aktionen ausführen): eine Aktion definieren, die mehrere andere Aktionen auslöst\n"
+"- „Add Followers“ (Follower hinzufügen): Follower zu einem Datensatz hinzufügen (verfügbar in Discuss)\n"
+"- „Send Email“ (E-Mail senden): automatisch eine E-Mail senden (verfügbar in email_template)"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_usage
diff --git a/addons/base_automation/i18n/es.po b/addons/base_automation/i18n/es.po
index 9f8f4b073ff..e2c4ef4a72e 100644
--- a/addons/base_automation/i18n/es.po
+++ b/addons/base_automation/i18n/es.po
@@ -5,12 +5,12 @@
 # Translators:
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2017
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ana Juaristi <ajuaristio@gmail.com>, 2017
 # José Vicente <txusev@gmail.com>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 # Carles Antoli <carlesantoli@hotmail.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # Sergio Flores <vitavitae1@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Diego de la Torre <diego.delatorreh@gmail.com>, 2017
@@ -22,13 +22,14 @@
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
 # Miguel Orueta <mo@landoo.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Miguel Orueta <mo@landoo.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -113,43 +114,45 @@ msgstr "Automatización"
 #: model:ir.cron,cron_name:base_automation.ir_cron_data_base_automation_check
 #: model:ir.cron,name:base_automation.ir_cron_data_base_automation_check
 msgid "Base Action Rule: check and execute"
-msgstr ""
+msgstr "Norma de acción básica: revisar y ejecutar"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_recursive
 #: model:ir.actions.server,name:base_automation.test_rule_recursive_ir_actions_server
 msgid "Base Automation: test recursive rule"
-msgstr ""
+msgstr "Automatización básica: norma recursiva de prueba"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_create
 #: model:ir.actions.server,name:base_automation.test_rule_on_create_ir_actions_server
 msgid "Base Automation: test rule on create"
-msgstr ""
+msgstr "Automatización básica: norma de prueba para crear"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_recompute
 #: model:ir.actions.server,name:base_automation.test_rule_on_recompute_ir_actions_server
 msgid "Base Automation: test rule on recompute"
-msgstr ""
+msgstr "Automatización básica: norma de prueba para recalcular"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_line
 #: model:ir.actions.server,name:base_automation.test_rule_on_line_ir_actions_server
 msgid "Base Automation: test rule on secondary model"
-msgstr ""
+msgstr "Automatización básica: norma de prueba para el modelo secundario"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_write
 #: model:ir.actions.server,name:base_automation.test_rule_on_write_ir_actions_server
 msgid "Base Automation: test rule on write"
-msgstr ""
+msgstr "Automatización básica: norma de prueba para la escritura"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_write_check_context
 #: model:ir.actions.server,name:base_automation.test_rule_on_write_check_context_ir_actions_server
 msgid "Base Automation: test rule on write check context"
 msgstr ""
+"Automatización básica: norma de prueba para una escritura de revisión del "
+"contexto"
 
 #. module: base_automation
 #: selection:base.automation,trigger:0
@@ -468,6 +471,8 @@ msgid ""
 "Provide the field used to link the newly created recordon the record on used"
 " by the server action."
 msgstr ""
+"Proporcione el campo usado para enlazar el recién creado registro con la "
+"acción del servidor."
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_code
diff --git a/addons/base_automation/i18n/fr.po b/addons/base_automation/i18n/fr.po
index 0c93ced6aaf..a94bdf164a0 100644
--- a/addons/base_automation/i18n/fr.po
+++ b/addons/base_automation/i18n/fr.po
@@ -6,12 +6,12 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Xavier Belmere <Info@cartmeleon.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Benjamin Delagoutte <ben@ampletus.fr>, 2017
 # Olivier Dony <odo@odoo.com>, 2017
 # Xavier Symons <xsy@openerp.com>, 2017
 # Lionel Sausin <ls@numerigraphe.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
 # Agathe Mollé <molleagathe@gmail.com>, 2017
 # Fabien Pinckaers <fp@openerp.com>, 2017
@@ -21,13 +21,14 @@
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # leemannd <denis.leemann@camptocamp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: leemannd <denis.leemann@camptocamp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -112,43 +113,45 @@ msgstr "Automatisation"
 #: model:ir.cron,cron_name:base_automation.ir_cron_data_base_automation_check
 #: model:ir.cron,name:base_automation.ir_cron_data_base_automation_check
 msgid "Base Action Rule: check and execute"
-msgstr ""
+msgstr "Règle d'action de base : vérification et exécution"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_recursive
 #: model:ir.actions.server,name:base_automation.test_rule_recursive_ir_actions_server
 msgid "Base Automation: test recursive rule"
-msgstr ""
+msgstr "Automatisation de base : test de règle récursive"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_create
 #: model:ir.actions.server,name:base_automation.test_rule_on_create_ir_actions_server
 msgid "Base Automation: test rule on create"
-msgstr ""
+msgstr "Automatisation de base : test de règle lors d'une création"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_recompute
 #: model:ir.actions.server,name:base_automation.test_rule_on_recompute_ir_actions_server
 msgid "Base Automation: test rule on recompute"
-msgstr ""
+msgstr "Automatisation de base : test de règle lors d'un recalcul"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_line
 #: model:ir.actions.server,name:base_automation.test_rule_on_line_ir_actions_server
 msgid "Base Automation: test rule on secondary model"
-msgstr ""
+msgstr "Automatisation de base : test de règle sur un modèle secondaire"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_write
 #: model:ir.actions.server,name:base_automation.test_rule_on_write_ir_actions_server
 msgid "Base Automation: test rule on write"
-msgstr ""
+msgstr "Automatisation de base : test de règle lors d'une écriture"
 
 #. module: base_automation
 #: model:base.automation,name:base_automation.test_rule_on_write_check_context
 #: model:ir.actions.server,name:base_automation.test_rule_on_write_check_context_ir_actions_server
 msgid "Base Automation: test rule on write check context"
 msgstr ""
+"Automatisation de base : test de règle sur un contexte de vérification "
+"d'écriture"
 
 #. module: base_automation
 #: selection:base.automation,trigger:0
@@ -168,12 +171,12 @@ msgstr "Domaine avant la mise-à-jour"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_model_id
 msgid "Binding Model"
-msgstr ""
+msgstr "Modèle de liaison"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_binding_type
 msgid "Binding Type"
-msgstr ""
+msgstr "Type de liaison"
 
 #. module: base_automation
 #: selection:base.automation.lead.test,state:0
@@ -202,7 +205,7 @@ msgstr ""
 #. module: base_automation
 #: model:ir.actions.act_window,help:base_automation.base_automation_act
 msgid "Click to setup a new automated automation."
-msgstr ""
+msgstr "Cliquez pour configurer une nouvelle automatisation automatisée."
 
 #. module: base_automation
 #: selection:base.automation.lead.test,state:0
@@ -252,6 +255,9 @@ msgid ""
 "                                    You can put a negative number if you need a delay before the\n"
 "                                    trigger date, like sending a reminder 15 minutes before a meeting."
 msgstr ""
+"Délai après la date de déclenchement.\n"
+" Vous pouvez mettre une valeur négative si vous avez besoin d'un délai avant la\n"
+" date de déclenchement : envoyer un rappel 15 minutes avant une réunion, par exemple."
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_trg_date_range
@@ -395,7 +401,7 @@ msgstr ""
 #. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_model_id
 msgid "Model on which the server action runs."
-msgstr ""
+msgstr "Modèle sur lequel se base l'exécution de l'action du serveur."
 
 #. module: base_automation
 #: selection:base.automation,trg_date_range_type:0
@@ -467,6 +473,8 @@ msgid ""
 "Provide the field used to link the newly created recordon the record on used"
 " by the server action."
 msgstr ""
+"Indiquez le champ utilisé pour associer le nouvel enregistrement utilisé par"
+" l'action du serveur."
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_code
@@ -476,7 +484,7 @@ msgstr "Code Python"
 #. module: base_automation
 #: model:ir.ui.view,arch_db:base_automation.view_base_automation_form
 msgid "Remove Action"
-msgstr ""
+msgstr "Supprimer une action"
 
 #. module: base_automation
 #: model:ir.ui.view,arch_db:base_automation.view_base_automation_form
@@ -504,6 +512,8 @@ msgid ""
 "Setting a value makes this action available in the sidebar for the given "
 "model."
 msgstr ""
+"Après qu'une valeur a été définie, cette action devient disponible dans la "
+"barre latérale pour le modèle donné."
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_state
@@ -518,7 +528,7 @@ msgstr "Sujet"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_trigger
 msgid "Trigger Condition"
-msgstr ""
+msgstr "Condition de déclenchement"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_trg_date_id
@@ -536,6 +546,13 @@ msgid ""
 "- 'Add Followers': add followers to a record (available in Discuss)\n"
 "- 'Send Email': automatically send an email (available in email_template)"
 msgstr ""
+"Type d'action du serveur. Les valeurs suivantes sont disponibles :\n"
+"- « Exécuter du code Python » : un bloc de code python qui sera exécuté\n"
+"- « Créer ou copier un nouvel enregistrement » : créer un enregistrement avec de nouvelles valeurs, ou copier un enregistrement existant dans votre base de données\n"
+"- « Modifier un enregistrement » : mettre à jour les valeurs d'un enregistrement\n"
+"- « Exécuter plusieurs actions » : définir une action qui déclenche plusieurs actions du serveur\n"
+"- « Ajouter des abonnés » : ajouter des abonnés à un enregistrement (disponible dans le module Discutez)\n"
+"- « Envoyer un e-mail » : envoyer automatiquement un e-mail (disponible dans email_template)"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_usage
@@ -556,6 +573,11 @@ msgid ""
 "                opportunity which still has status pending after 14 days might\n"
 "                trigger an automatic reminder email."
 msgstr ""
+"Utilisez des actions automatisées pour déclencher automatiquement des actions pour\n"
+" différents écrans. Par exemple : une piste créée par un utilisateur spécifique peut\n"
+" être automatiquement affectée à une équipe de vente, ou une\n"
+" opportunité en attente depuis plus de 14 jours peut\n"
+" déclencher un rappel automatique par e-mail."
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation_line_test_user_id
@@ -591,6 +613,8 @@ msgid ""
 "When should the condition be triggered.\n"
 "                                  If present, will be checked by the scheduler. If empty, will be checked at creation and update."
 msgstr ""
+"Cas où la condition doit être déclenchée.\n"
+" Si renseigné, la valeur sera vérifiée par le planificateur de tâches. Si vide, la valeur sera vérifiée lors d'une création et d'une mise à jour."
 
 #. module: base_automation
 #: model:ir.model.fields,help:base_automation.field_base_automation_active
diff --git a/addons/base_gengo/i18n/es.po b/addons/base_gengo/i18n/es.po
index 35bbd9b02ef..3aa6eca75dc 100644
--- a/addons/base_gengo/i18n/es.po
+++ b/addons/base_gengo/i18n/es.po
@@ -3,8 +3,8 @@
 # * base_gengo
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
@@ -13,13 +13,14 @@
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -187,14 +188,14 @@ msgstr "Gengo: Solicitud manual de traducción"
 #: model:ir.cron,cron_name:base_gengo.gengo_sync_send_request_scheduler
 #: model:ir.cron,name:base_gengo.gengo_sync_send_request_scheduler
 msgid "Gengo: Sync translation (Request)"
-msgstr ""
+msgstr "Gengo: Sincronizar traducción (Solicitud)"
 
 #. module: base_gengo
 #: model:ir.actions.server,name:base_gengo.gengo_sync_receive_request_scheduler_ir_actions_server
 #: model:ir.cron,cron_name:base_gengo.gengo_sync_receive_request_scheduler
 #: model:ir.cron,name:base_gengo.gengo_sync_receive_request_scheduler
 msgid "Gengo: Sync translation (Response)"
-msgstr ""
+msgstr "Gengo: Sincronizar traducción (Respuesta)"
 
 #. module: base_gengo
 #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_id
diff --git a/addons/base_gengo/i18n/fr.po b/addons/base_gengo/i18n/fr.po
index 9452a7fa7a7..5690c875692 100644
--- a/addons/base_gengo/i18n/fr.po
+++ b/addons/base_gengo/i18n/fr.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# e2f Production <e2f_prod@outlook.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2016\n"
+"Last-Translator: e2f Production <e2f_prod@outlook.com>, 2018\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"
@@ -184,7 +185,7 @@ msgstr "Gengo: requête manuelle de traduction"
 #: model:ir.cron,cron_name:base_gengo.gengo_sync_send_request_scheduler
 #: model:ir.cron,name:base_gengo.gengo_sync_send_request_scheduler
 msgid "Gengo: Sync translation (Request)"
-msgstr ""
+msgstr "Gengo : synchronisation de traduction (demande)"
 
 #. module: base_gengo
 #: model:ir.actions.server,name:base_gengo.gengo_sync_receive_request_scheduler_ir_actions_server
diff --git a/addons/base_gengo/i18n/zh_CN.po b/addons/base_gengo/i18n/zh_CN.po
index eab65131288..d200fc01de6 100644
--- a/addons/base_gengo/i18n/zh_CN.po
+++ b/addons/base_gengo/i18n/zh_CN.po
@@ -3,17 +3,18 @@
 # * base_gengo
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Ted Wang <feiyuwang2012@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -177,14 +178,14 @@ msgstr "Gengo: 手册翻译要求"
 #: model:ir.cron,cron_name:base_gengo.gengo_sync_send_request_scheduler
 #: model:ir.cron,name:base_gengo.gengo_sync_send_request_scheduler
 msgid "Gengo: Sync translation (Request)"
-msgstr ""
+msgstr "Gengo：同步翻译（请求）"
 
 #. module: base_gengo
 #: model:ir.actions.server,name:base_gengo.gengo_sync_receive_request_scheduler_ir_actions_server
 #: model:ir.cron,cron_name:base_gengo.gengo_sync_receive_request_scheduler
 #: model:ir.cron,name:base_gengo.gengo_sync_receive_request_scheduler
 msgid "Gengo: Sync translation (Response)"
-msgstr ""
+msgstr "Gengo：同步翻译（响应）"
 
 #. module: base_gengo
 #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_id
diff --git a/addons/base_import/i18n/es.po b/addons/base_import/i18n/es.po
index 8d75f8c0341..4250b00d68a 100644
--- a/addons/base_import/i18n/es.po
+++ b/addons/base_import/i18n/es.po
@@ -3,26 +3,27 @@
 # * base_import
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -511,7 +512,7 @@ msgstr "Tabulación"
 #: code:addons/base_import/static/src/xml/base_import.xml:91
 #, python-format
 msgid "Test Import"
-msgstr ""
+msgstr "Importación de prueba"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index 3112eb26aef..8ba0c67c1b5 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/i18n/fr.po
@@ -4,23 +4,24 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Fabrice Henrion <fhe@odoo.com>, 2016
+# Fabrice Henrion, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Xavier Brochard <xavier@alternatif.org>, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
 # Lionel Sausin <ls@numerigraphe.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -488,7 +489,7 @@ msgstr "Séparateur :"
 #: code:addons/base_import/static/src/xml/base_import.xml:77
 #, python-format
 msgid "Show fields of relation fields (advanced)"
-msgstr ""
+msgstr "Afficher les champs de relation (avancé)"
 
 #. module: base_import
 #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue
@@ -514,7 +515,7 @@ msgstr "Tabulation"
 #: code:addons/base_import/static/src/xml/base_import.xml:91
 #, python-format
 msgid "Test Import"
-msgstr ""
+msgstr "Test d'importation"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import_module/i18n/es.po b/addons/base_import_module/i18n/es.po
index 79c9e81175c..5e7dcc238ec 100644
--- a/addons/base_import_module/i18n/es.po
+++ b/addons/base_import_module/i18n/es.po
@@ -6,22 +6,23 @@
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -98,7 +99,7 @@ msgstr "Importar aplicación"
 #. module: base_import_module
 #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_import_message
 msgid "Import Message"
-msgstr ""
+msgstr "Importar mensaje"
 
 #. module: base_import_module
 #: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import
@@ -175,7 +176,7 @@ msgstr "Estado"
 #: code:addons/base_import_module/models/ir_module.py:47
 #, python-format
 msgid "Studio customizations require Studio"
-msgstr ""
+msgstr "La personalización de Studio requiere contar con Studio"
 
 #. module: base_import_module
 #: code:addons/base_import_module/models/ir_module.py:42
diff --git a/addons/base_import_module/i18n/fr.po b/addons/base_import_module/i18n/fr.po
index 5b3afb65cd5..a5cb9c7698c 100644
--- a/addons/base_import_module/i18n/fr.po
+++ b/addons/base_import_module/i18n/fr.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -92,7 +93,7 @@ msgstr "Importer l'application"
 #. module: base_import_module
 #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_import_message
 msgid "Import Message"
-msgstr ""
+msgstr "Message d'import"
 
 #. module: base_import_module
 #: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import
@@ -169,7 +170,7 @@ msgstr "Statut"
 #: code:addons/base_import_module/models/ir_module.py:47
 #, python-format
 msgid "Studio customizations require Studio"
-msgstr ""
+msgstr "Les personnalisations de studio nécessitent Studio"
 
 #. module: base_import_module
 #: code:addons/base_import_module/models/ir_module.py:42
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 487b54c393c..da95fb384b4 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -92,7 +92,7 @@ msgstr ""
 #: code:addons/base_setup/models/res_config_settings.py:100
 #, python-format
 msgid "Choose Your Document Layout"
-msgstr ""
+msgstr "Wählen Sie Ihr Dokumentenlayout"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -141,7 +141,7 @@ msgstr "Fußzeile benutzerdefinierter Bericht "
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_default_user_rights
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Default Access Rights"
-msgstr ""
+msgstr "Standard-Zugriffsrechte"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_external_report_layout
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 39fa69390f8..11b0a55452f 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,8 +7,8 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Christophe Dubuit <cdubuit@yahoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Martin Trigaux, 2016
+# Florian Hatat, 2016
 # Xavier Brochard <xavier@alternatif.org>, 2017
 # Lucas Deliege <lud@odoo.com>, 2017
 # Fabien Pinckaers <fp@openerp.com>, 2017
@@ -18,13 +18,14 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -76,7 +77,7 @@ msgstr "Attacher des documents Google à n'importe quel enregistrement"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Automate inter-company transactions"
-msgstr ""
+msgstr "Automatiser les opérations inter-entreprises"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -115,7 +116,7 @@ msgstr "Pads collaboratifs"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Common Contact Book"
-msgstr ""
+msgstr "Carnet de contacts commun"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -133,6 +134,9 @@ msgid ""
 "Configure company rules to automatically create SO/PO when one of your "
 "company sells/buys to another of your company."
 msgstr ""
+"Configurez les règles de l'entreprise pour créer automatiquement des "
+"commandes client/fournisseur lorsque l'une de vos entreprises vend/achète "
+"auprès d'une autre de vos entreprises."
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -221,13 +225,13 @@ msgstr "Intégrations"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Inter-Company Transactions"
-msgstr ""
+msgstr "Transactions inter-entreprises"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_auth_ldap
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "LDAP Authentication"
-msgstr ""
+msgstr "Authentification LDAP"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_module_inter_company_rules
@@ -257,7 +261,7 @@ msgstr "Multi-société"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "OAuth Authentication"
-msgstr ""
+msgstr "Authentification OAuth"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings_paperformat_id
diff --git a/addons/base_sparse_field/i18n/fr.po b/addons/base_sparse_field/i18n/fr.po
index be839be0461..c49b3191a4e 100644
--- a/addons/base_sparse_field/i18n/fr.po
+++ b/addons/base_sparse_field/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Symons <xsy@openerp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Xavier Belmere <Info@cartmeleon.com>, 2017
 # Olivier Dony <odo@odoo.com>, 2017
@@ -13,13 +13,14 @@
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
 # lucasdeliege <deliegelucas@gmail.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -150,4 +151,4 @@ msgstr "Deux"
 #. module: base_sparse_field
 #: model:ir.model,name:base_sparse_field.model_sparse_fields_test
 msgid "sparse_fields.test"
-msgstr ""
+msgstr "sparse_fields.test"
diff --git a/addons/base_sparse_field/i18n/zh_CN.po b/addons/base_sparse_field/i18n/zh_CN.po
index 51d84f9a020..e9f6dfe82ee 100644
--- a/addons/base_sparse_field/i18n/zh_CN.po
+++ b/addons/base_sparse_field/i18n/zh_CN.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Talway <9010446@qq.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # liAnGjiA <liangjia@qq.com>, 2017
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # xiaobin wu <bd5dml@gmail.com>, 2017
 # 菜小蛇 <lttlsnk@gmail.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -106,7 +107,7 @@ msgstr "最后更新时间"
 #. module: base_sparse_field
 #: selection:sparse_fields.test,selection:0
 msgid "One"
-msgstr ""
+msgstr "一个"
 
 #. module: base_sparse_field
 #: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_partner
@@ -138,9 +139,9 @@ msgstr "用于分散字段`%s` 序列化字段`%s`未找到!"
 #. module: base_sparse_field
 #: selection:sparse_fields.test,selection:0
 msgid "Two"
-msgstr ""
+msgstr "两个"
 
 #. module: base_sparse_field
 #: model:ir.model,name:base_sparse_field.model_sparse_fields_test
 msgid "sparse_fields.test"
-msgstr ""
+msgstr "sparse_fields.test"
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 72bc6782e4b..6dd0ad4b9be 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -3,17 +3,18 @@
 # * base_vat
 # 
 # Translators:
+# Martin Trigaux, 2016
+# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
+# Florian Hatat, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Eloïse Stilmant <est@odoo.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Florian Hatat <mininet@wanadoo.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -37,6 +38,8 @@ msgid ""
 "If this checkbox is ticked, you will not be able to save a contact if its "
 "VAT number cannot be verified by the European VIES service."
 msgstr ""
+"Si cette case est cochée, vous ne pourrez pas enregistrer un contact si son "
+"numéro de TVA ne peut pas être vérifié par le service européen VIES."
 
 #. module: base_vat
 #: code:addons/base_vat/models/res_partner.py:134
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index b625797471c..fda17e33cca 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * base_vat
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -35,7 +36,7 @@ msgstr "联系人"
 msgid ""
 "If this checkbox is ticked, you will not be able to save a contact if its "
 "VAT number cannot be verified by the European VIES service."
-msgstr ""
+msgstr "如果勾选此复选框，则在欧洲 VIES 服务无法验证合同的增值税号码时，您将无法保存该合同。"
 
 #. module: base_vat
 #: code:addons/base_vat/models/res_partner.py:134
@@ -65,12 +66,12 @@ msgstr "增值税"
 #: model:ir.model.fields,field_description:base_vat.field_res_company_vat_check_vies
 #: model:ir.model.fields,field_description:base_vat.field_res_config_settings_vat_check_vies
 msgid "Verify VAT Numbers"
-msgstr ""
+msgstr "验证增值税号码"
 
 #. module: base_vat
 #: model:ir.ui.view,arch_db:base_vat.res_config_settings_view_form
 msgid "Verify VAT numbers using the European VIES service"
-msgstr ""
+msgstr "使用欧洲 VIES 服务验证增值税号码"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_config_settings
diff --git a/addons/base_vat_autocomplete/models/res_partner.py b/addons/base_vat_autocomplete/models/res_partner.py
index 41b40ec9c1d..93d74c497f8 100644
--- a/addons/base_vat_autocomplete/models/res_partner.py
+++ b/addons/base_vat_autocomplete/models/res_partner.py
@@ -30,16 +30,23 @@ class ResPartner(models.Model):
                     city = lines.pop()
                     return (cp, city)
             else:
-                result = re.match('((?:L-|AT-)?[0-9\-]+) (.+)', lines[-1])
+                result = re.match('((?:L-|AT-)?[0-9\-]+[A-Z]{,2}) (.+)', lines[-1])
                 if result:
                     lines.pop()
                     return (result.group(1), result.group(2))
             return False
 
+        def _set_address_field(partner, field, value):
+            partner[field] = value
+            non_set_address_fields.remove(field)
+
         if stdnum_vat is None:
             return {}
 
         for partner in self:
+            # If a field is non set in this algorithm
+            # wipe it anyway
+            non_set_address_fields = set(['street', 'street2', 'city', 'zip', 'state_id', 'country_id'])
             if not partner.vat:
                 return {}
             if len(partner.vat) > 5 and partner.vat[:2].lower() in stdnum_vat.country_codes:
@@ -68,14 +75,20 @@ class ResPartner(models.Model):
                     lines = [x.strip() for x in lines[0].split(',') if x]
                 if len(lines) == 1:
                     lines = [x.strip() for x in lines[0].split('   ') if x]
-                partner.street = lines.pop(0)
+
+                _set_address_field(partner, 'street', lines.pop(0))
+
                 if len(lines) > 0:
                     res = _check_city(lines, result['countryCode'])
                     if res:
-                        partner.zip = res[0]
-                        partner.city = res[1]
+                        _set_address_field(partner, 'zip', res[0])
+                        _set_address_field(partner, 'city', res[1])
                 if len(lines) > 0:
-                    partner.street2 = lines.pop(0)
+                    _set_address_field(partner, 'street2', lines.pop(0))
 
                 country = self.env['res.country'].search([('code', '=', result['countryCode'])], limit=1)
-                partner.country_id = country and country.id or False
+                _set_address_field(partner, 'country_id', country and country.id or False)
+
+                for field in non_set_address_fields:
+                    if partner[field]:
+                        partner[field] = False
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index 37de8251d8a..402d99378fc 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Gafic SLP Albert Cabedo (GAFIC, SLP) <albertgafic@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -61,7 +62,7 @@ msgstr "Añadir a mi tablero"
 #: code:addons/board/static/src/js/dashboard.js:335
 #, python-format
 msgid "Are you sure you want to remove this item?"
-msgstr ""
+msgstr "¿Está seguro de querer eliminar este producto?"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index e4cc8b5d110..16846f56dbc 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -4,17 +4,18 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Maxime Solinas <msolinas@t2o.ca>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -60,7 +61,7 @@ msgstr "Ajouter à mon tableau de bord"
 #: code:addons/board/static/src/js/dashboard.js:335
 #, python-format
 msgid "Are you sure you want to remove this item?"
-msgstr ""
+msgstr "Voulez-vous vraiment supprimer cet article ?"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
diff --git a/addons/bus/static/src/js/services/bus_service.js b/addons/bus/static/src/js/services/bus_service.js
index 78be7a9740a..c6e9517acc6 100644
--- a/addons/bus/static/src/js/services/bus_service.js
+++ b/addons/bus/static/src/js/services/bus_service.js
@@ -4,6 +4,7 @@ odoo.define('bus.BusService', function (require) {
 var bus = require('bus.bus').bus;
 
 var AbstractService = require('web.AbstractService');
+var core = require('web.core');
 
 var BusService =  AbstractService.extend({
     name: 'bus_service',
@@ -23,7 +24,7 @@ var BusService =  AbstractService.extend({
     /**
      * Get the bus
      *
-     * @return {web.Bus}
+     * @return {web.Bus} the longpoll bus
      */
     getBus: function () {
         return this.bus;
@@ -91,6 +92,8 @@ var BusService =  AbstractService.extend({
 
 });
 
+core.serviceRegistry.add('bus_service', BusService);
+
 return BusService;
 
 });
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index b7f2a7cfe3d..f13382c3979 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:12+0000\n"
-"PO-Revision-Date: 2017-11-30 13:12+0000\n"
+"POT-Creation-Date: 2018-02-07 10:30+0000\n"
+"PO-Revision-Date: 2018-02-07 10:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -273,11 +273,6 @@ msgid "\n"
 msgstr ""
 
 #. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
-msgid "# Meetings Highlight"
-msgstr ""
-
-#. module: calendar
 #: model:mail.template,subject:calendar.calendar_template_meeting_reminder
 msgid "${object.event_id.name} - Reminder"
 msgstr ""
@@ -806,6 +801,11 @@ msgid "Invite wizard"
 msgstr ""
 
 #. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
+msgid "Is the Event Highlighted"
+msgstr ""
+
+#. module: calendar
 #: selection:calendar.event,byday:0
 msgid "Last"
 msgstr ""
diff --git a/addons/calendar/i18n/fr.po b/addons/calendar/i18n/fr.po
index 1b728afcfc1..8f5e45bb811 100644
--- a/addons/calendar/i18n/fr.po
+++ b/addons/calendar/i18n/fr.po
@@ -509,7 +509,7 @@ msgstr ""
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
 msgid "# Meetings Highlight"
-msgstr ""
+msgstr "Points importants de la réunion #"
 
 #. module: calendar
 #: model:mail.template,subject:calendar.calendar_template_meeting_reminder
@@ -557,37 +557,37 @@ msgstr "%s a refusé l'invitation"
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_5
 msgid "1 Day(s)"
-msgstr ""
+msgstr "1 jour"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_3
 msgid "1 Hour(s)"
-msgstr ""
+msgstr "1 heure"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_1
 msgid "15 Minute(s)"
-msgstr ""
+msgstr "15 minute(s)"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_4
 msgid "2 Hour(s)"
-msgstr ""
+msgstr "2 heures"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_mail_1
 msgid "3 Hour(s), by e-mail"
-msgstr ""
+msgstr "3 heures, par e-mail"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_2
 msgid "30 Minute(s)"
-msgstr ""
+msgstr "30 minutes"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_mail_2
 msgid "6 Hour(s), by e-mail"
-msgstr ""
+msgstr "6 heures, par e-mail"
 
 #. module: calendar
 #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -641,7 +641,7 @@ msgstr "Toute la journée , %s"
 #. module: calendar
 #: sql_constraint:calendar.contacts:0
 msgid "An user cannot have twice the same contact."
-msgstr ""
+msgstr "Le même contact ne peut pas figurer deux fois chez un utilisateur."
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_attendee
@@ -706,14 +706,14 @@ msgstr "Invitation calendrier"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_mail_activity_calendar_event_id
 msgid "Calendar Meeting"
-msgstr ""
+msgstr "Calendrier de réunion"
 
 #. module: calendar
 #: model:ir.actions.server,name:calendar.ir_cron_scheduler_alarm_ir_actions_server
 #: model:ir.cron,cron_name:calendar.ir_cron_scheduler_alarm
 #: model:ir.cron,name:calendar.ir_cron_scheduler_alarm
 msgid "Calendar: Event Reminder"
-msgstr ""
+msgstr "Calendrier : rappel pour un événement"
 
 #. module: calendar
 #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -840,7 +840,7 @@ msgstr "Modèle de document"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_res_model
 msgid "Document Model Name"
-msgstr ""
+msgstr "Nom de modèle de document"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_duration
@@ -935,7 +935,7 @@ msgstr "Tout le monde"
 #: code:addons/calendar/models/mail_activity.py:38
 #, python-format
 msgid "Feedback: "
-msgstr ""
+msgstr "Commentaires :"
 
 #. module: calendar
 #: selection:calendar.event,byday:0
@@ -1276,7 +1276,7 @@ msgstr "Confidentialité"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_rrule_type
 msgid "Recurrence"
-msgstr ""
+msgstr "Récurrence"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_end_type
@@ -1311,7 +1311,7 @@ msgstr "Règle de récurrence"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_alarm_duration
 msgid "Remind Before"
-msgstr ""
+msgstr "Rappeler avant"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_alarm_ids
@@ -1353,7 +1353,7 @@ msgstr "Responsable"
 #. module: calendar
 #: selection:calendar.alarm,type:0
 msgid "SMS Text Message"
-msgstr ""
+msgstr "Message texte SMS"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_sa
@@ -1368,7 +1368,7 @@ msgstr "Samedi"
 #. module: calendar
 #: model:ir.ui.view,arch_db:calendar.mail_activity_view_form_popup
 msgid "Schedule a meeting"
-msgstr ""
+msgstr "Planifier une réunion"
 
 #. module: calendar
 #: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
@@ -1492,6 +1492,8 @@ msgid ""
 "The activity is linked to a meeting. Deleting it will remove the meeting as "
 "well. Do you want to proceed ?"
 msgstr ""
+"L'activité est associée à une réunion. Si vous la supprimez, cela supprimera"
+" également la réunion. Voulez-vous continuer ?"
 
 #. module: calendar
 #: model:ir.actions.act_window,help:calendar.action_calendar_event
@@ -1500,6 +1502,9 @@ msgid ""
 "            other applications such as the employee leaves or the business\n"
 "            opportunities."
 msgstr ""
+"Le calendrier est partagé entre les employés et intégré complètement à\n"
+" d'autres applications comme celles des congés ou des opportunités\n"
+" d'affaires."
 
 #. module: calendar
 #: selection:calendar.event,byday:0
diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index cb0b6db40dc..bae8cb404af 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -824,7 +824,7 @@ class Meeting(models.Model):
     attendee_ids = fields.One2many('calendar.attendee', 'event_id', 'Participant', ondelete='cascade')
     partner_ids = fields.Many2many('res.partner', 'calendar_event_res_partner_rel', string='Attendees', states={'done': [('readonly', True)]}, default=_default_partners)
     alarm_ids = fields.Many2many('calendar.alarm', 'calendar_alarm_calendar_event_rel', string='Reminders', ondelete="restrict", copy=False)
-    is_highlighted = fields.Boolean(compute='_compute_is_highlighted', string='# Meetings Highlight')
+    is_highlighted = fields.Boolean(compute='_compute_is_highlighted', string='Is the Event Highlighted')
 
     @api.multi
     def _compute_attendee(self):
@@ -1479,7 +1479,7 @@ class Meeting(models.Model):
                     partners_to_notify = meeting.partner_ids.ids
                     event_attendees_changes = attendees_create and real_ids and attendees_create[real_ids[0]]
                     if event_attendees_changes:
-                        partners_to_notify.append(event_attendees_changes['removed_partners'].ids)
+                        partners_to_notify.extend(event_attendees_changes['removed_partners'].ids)
                     self.env['calendar.alarm_manager'].notify_next_alarm(partners_to_notify)
 
             if (values.get('start_date') or values.get('start_datetime') or
diff --git a/addons/calendar_sms/i18n/fr.po b/addons/calendar_sms/i18n/fr.po
index 9c4ab713898..ada390451c8 100644
--- a/addons/calendar_sms/i18n/fr.po
+++ b/addons/calendar_sms/i18n/fr.po
@@ -3,16 +3,17 @@
 # * calendar_sms
 # 
 # Translators:
-# Richard Mathot <rim@odoo.com>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Xavier Belmere <Info@cartmeleon.com>, 2017
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18+e\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 11:33+0000\n"
 "PO-Revision-Date: 2017-09-20 11:33+0000\n"
-"Last-Translator: Xavier Belmere <Info@cartmeleon.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -34,18 +35,18 @@ msgstr "Alarme de l'événement"
 #: code:addons/calendar_sms/models/calendar.py:23
 #, python-format
 msgid "Event reminder: %s on %s."
-msgstr ""
+msgstr "Rappel d'événement : %s le %s."
 
 #. module: calendar_sms
 #: code:addons/calendar_sms/models/calendar.py:24
 #, python-format
 msgid "SMS text message reminder sent !"
-msgstr ""
+msgstr "Rappel envoyé par message texte SMS !"
 
 #. module: calendar_sms
 #: model:ir.actions.act_window,name:calendar_sms.sms_message_send_action_mutli
 msgid "Send SMS to attendees"
-msgstr ""
+msgstr "Envoyer un SMS aux participants"
 
 #. module: calendar_sms
 #: model:ir.model,name:calendar_sms.model_calendar_alarm_manager
diff --git a/addons/calendar_sms/i18n/zh_CN.po b/addons/calendar_sms/i18n/zh_CN.po
index 7eab0b391fb..07f5f79040c 100644
--- a/addons/calendar_sms/i18n/zh_CN.po
+++ b/addons/calendar_sms/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * calendar_sms
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18+e\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 11:33+0000\n"
 "PO-Revision-Date: 2017-09-20 11:33+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -32,18 +33,18 @@ msgstr "活动警报"
 #: code:addons/calendar_sms/models/calendar.py:23
 #, python-format
 msgid "Event reminder: %s on %s."
-msgstr ""
+msgstr "事件提醒：于 %s 进行 %s。"
 
 #. module: calendar_sms
 #: code:addons/calendar_sms/models/calendar.py:24
 #, python-format
 msgid "SMS text message reminder sent !"
-msgstr ""
+msgstr "已发送 SMS 短信提醒！"
 
 #. module: calendar_sms
 #: model:ir.actions.act_window,name:calendar_sms.sms_message_send_action_mutli
 msgid "Send SMS to attendees"
-msgstr ""
+msgstr "向参与者发送 SMS"
 
 #. module: calendar_sms
 #: model:ir.model,name:calendar_sms.model_calendar_alarm_manager
diff --git a/addons/contacts/i18n/fr.po b/addons/contacts/i18n/fr.po
index 6f7913e0667..46199c5a563 100644
--- a/addons/contacts/i18n/fr.po
+++ b/addons/contacts/i18n/fr.po
@@ -3,19 +3,20 @@
 # * contacts
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Damien Bouvy <dbo@odoo.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Xavier Symons <xsy@openerp.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -95,4 +96,4 @@ msgstr ""
 #. module: contacts
 #: model:ir.ui.menu,name:contacts.res_partner_industry_menu
 msgid "Sectors of Activity"
-msgstr ""
+msgstr "Secteurs d'activité"
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 0458bdaf959..d56261967e1 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -2130,7 +2130,7 @@ msgstr ""
 #: code:addons/crm/models/crm_team.py:231
 #, python-format
 msgid "Pipeline: Expected Revenue"
-msgstr ""
+msgstr "Pipeline: Erwarteter Umsatz"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:642
@@ -2230,6 +2230,8 @@ msgid ""
 "Reminder: Lead ${object.name} from ${object.partner_id != False and "
 "object.partner_id.name or object.contact_name}"
 msgstr ""
+"Erinnerung: Interessent ${object.name} von ${object.partner_id != False and "
+"object.partner_id.name or object.contact_name}"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.crm_menu_report
@@ -2292,7 +2294,7 @@ msgstr "Verkäufer"
 #: code:addons/crm/static/src/js/tour.js:40
 #, python-format
 msgid "Schedule an activity by clicking here"
-msgstr ""
+msgstr "Hier klicken, um eine Aktivität zu planen"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -2373,7 +2375,7 @@ msgstr "Lead Menü anzeigen"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Show all opportunities for which the next action date is before today"
-msgstr ""
+msgstr "Alle Chancen anzeigen, deren nächstes Aktionsdatum vor heute liegt"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -2381,6 +2383,8 @@ msgid ""
 "Show all opportunities with a deadline for which the next action date is "
 "before today"
 msgstr ""
+"Alle Chancen mit einer Frist anzeigen, deren nächstes Aktionsdatum vor heute"
+" liegt"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -2480,6 +2484,8 @@ msgid ""
 "Stages allow salespersons to easily track how a specific opportunity\n"
 "            is positioned in the sales cycle."
 msgstr ""
+"Stufen ermöglichen dem Verkaufspersonal eine einfache Einordnung einer bestimmten Chance \n"
+"in den Verkaufszyklus."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_state
@@ -2553,6 +2559,8 @@ msgid ""
 "The email address associated with this channel. New emails received will "
 "automatically create new leads assigned to the channel."
 msgstr ""
+"Die E-Mail-Adresse, die mit diesem Kanal verbunden ist. Eingehende E-Mails "
+"erzeugen automatisch neue Interessenten, die dem Kanal zugewiesen sind."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_team_alias_model_id
@@ -2607,7 +2615,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_period_pipeline
 msgid "The time period this channel's dashboard graph will consider."
-msgstr ""
+msgstr "Der Zeitraum, den das Dashboard-Diagramm des Kanals betrachtet."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
@@ -2651,7 +2659,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_opportunity_report_action_lead
 msgid "This report analyses the source of your leads."
-msgstr ""
+msgstr "Dieser Bericht analysiert die Herkunft Ihrer Interessenten."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage_fold
@@ -2734,13 +2742,13 @@ msgstr "Nicht zugewiesen"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Unassigned Lead"
-msgstr ""
+msgstr "Nicht zugewiesener Interessent"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_unassigned_leads_count
 #: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Nicht zugewiesene Interessenten"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
@@ -2758,7 +2766,7 @@ msgstr "Aktualisierungsdatum"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Use an External Email Server"
-msgstr ""
+msgstr "Einen externen E-Mail-Sever verwenden"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner.mass,action:0
@@ -2833,7 +2841,7 @@ msgstr "USt."
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Validate and normalize phone numbers."
-msgstr ""
+msgstr "Validieren und vereinheitlichen Sie Telefonnummern."
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.opportunity.report,priority:0
@@ -2843,7 +2851,7 @@ msgstr "Sehr hoch"
 #. module: crm
 #: model:crm.lost.reason,name:crm.lost_reason_2
 msgid "We don't have people/skills"
-msgstr ""
+msgstr "Wir haben kein Personal"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_website
@@ -2853,7 +2861,7 @@ msgstr "Website"
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_website
 msgid "Website of the contact"
-msgstr ""
+msgstr "Webseite des Kontakts"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -2862,6 +2870,10 @@ msgid ""
 "you with a list of matching contacts or companies.When selecting one item, "
 "the partner name, logo and website get automatically set."
 msgstr ""
+"Wenn Sie Ihr Adressbuch veröffentlichen, vertraut Odoo auf Clearbits API, um"
+" Ihnen eine Liste mit passenden Kontakten oder Unternehmen zur Verfügung zu "
+"stellen. Wenn Sie ein Element auswählen, werden der Name des Partners, das "
+"Logo und die Webseite automatisch festgelegt."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_team_id
@@ -2869,21 +2881,23 @@ msgid ""
 "When sending mails, the default email address is taken from the sales "
 "channel."
 msgstr ""
+"Für den E-Mail-Versand wird die Standard-E-Mail-Adresse des Vertriebskanals "
+"verwendet."
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Month"
-msgstr ""
+msgstr "Innerhalb eines Monats"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Week"
-msgstr ""
+msgstr "Innerhalb eines Woche"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Year"
-msgstr ""
+msgstr "Innerhalb eines Jahres"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_wizard_id
@@ -2921,7 +2935,7 @@ msgstr "Abschlüsse in Chancen Zielvorgabe"
 #: code:addons/crm/models/crm_lead.py:394
 #, python-format
 msgid "Yeah! Deal of the last 7 days for the team."
-msgstr ""
+msgstr "Ja! Deal der letzten 7 Tage für das Team."
 
 #. module: crm
 #: code:addons/crm/wizard/base_partner_merge.py:269
@@ -2941,12 +2955,14 @@ msgstr "Sie sollten einen Filter für Ihre Selektion festlegen"
 #, python-format
 msgid "You just beat your personal record for the past 30 days."
 msgstr ""
+"Sie haben soeben Ihren persönlichen Rekord der letzten 30 Tage übertroffen."
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:398
 #, python-format
 msgid "You just beat your personal record for the past 7 days."
 msgstr ""
+"Sie haben soeben Ihren persönlichen Rekord der letzten 7 Tage übertroffen."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
@@ -2976,11 +2992,14 @@ msgid ""
 "                    opportunities, convert them into quotations, attach related\n"
 "                    documents, track all discussions, and much more."
 msgstr ""
+"Sie können Meetings und Telefonate zu Ihren Chancen \n"
+"planen, diese in Angebote umwandeln, sämtliche Dateianhänge ergänzen,\n"
+"die gesamte Kommunikation zurückverfolgen und vieles mehr."
 
 #. module: crm
 #: model:mail.template,subject:crm.mail_template_data_module_install_crm
 msgid "Your Odoo CRM application is running smoothly."
-msgstr ""
+msgstr "Ihre Odoo CRM-Anwendung läuft reibungslos."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
@@ -3006,7 +3025,7 @@ msgstr "base.partner.merge.line"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
 msgid "e.g. Customer Deal"
-msgstr ""
+msgstr "z. B. Kundenabschluss"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 7447d815a48..0c76e12ede0 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -22,7 +22,7 @@
 # Tony Galmiche <tony.galmiche@infosaone.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # missjuliette333 <missjuliette333@hotmail.fr>, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
@@ -303,7 +303,7 @@ msgstr "Objectif des activités terminées"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Activities Todo"
-msgstr ""
+msgstr "Activités à faire"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_kanban_state
@@ -458,7 +458,7 @@ msgstr "Moyenne de probabilité"
 #: code:addons/crm/models/crm_lead.py:392
 #, python-format
 msgid "Boom! Team record for the past 30 days."
-msgstr ""
+msgstr "Quel exploit ! Record de l'équipe au cours des 30 derniers jours."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_message_bounce
@@ -500,7 +500,7 @@ msgstr "Annuler"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_team_act_tree
 msgid "Cases by Sales Channel"
-msgstr ""
+msgstr "Cas par canal de vente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_tag
@@ -531,6 +531,7 @@ msgstr ""
 #: model:ir.model.fields,help:crm.field_crm_team_use_opportunities
 msgid "Check this box to manage a presales process with opportunities."
 msgstr ""
+"Cochez cette case pour gérer un processus de prévente avec des opportunités."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_city
@@ -745,7 +746,7 @@ msgstr "Créer"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
 msgid "Create & Edit"
-msgstr ""
+msgstr "Créer et modifier"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_create_date
@@ -869,7 +870,7 @@ msgstr "Client"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_module_web_clearbit
 msgid "Customer Autocomplete"
-msgstr ""
+msgstr "Remplissage automatique par le client"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1137
@@ -896,6 +897,8 @@ msgid ""
 "Dashboard graph content cannot be Pipeline if the sales channel doesn't use "
 "it. (Pipeline is unchecked.)"
 msgstr ""
+"Le contenu du graphique Tableau de bord ne peut pas être Pipeline si le "
+"canal de ventes ne l'utilise pas. (Pipeline est décoché.)"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_activity_report_date
@@ -1060,17 +1063,17 @@ msgstr "Date de clôture prévue."
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Day"
-msgstr ""
+msgstr "Journée de clôture prévu"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Month"
-msgstr ""
+msgstr "Mois de clôture prévu"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Week"
-msgstr ""
+msgstr "Semaine de clôture prévue"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
@@ -1090,7 +1093,7 @@ msgstr "Revenus estimés"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_period_pipeline
 msgid "Expected to Close"
-msgstr ""
+msgstr "Prévu pour fermeture"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -1157,12 +1160,12 @@ msgstr "Activités futures"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 msgid "Future Activities (7 days)"
-msgstr ""
+msgstr "Activités futures (7 jours)"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 msgid "Future Activities (All)"
-msgstr ""
+msgstr "Activités futures (toutes)"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -1170,6 +1173,8 @@ msgid ""
 "Generate unassigned leads from incoming emails. Leads coming from\n"
 "                                    that email will be assigned manually."
 msgstr ""
+"Générez des pistes non attribuées à partir d'e-mails entrants. Les pistes provenant de\n"
+" ces e-mails seront attribuées manuellement."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_lost
@@ -1185,7 +1190,7 @@ msgstr "Copie globale"
 #: code:addons/crm/models/crm_lead.py:390
 #, python-format
 msgid "Go, go, go! Congrats for your first deal."
-msgstr ""
+msgstr "Continuez ! Félicitations pour votre premier contrat."
 
 #. module: crm
 #. openerp-web
@@ -1541,7 +1546,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Look up company information (name, logo, etc.)"
-msgstr ""
+msgstr "Rechercher des informations sur l'entreprise (nom, logo, etc.)"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1097
@@ -1577,12 +1582,12 @@ msgstr "Faible"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_generate_lead_from_alias
 msgid "Manual Assignation of Emails"
-msgstr ""
+msgstr "Attribution manuelle d'e-mails"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Manually Assignation of Incoming Emails"
-msgstr ""
+msgstr "Attribution manuelle d'e-mails entrants"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -2091,7 +2096,7 @@ msgstr "Téléphone"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_module_crm_phone_validation
 msgid "Phone Validation"
-msgstr ""
+msgstr "Validation du téléphone"
 
 #. module: crm
 #: code:addons/crm/models/crm_team.py:165
@@ -2137,12 +2142,17 @@ msgid ""
 "mainly used by the sales manager in order to periodically review the pipeline\n"
 "with the the sales channel."
 msgstr ""
+"L'analyse des pipelines vous donne un accès instantané à\n"
+"vos opportunités avec des informations, telles que le revenu attendu, les coûts prévus,\n"
+"les dépassements de délais ou le nombre d'interactions par opportunité. Ce rapport est\n"
+"principalement utilisé par le directeur des ventes afin d'effectuer la révision des pipelines\n"
+"avec le canal de ventes."
 
 #. module: crm
 #: code:addons/crm/models/crm_team.py:231
 #, python-format
 msgid "Pipeline: Expected Revenue"
-msgstr ""
+msgstr "Pipeline : revenu attendu"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:642
@@ -2635,6 +2645,7 @@ msgstr ""
 #: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_period_pipeline
 msgid "The time period this channel's dashboard graph will consider."
 msgstr ""
+"La période que ce graphique de tableau de bord de canal prendra en compte."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
@@ -2863,7 +2874,7 @@ msgstr "TVA"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Validate and normalize phone numbers."
-msgstr ""
+msgstr "Validez et normalisez les numéros de téléphone."
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.opportunity.report,priority:0
@@ -2873,7 +2884,7 @@ msgstr "Très haut"
 #. module: crm
 #: model:crm.lost.reason,name:crm.lost_reason_2
 msgid "We don't have people/skills"
-msgstr ""
+msgstr "Nous ne disposons pas de personnes/compétences"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_website
@@ -2892,6 +2903,10 @@ msgid ""
 "you with a list of matching contacts or companies.When selecting one item, "
 "the partner name, logo and website get automatically set."
 msgstr ""
+"Lorsque vous remplissez votre carnet d'adresses, Odoo utilise l'API de "
+"Clearbit pour vous fournir une liste d'entreprises ou de contacts "
+"correspondants. Lorsque vous sélectionnez un article, le nom, le logo et le "
+"site Web du partenaire sont automatiquement définis."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_team_id
@@ -2899,21 +2914,23 @@ msgid ""
 "When sending mails, the default email address is taken from the sales "
 "channel."
 msgstr ""
+"Lors de l'envoi d'e-mails, l'adresse e-mail par défaut est celle du canal de"
+" ventes."
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Month"
-msgstr ""
+msgstr "En un mois"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Week"
-msgstr ""
+msgstr "En une semaine"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Year"
-msgstr ""
+msgstr "En un an"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_wizard_id
@@ -2951,7 +2968,7 @@ msgstr "Gagné dans les opportunités cibles"
 #: code:addons/crm/models/crm_lead.py:394
 #, python-format
 msgid "Yeah! Deal of the last 7 days for the team."
-msgstr ""
+msgstr "Super ! Contrats de l'équipe au cours des 7 derniers jours."
 
 #. module: crm
 #: code:addons/crm/wizard/base_partner_merge.py:269
@@ -2970,12 +2987,14 @@ msgstr "Vous devez spécifier un filtre a cette sélection"
 #, python-format
 msgid "You just beat your personal record for the past 30 days."
 msgstr ""
+"Vous venez de battre votre record personnel au cours des 30 derniers jours."
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:398
 #, python-format
 msgid "You just beat your personal record for the past 7 days."
 msgstr ""
+"Vous venez de battre votre record personnel au cours des 7 derniers jours."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
@@ -3007,11 +3026,14 @@ msgid ""
 "                    opportunities, convert them into quotations, attach related\n"
 "                    documents, track all discussions, and much more."
 msgstr ""
+"Vous serez en mesure de planifier des réunions et des appels provenant\n"
+" d'opportunités, de les convertir en devis, de joindre des documents\n"
+" connexes, de suivre toutes les discussions et bien plus encore."
 
 #. module: crm
 #: model:mail.template,subject:crm.mail_template_data_module_install_crm
 msgid "Your Odoo CRM application is running smoothly."
-msgstr ""
+msgstr "Votre application Odoo CRM fonctionne correctement."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
@@ -3037,7 +3059,7 @@ msgstr "base.partner.merge.line"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
 msgid "e.g. Customer Deal"
-msgstr ""
+msgstr "p. ex. contrat client"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 236a087def4..582063ae90a 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -62,7 +62,7 @@
                             <div class="o_setting_right_pane">
                                 <label for="module_crm_phone_validation"/>
                                 <div class="text-muted" id="module_crm_phone_validation">
-                                    Validate and normalize phone numbers
+                                    Formats phone numbers
                                 </div>
                             </div>
                         </div>
diff --git a/addons/crm_livechat/i18n/zh_CN.po b/addons/crm_livechat/i18n/zh_CN.po
index 8f5cd244a91..e4c1cb6f828 100644
--- a/addons/crm_livechat/i18n/zh_CN.po
+++ b/addons/crm_livechat/i18n/zh_CN.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -22,7 +23,7 @@ msgstr ""
 #: code:addons/crm_livechat/models/mail_channel.py:11
 #, python-format
 msgid "Create a new lead (/lead lead title)"
-msgstr ""
+msgstr "创建新线索（/主要负责人头衔）"
 
 #. module: crm_livechat
 #: code:addons/crm_livechat/models/mail_channel.py:36
diff --git a/addons/crm_phone_validation/i18n/fr.po b/addons/crm_phone_validation/i18n/fr.po
index 6291fc4da56..48a3242fe93 100644
--- a/addons/crm_phone_validation/i18n/fr.po
+++ b/addons/crm_phone_validation/i18n/fr.po
@@ -3,16 +3,17 @@
 # * crm_phone_validation
 # 
 # Translators:
+# Martin Trigaux, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -27,6 +28,10 @@ msgid ""
 "coming from the company's country are nationaly formatted. International "
 "numbers are always using international format."
 msgstr ""
+"Utilisez toujours le format international pour le codage des numéros de "
+"téléphone. Sinon, les numéros provenant du pays de l'entreprise utilisera "
+"toujours le format national. Les numéros internationaux utilisent toujours "
+"le format international."
 
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_res_partner
@@ -41,7 +46,7 @@ msgstr "Piste/opportunité"
 #. module: crm_phone_validation
 #: model:ir.model.fields,field_description:crm_phone_validation.field_res_config_settings_crm_phone_valid_method
 msgid "Local Numbers"
-msgstr ""
+msgstr "Numéros locaux"
 
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_res_config_settings
diff --git a/addons/crm_phone_validation/i18n/zh_CN.po b/addons/crm_phone_validation/i18n/zh_CN.po
index 905ba45bcf8..9eb8bbc162b 100644
--- a/addons/crm_phone_validation/i18n/zh_CN.po
+++ b/addons/crm_phone_validation/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * crm_phone_validation
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,7 +27,7 @@ msgid ""
 "Always encode phone numbers using international format. Otherwise numbers "
 "coming from the company's country are nationaly formatted. International "
 "numbers are always using international format."
-msgstr ""
+msgstr "始终使用国际化格式编码电话号码。否则，来自公司所属国家的号码将在全国范围内格式化。国际号码总是采用国际化格式。"
 
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_res_partner
diff --git a/addons/crm_phone_validation/models/crm_lead.py b/addons/crm_phone_validation/models/crm_lead.py
index a652f1bd5ca..76c1617c5f2 100644
--- a/addons/crm_phone_validation/models/crm_lead.py
+++ b/addons/crm_phone_validation/models/crm_lead.py
@@ -8,13 +8,12 @@ class Lead(models.Model):
     _name = 'crm.lead'
     _inherit = ['crm.lead', 'phone.validation.mixin']
 
-    @api.onchange('phone', 'country_id')
+    @api.onchange('phone', 'country_id', 'company_id')
     def _onchange_phone_validation(self):
         if self.phone:
             self.phone = self.phone_format(self.phone)
 
-    @api.onchange('mobile', 'country_id')
+    @api.onchange('mobile', 'country_id', 'company_id')
     def _onchange_mobile_validation(self):
         if self.mobile:
             self.mobile = self.phone_format(self.mobile)
-
diff --git a/addons/crm_phone_validation/models/res_partner.py b/addons/crm_phone_validation/models/res_partner.py
index 97f5eaf891d..5328fe9e7d8 100644
--- a/addons/crm_phone_validation/models/res_partner.py
+++ b/addons/crm_phone_validation/models/res_partner.py
@@ -8,12 +8,12 @@ class Contact(models.Model):
     _name = 'res.partner'
     _inherit = ['res.partner', 'phone.validation.mixin']
 
-    @api.onchange('phone', 'country_id')
+    @api.onchange('phone', 'country_id', 'company_id')
     def _onchange_phone_validation(self):
         if self.phone:
             self.phone = self.phone_format(self.phone)
 
-    @api.onchange('mobile', 'country_id')
+    @api.onchange('mobile', 'country_id', 'company_id')
     def _onchange_mobile_validation(self):
         if self.mobile:
             self.mobile = self.phone_format(self.mobile)
diff --git a/addons/crm_project/i18n/de.po b/addons/crm_project/i18n/de.po
index 47c2f39b18e..26da97f9964 100644
--- a/addons/crm_project/i18n/de.po
+++ b/addons/crm_project/i18n/de.po
@@ -10,13 +10,14 @@
 # Niki Waibel, 2017
 # Martin Trigaux, 2017
 # e2f <projects@e2f.com>, 2018
+# DE T1 <e2f8846@yahoo.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"Last-Translator: DE T1 <e2f8846@yahoo.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,12 +42,12 @@ msgstr "Abbrechen"
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_view_form
 msgid "Convert to Task"
-msgstr ""
+msgstr "In Aufgabe umwandeln"
 
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 msgid "Create Task"
-msgstr ""
+msgstr "Aufgabe erstellen"
 
 #. module: crm_project
 #: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_create_uid
@@ -96,4 +97,4 @@ msgstr "Projekt"
 #. module: crm_project
 #: model:ir.model,name:crm_project.model_crm_lead_convert2task
 msgid "crm.lead.convert2task"
-msgstr ""
+msgstr "crm.lead.convert2task"
diff --git a/addons/crm_project/i18n/fr.po b/addons/crm_project/i18n/fr.po
index c2f8dcedd9b..ec37e621511 100644
--- a/addons/crm_project/i18n/fr.po
+++ b/addons/crm_project/i18n/fr.po
@@ -39,12 +39,12 @@ msgstr "Annuler"
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_view_form
 msgid "Convert to Task"
-msgstr ""
+msgstr "Convertir en tâche"
 
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 msgid "Create Task"
-msgstr ""
+msgstr "Créer une tâche"
 
 #. module: crm_project
 #: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_create_uid
@@ -94,4 +94,4 @@ msgstr "Projet"
 #. module: crm_project
 #: model:ir.model,name:crm_project.model_crm_lead_convert2task
 msgid "crm.lead.convert2task"
-msgstr ""
+msgstr "crm.lead.convert2task"
diff --git a/addons/crm_project/i18n/zh_CN.po b/addons/crm_project/i18n/zh_CN.po
index 5095b5fc4a3..adfb274333f 100644
--- a/addons/crm_project/i18n/zh_CN.po
+++ b/addons/crm_project/i18n/zh_CN.po
@@ -45,7 +45,7 @@ msgstr "转换为任务"
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
 msgid "Create Task"
-msgstr ""
+msgstr "创建任务"
 
 #. module: crm_project
 #: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task_create_uid
@@ -95,4 +95,4 @@ msgstr "项目"
 #. module: crm_project
 #: model:ir.model,name:crm_project.model_crm_lead_convert2task
 msgid "crm.lead.convert2task"
-msgstr ""
+msgstr "crm.lead.convert2task"
diff --git a/addons/decimal_precision/i18n/zh_CN.po b/addons/decimal_precision/i18n/zh_CN.po
index 84cec3e5706..df59894fea3 100644
--- a/addons/decimal_precision/i18n/zh_CN.po
+++ b/addons/decimal_precision/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * decimal_precision
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -61,12 +62,12 @@ msgstr "浮点数"
 #. module: decimal_precision
 #: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_2
 msgid "Float 2"
-msgstr ""
+msgstr "浮动 2"
 
 #. module: decimal_precision
 #: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_4
 msgid "Float 4"
-msgstr ""
+msgstr "浮动 4"
 
 #. module: decimal_precision
 #: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_id
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 5eed02b564e..775c432bac5 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -4,9 +4,9 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Tony Galmiche <tony.galmiche@infosaone.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
@@ -23,13 +23,14 @@
 # Richard Mathot <rim@odoo.com>, 2016
 # fr trans <e2ftrans1@yahoo.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -720,7 +721,7 @@ msgstr "Colisage"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
 msgid "Physical Package"
-msgstr ""
+msgstr "Paquet physique"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_quant_package
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index da4c841d4a7..e0dc182f6c8 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -34,7 +34,7 @@ msgstr "${(object.name or ‘’).replace(‘/‘,’_’)}"
 #: model:mail.template,subject:delivery.mail_template_data_delivery_confirmation
 msgid ""
 "${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} 交货单 (Ref ${object.name or 'n/a' })"
 
 #. module: delivery
 #: model:mail.template,subject:delivery.mail_template_data_delivery_notification
@@ -239,7 +239,7 @@ msgstr "承运商"
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
 msgid "Check price"
-msgstr ""
+msgstr "检查价格"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -283,7 +283,7 @@ msgstr "创建时间"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_debug_logging
 msgid "Debug logging"
-msgstr ""
+msgstr "调试记录"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -308,7 +308,7 @@ msgstr "交货信息"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_message
 msgid "Delivery Message"
-msgstr ""
+msgstr "发货消息"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
@@ -328,7 +328,7 @@ msgstr "交货方式"
 #. module: delivery
 #: model:ir.model,name:delivery.model_choose_delivery_package
 msgid "Delivery Package Selection Wizard"
-msgstr ""
+msgstr "邮包选择向导"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view
@@ -356,12 +356,12 @@ msgstr "交货产品"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_rating_success
 msgid "Delivery Rating Success"
-msgstr ""
+msgstr "交付评级成功"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
 msgid "Destination Availability"
-msgstr ""
+msgstr "目的地有效性"
 
 #. module: delivery
 #: model:ir.model.fields,help:delivery.field_delivery_carrier_sequence
@@ -400,7 +400,7 @@ msgstr "环境"
 #: code:addons/delivery/models/delivery_grid.py:109
 #, python-format
 msgid "Error: no matching grid."
-msgstr ""
+msgstr "错误：没有匹配的网格。"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
@@ -434,17 +434,17 @@ msgstr "免费运输"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_over
 msgid "Free if order amount is above"
-msgstr ""
+msgstr "如果订货量大则免费"
 
 #. module: delivery
 #: selection:delivery.carrier,integration_level:0
 msgid "Get Rate"
-msgstr ""
+msgstr "获取费率"
 
 #. module: delivery
 #: selection:delivery.carrier,integration_level:0
 msgid "Get Rate and Create Shipment"
-msgstr ""
+msgstr "获取费率并创建装运"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -479,7 +479,7 @@ msgstr "ID"
 msgid ""
 "If the order total amount (shipping excluded) is above or equal to this "
 "value, the customer benefits from a free shipping"
-msgstr ""
+msgstr "如果订单总额（不包括运费）高于或等于此值，客户可享受免费送货服务"
 
 #. module: delivery
 #: code:addons/delivery/models/delivery_carrier.py:125
@@ -489,6 +489,9 @@ msgid ""
 "The shipping is free because the order amount exceeds %.2f.\n"
 "(The actual shipping cost is: %.2f)"
 msgstr ""
+"信息：\n"
+"由于订单金额超过 %.2f，所以免收运费。\n"
+"（实际运输成本为： %.2f）"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
@@ -544,7 +547,7 @@ msgstr "长度必须为正"
 #. module: delivery
 #: model:ir.model.fields,help:delivery.field_delivery_carrier_debug_logging
 msgid "Log requests in order to ease debugging"
-msgstr ""
+msgstr "记录请求以便于调试"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -559,12 +562,12 @@ msgstr "毛利"
 #. module: delivery
 #: sql_constraint:delivery.carrier:0
 msgid "Margin cannot be lower than -100%"
-msgstr ""
+msgstr "毛利不得低于 -100%"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
 msgid "Margin on Rate"
-msgstr ""
+msgstr "利润率"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_product_packaging_max_weight
@@ -608,7 +611,7 @@ msgstr "此订单没有设置承运商"
 #: code:addons/delivery/models/delivery_grid.py:100
 #, python-format
 msgid "No price rule matching this order; delivery cost cannot be computed."
-msgstr ""
+msgstr "没有与此订单匹配的价格规则；运送费用无法计算。"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_number_of_packages
@@ -655,7 +658,7 @@ msgstr "打包作业"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
 msgid "Physical Package"
-msgstr ""
+msgstr "实体封装"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_quant_package
@@ -668,7 +671,7 @@ msgstr "物理包裹"
 msgid ""
 "Please use \"Check price\" in order to compute a shipping price for this "
 "quotation."
-msgstr ""
+msgstr "请使用“查看价格”来计算此报价的运费。"
 
 #. module: delivery
 #: selection:delivery.price.rule,variable:0
@@ -744,7 +747,7 @@ msgstr "保存"
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
 msgid "Send Confirmation Email"
-msgstr ""
+msgstr "发送确认电子邮件"
 
 #. module: delivery
 #: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -765,7 +768,7 @@ msgstr "设置价格"
 #. module: delivery
 #: model:ir.model.fields,help:delivery.field_delivery_carrier_prod_environment
 msgid "Set to True if your credentials are certified for production."
-msgstr ""
+msgstr "如果您的凭证已通过生产认证，请设置为True。"
 
 #. module: delivery
 #: code:addons/delivery/models/stock_picking.py:168
@@ -836,7 +839,7 @@ msgstr "跟踪参考"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_url
 msgid "Tracking URL"
-msgstr ""
+msgstr "跟踪 URL"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
@@ -936,7 +939,7 @@ msgstr ""
 #: code:addons/delivery/models/sale_order.py:71
 #, python-format
 msgid "You can add delivery price only on unconfirmed quotations."
-msgstr ""
+msgstr "您只能在未经确认的报价单上添加交货价格。"
 
 #. module: delivery
 #: code:addons/delivery/models/stock_picking.py:182
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index 548d55cee72..110dc53936a 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -512,7 +512,7 @@ msgstr "<p/><p/><p/><p/><p/>"
 #. module: event
 #: model:mail.template,subject:event.event_reminder
 msgid "${object.event_id.name}: ${object.get_date_range_str()}"
-msgstr ""
+msgstr "am"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_kanban
@@ -626,7 +626,7 @@ msgstr "Teilnehmer"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_auto_confirm
 msgid "Autoconfirm Registrations"
-msgstr ""
+msgstr "Registrierungen automatisch bestätigen"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_auto_confirm
@@ -897,7 +897,7 @@ msgstr "Event"
 #. module: event
 #: model:ir.model,name:event.model_event_mail
 msgid "Event Automated Mailing"
-msgstr ""
+msgstr "Event-automatisiertes Mailing"
 
 #. module: event
 #: model:ir.actions.report,name:event.report_event_event_badge
@@ -982,7 +982,7 @@ msgstr "Veranstaltungstyp"
 #: model:ir.cron,cron_name:event.event_mail_scheduler
 #: model:ir.cron,name:event.event_mail_scheduler
 msgid "Event: Mail Scheduler"
-msgstr ""
+msgstr "Event: Mail-Planer"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -1015,6 +1015,8 @@ msgid ""
 "Events and registrations will automatically be confirmed\n"
 "                                            upon creation, easing the flow for simple events."
 msgstr ""
+"Events und Registrierungen werden automatisch bei der\n"
+"                                            Erstellung bestätigt, wodurch der Zustrom von einfachen Events erleichtert wird."
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_type_auto_confirm
@@ -1184,7 +1186,7 @@ msgstr "Lagerort"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_mail_mail_registration_ids
 msgid "Mail Registration"
-msgstr ""
+msgstr "E-Mail-Registrierung"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_event_mail_ids
@@ -1205,7 +1207,7 @@ msgstr "Mail-Planer"
 #. module: event
 #: model:ir.model,name:event.model_event_type_mail
 msgid "Mail Scheduling on Event Type"
-msgstr ""
+msgstr "E-Mail-Planung für Eventtyp"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_mail_registration_mail_sent
@@ -1220,7 +1222,7 @@ msgstr "Mail zu Veranstaltung versandt"
 #. module: event
 #: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Manage &amp; publish a schedule with tracks"
-msgstr ""
+msgstr "Einen Zeitplan mit Tracks verwalten und veröffentlichen"
 
 #. module: event
 #: model:res.groups,name:event.group_event_manager
@@ -1248,6 +1250,8 @@ msgstr "Maximale Anmeldungen"
 msgid ""
 "Maximum attendees number should be greater than minimum attendees number."
 msgstr ""
+"Die maximale Teilnehmerzahl sollte größer als die Mindestteilnehmerzahl "
+"sein."
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_seats_min
@@ -1305,6 +1309,8 @@ msgid ""
 "    track registrations and participations, automate the confirmation emails,\n"
 "    sell tickets, etc."
 msgstr ""
+"Odoo hilft Ihnen, Ihre Events zu planen und effizient zu organisieren:\n"
+"    Verfolgen Sie Registrierungen und Teilnahmen, automatisieren Sie Bestätigung-E-Mails,\\n verkaufen Sie Tickets, etc."
 
 #. module: event
 #: model:event.type,name:event.event_type_data_online
@@ -1364,7 +1370,7 @@ msgstr "Telefon"
 #. module: event
 #: model:event.type,name:event.event_type_data_physical
 msgid "Physical Event"
-msgstr ""
+msgstr "Physikalisches Event"
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_registration_origin
@@ -1372,6 +1378,8 @@ msgid ""
 "Reference of the document that created the registration, for example a sales"
 " order"
 msgstr ""
+"Referenz des Dokumentes, das die Registrierung erstellt hat, z. B. ein "
+"Verkaufsauftrag"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_form
@@ -1456,7 +1464,7 @@ msgstr "Ausweise scannen, um Anwesenheiten zu bestätigen"
 #. module: event
 #: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Schedule & Tracks"
-msgstr ""
+msgstr "Zeitplan und Tracks"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_mail_scheduled_date
@@ -1476,7 +1484,7 @@ msgstr "Verkaufen Sie Tickets auf Ihrer Website"
 #. module: event
 #: model:ir.ui.view,arch_db:event.res_config_settings_view_form
 msgid "Sell tickets with sales orders"
-msgstr ""
+msgstr "Karten mit Verkaufsaufträgen verkaufen"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_registration_form
@@ -1544,6 +1552,8 @@ msgid ""
 "There are already attendees who attended this event. Please reset it to "
 "draft if you want to cancel this event."
 msgstr ""
+"Es gibt bereits Teilnehmer, die an diesem Event teilgenommen haben. Bitte "
+"setzen Sie es auf Entwurf zurück, wenn Sie dieses Event absagen möchten."
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_mail_template_id
@@ -1627,7 +1637,7 @@ msgstr ""
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_hashtag
 msgid "Use Default Hashtag"
-msgstr ""
+msgstr "Den Standard-Hashtag verwenden"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_timezone
@@ -1664,12 +1674,15 @@ msgstr "Woche(n)"
 #, python-format
 msgid "You must wait the event confirmation before doing this action."
 msgstr ""
+"Bevor Sie diese Aktion durchführen, müssen Sie die Bestätigung des Events "
+"abwarten."
 
 #. module: event
 #: code:addons/event/models/event.py:416
 #, python-format
 msgid "You must wait the event starting day before doing this action."
 msgstr ""
+"Sie müssen den Eventbeginn abwarten, bevor Sie diese Aktion durchführen."
 
 #. module: event
 #: model:mail.template,subject:event.event_registration_mail_template_badge
@@ -1713,7 +1726,7 @@ msgstr "nächste Woche "
 #: code:addons/event/models/event.py:503
 #, python-format
 msgid "on "
-msgstr ""
+msgstr "am"
 
 #. module: event
 #: model:ir.model,name:event.model_res_config_settings
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index dca4aef2770..8f290358fe5 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -23,13 +23,14 @@
 # Florian Hatat, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # e2f <projects@e2f.com>, 2018
+# fr trans <e2ftrans1@yahoo.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2018\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"
@@ -656,6 +657,8 @@ msgid ""
 "Add a navigation menu to your event web pages with schedule, tracks, a track"
 " proposal form, etc."
 msgstr ""
+"Ajoutez un menu de navigation aux pages Web de votre événement avec un "
+"calendrier, des parcours, un formulaire de proposition de parcours, etc."
 
 #. module: event
 #: selection:event.mail,interval_type:0
@@ -680,6 +683,8 @@ msgid ""
 "Are you sure you want to cancel this event? All the linked attendees will be"
 " cancelled as well."
 msgstr ""
+"Voulez-vous vraiment annuler cet événement ? Tous les participants associés "
+"seront également annulés."
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.res_config_settings_view_form
@@ -728,7 +733,7 @@ msgstr "Participants"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_auto_confirm
 msgid "Autoconfirm Registrations"
-msgstr ""
+msgstr "Confirmer automatiquement les inscriptions"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_auto_confirm
@@ -758,7 +763,7 @@ msgstr "Avant du badge"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_badge_innerleft
 msgid "Badge Inner Left"
-msgstr ""
+msgstr "Badge Intérieur gauche"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_badge_innerright
@@ -805,7 +810,7 @@ msgstr "Catégorie"
 #. module: event
 #: model:ir.actions.act_window,help:event.act_event_registration_from_event
 msgid "Click to add a new attendee."
-msgstr ""
+msgstr "Cliquez pour ajouter un nouveau participant."
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -998,7 +1003,7 @@ msgstr "Évènement"
 #. module: event
 #: model:ir.model,name:event.model_event_mail
 msgid "Event Automated Mailing"
-msgstr ""
+msgstr "Publipostage automatisé pour un événement"
 
 #. module: event
 #: model:ir.actions.report,name:event.report_event_event_badge
@@ -1083,7 +1088,7 @@ msgstr "Type d'évènement"
 #: model:ir.cron,cron_name:event.event_mail_scheduler
 #: model:ir.cron,name:event.event_mail_scheduler
 msgid "Event: Mail Scheduler"
-msgstr ""
+msgstr "Événement : planificateur d'e-mail"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view
@@ -1116,6 +1121,8 @@ msgid ""
 "Events and registrations will automatically be confirmed\n"
 "                                            upon creation, easing the flow for simple events."
 msgstr ""
+"Les événements et inscriptions seront automatiquement confirmés\n"
+"                                            lors de leur création, ce qui simplifie le déroulement des événements."
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_type_auto_confirm
@@ -1274,7 +1281,7 @@ msgstr "Limité"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_has_seats_limitation
 msgid "Limited Seats"
-msgstr ""
+msgstr "Places limitées"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_address_id
@@ -1306,7 +1313,7 @@ msgstr "Planificateurs de courriel"
 #. module: event
 #: model:ir.model,name:event.model_event_type_mail
 msgid "Mail Scheduling on Event Type"
-msgstr ""
+msgstr "Planification d'e-mail sur le type d'événement"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_mail_registration_mail_sent
@@ -1341,7 +1348,7 @@ msgstr "Nombre maximum de participants"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_default_registration_max
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Nombre maximal d'inscriptions"
 
 #. module: event
 #: code:addons/event/models/event.py:253
@@ -1349,6 +1356,8 @@ msgstr ""
 msgid ""
 "Maximum attendees number should be greater than minimum attendees number."
 msgstr ""
+"Le nombre maximal de participants doit être supérieur au nombre minimal de "
+"participants."
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_seats_min
@@ -1358,7 +1367,7 @@ msgstr "Minimum de participants"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_default_registration_min
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Nombre minimal d'inscriptions"
 
 #. module: event
 #: selection:event.mail,interval_unit:0
@@ -1419,12 +1428,12 @@ msgstr "En ligne"
 #: model:ir.model.fields,field_description:event.field_event_event_is_online
 #: model:ir.model.fields,field_description:event.field_event_type_is_online
 msgid "Online Event"
-msgstr ""
+msgstr "Événement en ligne"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_sale
 msgid "Online Ticketing"
-msgstr ""
+msgstr "Vente de billets en ligne"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_type_form
@@ -1432,6 +1441,8 @@ msgid ""
 "Online events like webinars do not require a specific location\n"
 "                                            and are hosted online."
 msgstr ""
+"Les événements en ligne comme les séminaires en ligne ne nécessitent pas un lieu spécifique\n"
+"                                            et son hébergés en ligne."
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_type_is_online
@@ -1439,6 +1450,8 @@ msgid ""
 "Online events like webinars do not require a specific location and are "
 "hosted online."
 msgstr ""
+"Les événements en ligne comme les séminaires en ligne ne nécessitent pas un "
+"lieu spécifique et sont hébergés en ligne."
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_organizer_id
@@ -1471,6 +1484,7 @@ msgid ""
 "Reference of the document that created the registration, for example a sales"
 " order"
 msgstr ""
+"Référence du document ayant créé l'inscription, par exemple une commande"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_form
@@ -1524,7 +1538,7 @@ msgstr "Mois d'inscription"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_res_config_settings_module_website_event_questions
 msgid "Registration Survey"
-msgstr ""
+msgstr "Enquête sur l'inscription"
 
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_mail_form
@@ -1643,6 +1657,8 @@ msgid ""
 "There are already attendees who attended this event. Please reset it to "
 "draft if you want to cancel this event."
 msgstr ""
+"Il existe déjà des participants qui ont assisté à cet événement. Pour "
+"annuler ce dernier, réinitialisez-le en mode brouillon."
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_mail_template_id
@@ -1675,7 +1691,7 @@ msgstr "Déclencheur"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_mail_interval_type
 msgid "Trigger "
-msgstr ""
+msgstr "Déclencheur"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_twitter_hashtag
@@ -1724,12 +1740,12 @@ msgstr ""
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_hashtag
 msgid "Use Default Hashtag"
-msgstr ""
+msgstr "Utiliser un hashtag par défaut"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_timezone
 msgid "Use Default Timezone"
-msgstr ""
+msgstr "Utiliser le fuseau horaire par défaut"
 
 #. module: event
 #: model:res.groups,name:event.group_event_user
@@ -1769,6 +1785,8 @@ msgstr ""
 #, python-format
 msgid "You must wait the event starting day before doing this action."
 msgstr ""
+"Vous devez attendre le jour auquel l'événement débute avant d'effectuer "
+"cette action."
 
 #. module: event
 #: model:mail.template,subject:event.event_registration_mail_template_badge
@@ -1812,7 +1830,7 @@ msgstr "semaine prochaine"
 #: code:addons/event/models/event.py:503
 #, python-format
 msgid "on "
-msgstr ""
+msgstr "sur"
 
 #. module: event
 #: model:ir.model,name:event.model_res_config_settings
diff --git a/addons/event_sale/i18n/fr.po b/addons/event_sale/i18n/fr.po
index 402eca5011e..d7f0d321daf 100644
--- a/addons/event_sale/i18n/fr.po
+++ b/addons/event_sale/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
@@ -18,13 +18,14 @@
 # Fred Gilson <fgi@odoo.com>, 2017
 # Jeanjean Noname <monsieur.spock@gmail.com>, 2017
 # Omar Mezga <omar.mezgrane@aldaway.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Omar Mezga <omar.mezgrane@aldaway.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -222,7 +223,7 @@ msgstr "A expiré"
 #: model:ir.model.fields,field_description:event_sale.field_product_template_event_ok
 #: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ok
 msgid "Is an Event Ticket"
-msgstr ""
+msgstr "Est un billet d'événement"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket___last_update
@@ -395,12 +396,12 @@ msgstr "Ligne de bons de commande"
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_seats_used
 msgid "Seats Used"
-msgstr ""
+msgstr "Sièges occupés"
 
 #. module: event_sale
 #: model:event.type,name:event_sale.event_type_data_sale
 msgid "Sell Online"
-msgstr ""
+msgstr "Vendez en ligne"
 
 #. module: event_sale
 #: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
@@ -410,7 +411,7 @@ msgstr "Ignorer"
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_registration_sale_order_id
 msgid "Source Sales Order"
-msgstr ""
+msgstr "Commande client source"
 
 #. module: event_sale
 #: model:event.event.ticket,name:event_sale.event_0_ticket_1
@@ -430,7 +431,7 @@ msgstr "Formation technique"
 #: code:addons/event_sale/models/event.py:229
 #, python-format
 msgid "The registration must be paid"
-msgstr ""
+msgstr "L'inscription doit être payée"
 
 #. module: event_sale
 #: code:addons/event_sale/models/event.py:223
@@ -449,11 +450,13 @@ msgstr "Type de billet"
 #, python-format
 msgid "Ticket should belong to either event category or event but not both"
 msgstr ""
+"Le billet doit appartenir à une catégorie d'événement ou à un événement, "
+"mais pas aux deux"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_type_use_ticketing
 msgid "Ticketing"
-msgstr ""
+msgstr "Vente de billets"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_type_event_ticket_ids
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index fe80d62b56c..48c97b4a6ad 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -4,22 +4,23 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
-# Friderici Claude <claude@friderici.org>, 2016
+# Friderici Claude, 2016
 # Eloïse Stilmant <est@odoo.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -202,7 +203,7 @@ msgstr "Information de connexion"
 #: model:ir.cron,cron_name:fetchmail.ir_cron_mail_gateway_action
 #: model:ir.cron,name:fetchmail.ir_cron_mail_gateway_action
 msgid "Mail: Fetchmail Service"
-msgstr ""
+msgstr "E-mail : service fetchmail"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po
index 8b33eb4409a..af59a6c5dcf 100644
--- a/addons/fleet/i18n/de.po
+++ b/addons/fleet/i18n/de.po
@@ -3,7 +3,7 @@
 # * fleet
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
@@ -11,21 +11,22 @@
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # Andreas Väthröder <andreas.vaethroeder@alvarium-services.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Andreas Väthröder <andreas.vaethroeder@alvarium-services.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +45,8 @@ msgstr "%s %s wurde zur Flotte hinzugefügt!"
 #, python-format
 msgid "%s contract(s) will expire soon and should be renewed and/or closed!"
 msgstr ""
+"%s Die Verträge(s) laufen bald aus und sollten verlängert und/oder "
+"abgeschlossen werden!"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -182,7 +185,7 @@ msgstr "Bremsbeläge (Ersatz)"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
 msgid "Brand of the vehicle"
-msgstr ""
+msgstr "Marke des Fahrzeuges"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@@ -212,7 +215,7 @@ msgstr "Fahrzeugwäsche"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
 msgid "Catalog Value (VAT Incl.)"
-msgstr ""
+msgstr "Katalogwert (MwSt. incl.)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_15
@@ -245,13 +248,14 @@ msgstr "Fahrgestellnummer"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_state
 msgid "Choose whether the contract is still valid or not"
-msgstr ""
+msgstr "Wählen Sie, ob der Vertrag noch gültig ist oder nicht"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_service_type_category
 msgid ""
 "Choose whether the service refer to contracts, vehicle services or both"
 msgstr ""
+"Wählen Sie, ob sich der Service auf Verträge, Fahrzeuge oder beides bezieht"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_tag_action
@@ -296,7 +300,7 @@ msgstr "Klicken Sie zur Erstellung eines neuen Wartungsservice."
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_contract_types_action
 msgid "Click to create a new type of contract."
-msgstr ""
+msgstr "Klicken Sie, um einen neuen Vertragstyp zu erstellen."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
@@ -416,7 +420,7 @@ msgstr "Vertragsdetails"
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
 msgid "Contract(s)"
-msgstr ""
+msgstr "Vertrag(s)"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_purchaser_id
@@ -448,7 +452,7 @@ msgstr "Kosten"
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_description
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_description
 msgid "Cost Description"
-msgstr ""
+msgstr "Kostenbeschreibung"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
@@ -592,7 +596,7 @@ msgstr "Ablaufdatum des Vertrags (Standardwert: ein Jahr nach dem Startdatum)"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date
 msgid "Date when the vehicle has been immatriculated"
-msgstr ""
+msgstr "Datum, an dem das Fahrzeug zugelassen wurde"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_2
@@ -653,6 +657,8 @@ msgid ""
 "Each contract (e.g.: leasing) may include several services\n"
 "            (reparation, insurances, periodic maintenance)."
 msgstr ""
+"Jeder Vertrag (z. B. Leasing) kann mehrere Dienstleistungen\n"
+" beinhalten (Reparation, Versicherung, regelmäßige Wartung)."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
@@ -728,7 +734,7 @@ msgstr "Abgelaufen"
 #: selection:fleet.vehicle.log.contract,state:0
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 msgid "Expiring Soon"
-msgstr ""
+msgstr "Läuft bald ab"
 
 #. module: fleet
 #: model:ir.module.category,name:fleet.module_fleet_category
@@ -741,7 +747,7 @@ msgstr "Fahrzeugflotte"
 #: model:ir.cron,cron_name:fleet.ir_cron_contract_costs_generator
 #: model:ir.cron,name:fleet.ir_cron_contract_costs_generator
 msgid "Fleet: Generate contracts costs based on costs frequency"
-msgstr ""
+msgstr "Fleet: Generieren Sie Auftragskosten basierend auf der Kostenfrequenz"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_cost_type
@@ -877,6 +883,9 @@ msgid ""
 "            also filter logs of a particular vehicle using the search\n"
 "            field."
 msgstr ""
+"Hier können Sie Betankungs-Zugänge für alle Fahrzeuge hinzufügen. Sie können\n"
+" auch Protokolle eines bestimmten Fahrzeuges mit dem Suchfeld\n"
+" filtern."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action
@@ -885,6 +894,9 @@ msgid ""
 "            You can also show odometer value for a particular vehicle using\n"
 "            the search field."
 msgstr ""
+"Hier können Sie für alle Fahrzeuge verschiedene Kilometerzähleinträge hinzufügen.\n"
+" Sie können sich auch den Kilometerstand eines bestimmten Fahrzeuges\n"
+" mit dem Suchfeld anzeigen lassen."
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_horsepower
@@ -924,7 +936,7 @@ msgstr "Zündspule (Ersatz)"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
 msgid "Immatriculation Date"
-msgstr ""
+msgstr "Zulassungsdatum"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -1004,7 +1016,7 @@ msgstr "Kilometer"
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_kanban
 msgid "Km"
-msgstr ""
+msgstr "km"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_service_type___last_update
@@ -1131,6 +1143,8 @@ msgid ""
 "            their related services, costs. Odoo will automatically warn\n"
 "            you when some contracts have to be renewed."
 msgstr ""
+"Verwalten Sie Ihre Verträge (Leasing, Versicherungen, etc.) mit\n"
+" den damit verbundenen Dienstleistungen, Kosten. Odoo warnt Sie automatisch, wenn einige Verträge verlängert werden müssen."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_11
@@ -1186,7 +1200,7 @@ msgstr "Modellmarke"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_year
 msgid "Model Year"
-msgstr ""
+msgstr "Modelljahr"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_action
@@ -1322,7 +1336,7 @@ msgstr "Tachostand nach Fahrzeug"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
 msgid "Odometer at creation"
-msgstr ""
+msgstr "Kilometerzähler zum Zeitpunkt der Erstellung"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
@@ -1337,7 +1351,7 @@ msgstr "Fahrtenbuch für ein Fahrzeug"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
 msgid "Odometer measure of the vehicle at the moment of the contract creation"
-msgstr ""
+msgstr "Kilometerstand des Fahrzeuges zum Zeitpunkt der Vertragserstellung"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer
@@ -1358,6 +1372,8 @@ msgid ""
 "            on your vehicle. Services can be of many type: occasional\n"
 "            repair, fixed maintenance, etc."
 msgstr ""
+"Odoo hilft Ihnen, alle Dienstleistungen zu verfolgen, die an Ihrem Fahrzeug durchgeführt werden. Dienstleistungen können von verschiedener Art sein: gelegentliche\n"
+" Reparaturen, feste Wartungstermine, etc."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_action
@@ -1385,6 +1401,8 @@ msgid ""
 "Odoo will warn you when services or contract have to be\n"
 "            renewed."
 msgstr ""
+"Odoo macht Sie darauf aufmerksam, wenn Dienstleistungen oder Verträge erneuert werden\n"
+" müssen."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_31
@@ -1404,7 +1422,7 @@ msgstr "Kaskovertrag"
 #. module: fleet
 #: sql_constraint:fleet.vehicle:0
 msgid "Only one car can be assigned to the same employee!"
-msgstr ""
+msgstr "Einem Mitarbeiter kann nur ein Auto zugewiesen werden!"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_16
@@ -2067,7 +2085,7 @@ msgstr "Jahr"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_year
 msgid "Year of the model"
-msgstr ""
+msgstr "Modelljahr"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -2080,6 +2098,8 @@ msgid ""
 "You can customize available status to track the evolution of\n"
 "            each vehicle. Example: Active, Being Repaired, Sold."
 msgstr ""
+"Sie können den verfügbaren Status anpassen, um die Entwicklung jedes\n"
+" Fahrzeuges zu verfolgen. Beispiel: Aktiv, Wird repariert, Verkauft."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_action
@@ -2095,6 +2115,8 @@ msgid ""
 "            contracts, services, fixed and recurring costs, odometers and\n"
 "            fuel logs associated to each vehicle."
 msgstr ""
+"Sie können Ihre Flotte verwalten, indem Sie Verträge, Dienstleistungen, feste und wiederkehrende Kosten, Kilometerzähler und\n"
+" Treibstoffprotokolle des dazugehörigen Fahrzeuges verfolgen."
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
diff --git a/addons/fleet/i18n/fr.po b/addons/fleet/i18n/fr.po
index 91093290fce..58e2834713a 100644
--- a/addons/fleet/i18n/fr.po
+++ b/addons/fleet/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
@@ -12,15 +12,15 @@
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Christophe CHAUVET <christophe.chauvet@gmail.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
-# Hamid Darabi <hamid.darabi@gmail.com>, 2016
+# Hamid Darabi, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Nicolas Roussey <nro@odoo.com>, 2016
 # Agathe Mollé <molleagathe@gmail.com>, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
@@ -29,13 +29,14 @@
 # Aline Preillon <apr@odoo.com>, 2017
 # bob dupont <tropnul@hotmail.fr>, 2017
 # Lionel Sausin <ls@numerigraphe.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Lionel Sausin <ls@numerigraphe.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -192,7 +193,7 @@ msgstr "Remplacement de(s) pedale(s) de frein"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
 msgid "Brand of the vehicle"
-msgstr ""
+msgstr "Marque du véhicule"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@@ -255,13 +256,14 @@ msgstr "Numéro de chassis"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_state
 msgid "Choose whether the contract is still valid or not"
-msgstr ""
+msgstr "Choisissez la validité du contrat"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_service_type_category
 msgid ""
 "Choose whether the service refer to contracts, vehicle services or both"
 msgstr ""
+"Choisissez si l'intervention est liée au contrat, au véhicule ou les deux"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_tag_action
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
index 6e7f1722098..a50525b4106 100644
--- a/addons/fleet/i18n/zh_CN.po
+++ b/addons/fleet/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # Martin Trigaux, 2017
 # liAnGjiA <liangjia@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -32,7 +33,7 @@ msgstr "%s %s已添加到车队"
 #: code:addons/fleet/models/fleet_vehicle_cost.py:274
 #, python-format
 msgid "%s contract(s) will expire soon and should be renewed and/or closed!"
-msgstr ""
+msgstr "有 %s 个合同即将到期，应续订和/或关闭！"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -201,7 +202,7 @@ msgstr "洗车"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
 msgid "Catalog Value (VAT Incl.)"
-msgstr ""
+msgstr "目录值（包括增值税）"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_15
@@ -234,13 +235,13 @@ msgstr "车架号"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_state
 msgid "Choose whether the contract is still valid or not"
-msgstr ""
+msgstr "选择合同是否依旧有效"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_service_type_category
 msgid ""
 "Choose whether the service refer to contracts, vehicle services or both"
-msgstr ""
+msgstr "选择是服务合同还是车辆服务，或两者的"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_tag_action
@@ -285,7 +286,7 @@ msgstr "点击创建一个新的服务入口"
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_contract_types_action
 msgid "Click to create a new type of contract."
-msgstr ""
+msgstr "点击以创建一个新类型的合同。"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
@@ -305,7 +306,7 @@ msgstr "点击创建一个车辆状态"
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 msgid "Close Contract"
-msgstr ""
+msgstr "关闭合同"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -405,7 +406,7 @@ msgstr "合同日志"
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
 msgid "Contract(s)"
-msgstr ""
+msgstr "合同"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_purchaser_id
@@ -437,7 +438,7 @@ msgstr "成本"
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_description
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_description
 msgid "Cost Description"
-msgstr ""
+msgstr "成本说明"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
@@ -575,7 +576,7 @@ msgstr "合同的覆盖范围的有效日期（默认情况下，开始日期一
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date
 msgid "Date when the vehicle has been immatriculated"
-msgstr ""
+msgstr "车辆注册的日期"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_2
@@ -636,6 +637,8 @@ msgid ""
 "Each contract (e.g.: leasing) may include several services\n"
 "            (reparation, insurances, periodic maintenance)."
 msgstr ""
+"每个合同（例如：租赁）可能包括多个服务\n"
+"（修理、保险、定期保养）。"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
@@ -708,7 +711,7 @@ msgstr "过期"
 #: selection:fleet.vehicle.log.contract,state:0
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 msgid "Expiring Soon"
-msgstr ""
+msgstr "即将过期"
 
 #. module: fleet
 #: model:ir.module.category,name:fleet.module_fleet_category
@@ -721,7 +724,7 @@ msgstr "车队"
 #: model:ir.cron,cron_name:fleet.ir_cron_contract_costs_generator
 #: model:ir.cron,name:fleet.ir_cron_contract_costs_generator
 msgid "Fleet: Generate contracts costs based on costs frequency"
-msgstr ""
+msgstr "车队：根据成本频率生成合同成本"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_cost_type
@@ -857,6 +860,9 @@ msgid ""
 "            also filter logs of a particular vehicle using the search\n"
 "            field."
 msgstr ""
+"您可以在此处为所有车辆添加加油记录。您还可以\n"
+" 使用搜索\n"
+" 字段过滤特定车辆的记录。"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action
@@ -865,6 +871,9 @@ msgid ""
 "            You can also show odometer value for a particular vehicle using\n"
 "            the search field."
 msgstr ""
+"您可以在此处为所有车辆添加各里程表记录。\n"
+" 您还可以使用\n"
+" 搜索字段显示特定车辆的里程表值。"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_horsepower
@@ -904,7 +913,7 @@ msgstr "点火线圈更换"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
 msgid "Immatriculation Date"
-msgstr ""
+msgstr "注册日期"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -984,7 +993,7 @@ msgstr "公里"
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_kanban
 msgid "Km"
-msgstr ""
+msgstr "km"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_service_type___last_update
@@ -1055,7 +1064,7 @@ msgstr "车牌：从'%s'到'%s'"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_license_plate
 msgid "License plate number of the vehicle (i = plate number for a car)"
-msgstr ""
+msgstr "车辆的牌照号码（i = 汽车车牌号）"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_liter
@@ -1111,6 +1120,9 @@ msgid ""
 "            their related services, costs. Odoo will automatically warn\n"
 "            you when some contracts have to be renewed."
 msgstr ""
+"管理所有合同（租赁、保险等）及\n"
+" 其相关服务、成本。当某些合同必须续订时，Odoo 将自动警告\n"
+" 您。"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_11
@@ -1299,7 +1311,7 @@ msgstr "每个车辆的里程表数值"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
 msgid "Odometer at creation"
-msgstr ""
+msgstr "创建时的里程表"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
@@ -1314,7 +1326,7 @@ msgstr "车辆的里程表记录"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
 msgid "Odometer measure of the vehicle at the moment of the contract creation"
-msgstr ""
+msgstr "合同创建时车辆的里程表测量"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer
@@ -1335,6 +1347,9 @@ msgid ""
 "            on your vehicle. Services can be of many type: occasional\n"
 "            repair, fixed maintenance, etc."
 msgstr ""
+"Odoo 帮助您记录车辆已进行\n"
+" 的所有服务。服务包括多种类型：临时\n"
+" 修理、定期保养等"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_action
@@ -1358,6 +1373,8 @@ msgid ""
 "Odoo will warn you when services or contract have to be\n"
 "            renewed."
 msgstr ""
+"当服务或合同必须\n"
+" 续订时，Odoo 会提醒您。"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_31
@@ -1377,7 +1394,7 @@ msgstr "Omnium"
 #. module: fleet
 #: sql_constraint:fleet.vehicle:0
 msgid "Only one car can be assigned to the same employee!"
-msgstr ""
+msgstr "只能向同一员工分配一辆车！"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_16
@@ -2013,7 +2030,7 @@ msgstr "与该合约相关的所有其它信息写于此处。"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_notes
 msgid "Write here all supplementary information relative to this contract"
-msgstr ""
+msgstr "在此处输入与此合同相关的所有补充信息"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
@@ -2033,7 +2050,7 @@ msgstr "年"
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_year
 msgid "Year of the model"
-msgstr ""
+msgstr "模型年份"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -2046,6 +2063,8 @@ msgid ""
 "You can customize available status to track the evolution of\n"
 "            each vehicle. Example: Active, Being Repaired, Sold."
 msgstr ""
+"您可以自定义可用状态来跟踪每个车辆的\n"
+" 演变。例如：使用中、正在维修、已售出。"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_action
@@ -2059,6 +2078,8 @@ msgid ""
 "            contracts, services, fixed and recurring costs, odometers and\n"
 "            fuel logs associated to each vehicle."
 msgstr ""
+"您将能够通过记录与每个车辆相关的\n"
+" 合同、服务、固定和经常性成本、里程表和燃油记录来管理您的车队。"
 
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
diff --git a/addons/gamification/i18n/fr.po b/addons/gamification/i18n/fr.po
index da6bf0d3a86..b3658ba0c08 100644
--- a/addons/gamification/i18n/fr.po
+++ b/addons/gamification/i18n/fr.po
@@ -22,13 +22,15 @@
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # e2f <projects@e2f.com>, 2018
+# fr trans <e2ftrans1@yahoo.com>, 2018
+# fr rev <e2ffr02@hotmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2018\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"
@@ -403,6 +405,9 @@ msgid ""
 "                It can be deserved automatically when some conditions are met or manually by users.\n"
 "                Some badges are harder than others to get with specific conditions."
 msgstr ""
+"Un badge est un jeton symbolique délivré à un utilisateur en guise de récompense.\n"
+"                Il peut être attribué soit automatiquement lorsque certaines conditions sont remplies soit manuellement par les utilisateurs.\n"
+"                Des conditions spécifiques peuvent rendent certains badges plus difficiles à obtenir que d'autres."
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
@@ -410,6 +415,8 @@ msgid ""
 "A goal definition is a technical model of goal defining a condition to reach.\n"
 "                The dates, values to reach or users are defined in goal instance."
 msgstr ""
+"La définition d'un objectif est un modèle technique décrivant une condition à remplir.\n"
+"                Les dates, les valeurs à atteindre ou les utilisateurs sont définis dans une instance de l'objectif."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
@@ -428,6 +435,8 @@ msgid ""
 "A goal is defined by a user and a goal definition.\n"
 "                Goals can be created automatically by using challenges."
 msgstr ""
+"Un objectif est défini par un utilisateur et une définition d'objectif.\n"
+"                Les objectifs peuvent être créés automatiquement en utilisant des défis."
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -476,6 +485,9 @@ msgid ""
 "                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
 "                The goals are created for the specified users or member of the group."
 msgstr ""
+"Attribuer une liste d'objectifs aux utilisateurs choisis pour les évaluer.\n"
+"                Le défi peut utiliser une période (hebdomadaire, mensuelle…) pour la création automatique des objectifs.\n"
+"                Les objectifs sont créés pour les utilisateurs ou pour les membres du groupe spécifiés."
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -876,7 +888,7 @@ msgstr "Évaluer l'expression en mode lot au lieu plutôt que par utilisateur"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
 msgid "Evaluated expression for batch mode"
-msgstr ""
+msgstr "Expression évaluée pour le mode lot"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -921,7 +933,7 @@ msgstr "Pour le 3ème utilisateur"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_reward_id
 msgid "For Every Succeeding User"
-msgstr ""
+msgstr "Pour tous les utilisateurs suivants"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
@@ -978,7 +990,7 @@ msgstr "Badge de ludification pour utilisateur"
 #: model:ir.cron,cron_name:gamification.ir_cron_check_challenge
 #: model:ir.cron,name:gamification.ir_cron_check_challenge
 msgid "Gamification: Goal Challenge Check"
-msgstr ""
+msgstr "Ludification : vérification des défis liés à l'objectif"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_goal_id
@@ -1346,7 +1358,7 @@ msgstr "Jamais rappelé si vide ou à zéro."
 #. module: gamification
 #: model:mail.template,subject:gamification.email_template_badge_received
 msgid "New badge ${object.badge_id.name} granted"
-msgstr ""
+msgstr "Nouveau badge ${object.badge_id.name} décerné"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_next_report_date
@@ -1953,6 +1965,8 @@ msgid ""
 "There is no goals associated to this challenge matching your search.\n"
 "            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
+"Il n'y a pas d'objectifs associés au défi correspondant à votre recherche.\n"
+"            Vérifiez que votre défi est actif et assigné à au moins un utilisateur."
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
diff --git a/addons/gamification/i18n/zh_CN.po b/addons/gamification/i18n/zh_CN.po
index e2cf5427e7b..acb70fed5d1 100644
--- a/addons/gamification/i18n/zh_CN.po
+++ b/addons/gamification/i18n/zh_CN.po
@@ -377,6 +377,9 @@ msgid ""
 "                It can be deserved automatically when some conditions are met or manually by users.\n"
 "                Some badges are harder than others to get with specific conditions."
 msgstr ""
+"徽章是授予用户的象征性奖励。\n"
+" 徽章在满足某些条件时将自动得到，或者由用户手动设置。\n"
+" 根据具体条件的设置，有些徽章会比其他徽章更难得到。"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.goal_definition_list_action
@@ -384,6 +387,8 @@ msgid ""
 "A goal definition is a technical model of goal defining a condition to reach.\n"
 "                The dates, values to reach or users are defined in goal instance."
 msgstr ""
+"目标定义是定义要达成条件的目标的技术模型。\n"
+" 要达成的日期、数值，或用户在目标实例中定义。"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
@@ -400,6 +405,8 @@ msgid ""
 "A goal is defined by a user and a goal definition.\n"
 "                Goals can be created automatically by using challenges."
 msgstr ""
+"目标由用户和目标定义进行定义。\n"
+" 可使用挑战自动创建目标。"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -448,6 +455,9 @@ msgid ""
 "                The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
 "                The goals are created for the specified users or member of the group."
 msgstr ""
+"给选定的用户分配一个目标列表以进行评估。\n"
+" 挑战可利用周期（每周、每月...）自动创建目标。\n"
+" 目标的创建对象为特定用户或组成员。"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_rule_auth_user_ids
@@ -828,7 +838,7 @@ msgstr "批量评估每个用户的表现"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
 msgid "Evaluated expression for batch mode"
-msgstr ""
+msgstr "批处理模式的评估表达式"
 
 #. module: gamification
 #: selection:gamification.badge,rule_auth:0
@@ -930,7 +940,7 @@ msgstr "游戏化的用户徽章"
 #: model:ir.cron,cron_name:gamification.ir_cron_check_challenge
 #: model:ir.cron,name:gamification.ir_cron_check_challenge
 msgid "Gamification: Goal Challenge Check"
-msgstr ""
+msgstr "游戏化：目标挑战检查"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_wizard_goal_id
@@ -1291,7 +1301,7 @@ msgstr "从来没有提醒如果没有指定值或零"
 #. module: gamification
 #: model:mail.template,subject:gamification.email_template_badge_received
 msgid "New badge ${object.badge_id.name} granted"
-msgstr ""
+msgstr "已授予新徽章 ${object.badge_id.name}"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_next_report_date
@@ -1868,6 +1878,8 @@ msgid ""
 "There is no goals associated to this challenge matching your search.\n"
 "            Make sure that your challenge is active and assigned to at least one user."
 msgstr ""
+"没有与此挑战相关的目标匹配您的搜索条件。\n"
+" 请确保您的挑战已激活，且至少分配给一个用户。"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_goal_closed
@@ -1947,7 +1959,7 @@ msgstr "用户"
 #. module: gamification
 #: selection:gamification.challenge,category:0
 msgid "Website / Forum"
-msgstr ""
+msgstr "网站/论坛"
 
 #. module: gamification
 #: selection:gamification.challenge,period:0
@@ -2055,6 +2067,8 @@ msgid ""
 "e.g. result = env['mail.followers'].search_count([('res_model', '=', "
 "'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 msgstr ""
+"例如，result = env['mail.followers'].search_count([('res_model', '=', "
+"'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
 
 #. module: gamification
 #: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
diff --git a/addons/gamification_sale_crm/i18n/de.po b/addons/gamification_sale_crm/i18n/de.po
index 44c1e381ea0..a59c111df87 100644
--- a/addons/gamification_sale_crm/i18n/de.po
+++ b/addons/gamification_sale_crm/i18n/de.po
@@ -3,15 +3,16 @@
 # * gamification_sale_crm
 # 
 # Translators:
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Renzo Meister, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #. module: gamification_sale_crm
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_customer_refunds
 msgid "Customer Credit Notes"
-msgstr ""
+msgstr "Kunden Gutschriften"
 
 #. module: gamification_sale_crm
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_lead_delay_close
@@ -70,7 +71,7 @@ msgstr "Zeit zur Qualifizierung von Interessenten"
 #. module: gamification_sale_crm
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds
 msgid "Total Customer Credit Notes"
-msgstr ""
+msgstr "Kunden-Gesamtgutschriften"
 
 #. module: gamification_sale_crm
 #: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_sale1
diff --git a/addons/gamification_sale_crm/i18n/fr.po b/addons/gamification_sale_crm/i18n/fr.po
index 033ec8f3655..8fe6c7632d0 100644
--- a/addons/gamification_sale_crm/i18n/fr.po
+++ b/addons/gamification_sale_crm/i18n/fr.po
@@ -3,17 +3,18 @@
 # * gamification_sale_crm
 # 
 # Translators:
-# Fabien Pinckaers <fp@openerp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Saad Thaifa <saad.thaifa@gmail.com>, 2017
+# Fabien Pinckaers <fp@openerp.com>, 2016
+# Martin Trigaux, 2016
+# Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # fr trans <e2ftrans1@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -72,7 +73,7 @@ msgstr "Temps de qualification d'une piste"
 #. module: gamification_sale_crm
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds
 msgid "Total Customer Credit Notes"
-msgstr ""
+msgstr "Total des avoirs des clients"
 
 #. module: gamification_sale_crm
 #: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_sale1
diff --git a/addons/google_account/i18n/fr.po b/addons/google_account/i18n/fr.po
index ea77e8c3092..bac9572832e 100644
--- a/addons/google_account/i18n/fr.po
+++ b/addons/google_account/i18n/fr.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -102,7 +103,7 @@ msgstr ""
 #: code:addons/google_account/models/google_service.py:130
 #, python-format
 msgid "The account for the Google service '%s' is not configured"
-msgstr ""
+msgstr "Le compte pour le service Google « %s » n'est pas configuré"
 
 #. module: google_account
 #: model:ir.model,name:google_account.model_google_service
diff --git a/addons/google_account/i18n/zh_CN.po b/addons/google_account/i18n/zh_CN.po
index 881196d9195..2cfaeaa58c9 100644
--- a/addons/google_account/i18n/zh_CN.po
+++ b/addons/google_account/i18n/zh_CN.po
@@ -3,15 +3,16 @@
 # * google_account
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # liulixia <liu.lixia@elico-corp.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: liulixia <liu.lixia@elico-corp.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -58,7 +59,7 @@ msgstr "最后更新时间"
 #: code:addons/google_account/models/google_service.py:171
 #, python-format
 msgid "Method not supported [%s] not in [GET, POST, PUT, PATCH or DELETE]!"
-msgstr ""
+msgstr "[GET, POST, PUT, PATCH or DELETE] 中不包括不支持 [%s] 的方法！"
 
 #. module: google_account
 #: code:addons/google_account/models/google_service.py:119
@@ -94,7 +95,7 @@ msgstr "你对谷歌的访问出错了"
 #: code:addons/google_account/models/google_service.py:130
 #, python-format
 msgid "The account for the Google service '%s' is not configured"
-msgstr ""
+msgstr "未配置 Google 服务 '%s' 的账户"
 
 #. module: google_account
 #: model:ir.model,name:google_account.model_google_service
diff --git a/addons/google_calendar/i18n/fr.po b/addons/google_calendar/i18n/fr.po
index 0f84d9a84f4..131f9fdd98b 100644
--- a/addons/google_calendar/i18n/fr.po
+++ b/addons/google_calendar/i18n/fr.po
@@ -4,26 +4,27 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Anthony CRESSON <contact@cresson-anthony.fr>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Clo <clo@odoo.com>, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -165,7 +166,7 @@ msgstr "Id de l'évènement Google Calendar"
 #: model:ir.cron,cron_name:google_calendar.ir_cron_sync_all_cals
 #: model:ir.cron,name:google_calendar.ir_cron_sync_all_cals
 msgid "Google Calendar: synchronization"
-msgstr ""
+msgstr "Google Agenda : synchronisation"
 
 #. module: google_calendar
 #: sql_constraint:calendar.attendee:0
diff --git a/addons/google_calendar/i18n/zh_CN.po b/addons/google_calendar/i18n/zh_CN.po
index bd88dea4b31..5b640c02c16 100644
--- a/addons/google_calendar/i18n/zh_CN.po
+++ b/addons/google_calendar/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * google_calendar
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -148,7 +149,7 @@ msgstr "Google 日历 事件 Id"
 #: model:ir.cron,cron_name:google_calendar.ir_cron_sync_all_cals
 #: model:ir.cron,name:google_calendar.ir_cron_sync_all_cals
 msgid "Google Calendar: synchronization"
-msgstr ""
+msgstr "Google 日历：同步"
 
 #. module: google_calendar
 #: sql_constraint:calendar.attendee:0
diff --git a/addons/google_drive/i18n/de.po b/addons/google_drive/i18n/de.po
index 919a93b9a40..98a5a7b76be 100644
--- a/addons/google_drive/i18n/de.po
+++ b/addons/google_drive/i18n/de.po
@@ -151,7 +151,7 @@ msgstr "Google Drive Namensmuster"
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.res_config_settings_view_form
 msgid "Google Drive Templates"
-msgstr ""
+msgstr "Google Drive-Vorlagen"
 
 #. module: google_drive
 #: code:addons/google_drive/models/google_drive.py:62
diff --git a/addons/google_drive/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
index b50063ddfdf..4026cee3059 100644
--- a/addons/google_drive/i18n/zh_CN.po
+++ b/addons/google_drive/i18n/zh_CN.po
@@ -138,7 +138,7 @@ msgstr "谷歌网盘名称模式"
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.res_config_settings_view_form
 msgid "Google Drive Templates"
-msgstr ""
+msgstr "Google Drive 模板"
 
 #. module: google_drive
 #: code:addons/google_drive/models/google_drive.py:62
diff --git a/addons/google_spreadsheet/i18n/de.po b/addons/google_spreadsheet/i18n/de.po
index f1bb6a8380d..76f2f0b49e8 100644
--- a/addons/google_spreadsheet/i18n/de.po
+++ b/addons/google_spreadsheet/i18n/de.po
@@ -3,16 +3,17 @@
 # * google_spreadsheet
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Anja Funk <anja.funk@afimage.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,6 +54,8 @@ msgid ""
 "Please use the settings of Google Drive\n"
 "                            on the left or above."
 msgstr ""
+"Bitte verwenden Sie die Einstellungen\n"
+" von Google Drive links oder oben."
 
 #. module: google_spreadsheet
 #: model:ir.model.fields,help:google_spreadsheet.field_res_config_settings_google_drive_uri_copy
diff --git a/addons/google_spreadsheet/i18n/zh_CN.po b/addons/google_spreadsheet/i18n/zh_CN.po
index 4f785ab45e1..ac6406cbe15 100644
--- a/addons/google_spreadsheet/i18n/zh_CN.po
+++ b/addons/google_spreadsheet/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * google_spreadsheet
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -53,6 +54,8 @@ msgid ""
 "Please use the settings of Google Drive\n"
 "                            on the left or above."
 msgstr ""
+"请使用左侧或上方的\n"
+" Google Drive 设置。"
 
 #. module: google_spreadsheet
 #: model:ir.model.fields,help:google_spreadsheet.field_res_config_settings_google_drive_uri_copy
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index ce2200cb1c8..0bf10cc4688 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -3,31 +3,32 @@
 # * hr
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Henry Mineehen <info@mineehen.de>, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
-# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Thomas Neu <t.neu@runbox.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
+# Martin Trigaux, 2017
+# darenkster <inactive+darenkster@transifex.com>, 2017
+# Wolfgang Taferner, 2017
+# Henry Mineehen <info@mineehen.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Andreas Väthröder <andreas.vaethroeder@alvarium-services.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Rudolf Schnapka <rs@techno-flex.de>, 2017
+# Niki Waibel, 2017
+# Ermin Trevisan <trevi@twanda.com>, 2017
+# Renzo Meister, 2017
+# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
+# Andreas Väthröder <andreas.vaethroeder@alvarium-services.de>, 2017
+# Thomas Neu <t.neu@runbox.com>, 2017
+# Dejan Dinic, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
+# Rudolf Schnapka <rs@techno-flex.de>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: AppleMentalist <felix.schnatbaum@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -152,7 +153,7 @@ msgstr "Unternehmen"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_res_config_settings_resource_calendar_id
 msgid "Company Working Hours"
-msgstr ""
+msgstr "Betriebliche Arbeitszeiten"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_department_complete_name
@@ -309,6 +310,8 @@ msgid ""
 "Enter here the private address of the employee, not the one linked to your "
 "company."
 msgstr ""
+"Geben Sie hier die private Adresse des Mitarbeiters ein, nicht die Ihres "
+"Unternehmens."
 
 #. module: hr
 #: code:addons/hr/models/hr.py:303
@@ -519,7 +522,7 @@ msgstr "Marketing- und Community-Manager"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married (or similar)"
-msgstr ""
+msgstr "Verheiratet (oder Ähnliches)"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_image_medium
@@ -597,6 +600,9 @@ msgid ""
 "                related to employees by departments: expenses, timesheets,\n"
 "                leaves, recruitments, etc."
 msgstr ""
+"Die Abteilungsstruktur von Odoo dient dazu, alle Dokumente\n"
+" zu verwalten, die mit den Mitarbeitern von den Abteilungen: Ausgaben, Arbeitszeittabelle,\n"
+" Beurlaubung, Neueinstellung, etc."
 
 #. module: hr
 #: model:res.groups,name:hr.group_hr_user
@@ -636,12 +642,12 @@ msgstr "Position"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
 msgid "Private Address"
-msgstr ""
+msgstr "Privatadresse"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
 msgid "Private Information"
-msgstr ""
+msgstr "Private Informationen"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_hr_job_form
@@ -694,6 +700,8 @@ msgid ""
 "Set default calendar used to compute time allocation for leaves, timesheets,"
 " ..."
 msgstr ""
+"Standard-Kalender festlegen, mit dem die Zeitverteilung für Beurlaubungen, "
+"Arbeitszeittabellen etc. berechnet werden."
 
 #. module: hr
 #: model:ir.model.fields,help:hr.field_hr_job_state
@@ -713,17 +721,17 @@ msgstr "Einstellungen"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_res_config_settings_module_hr_org_chart
 msgid "Show Organizational Chart"
-msgstr ""
+msgstr "Organigramm anzeigen"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form"
-msgstr ""
+msgstr "Organigramm auf dem Mitarbeiterformular anzeigen"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form."
-msgstr ""
+msgstr "Organigramm auf dem Mitarbeiterformular anzeigen."
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -791,7 +799,7 @@ msgstr "Stichwörter"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_is_address_home_a_company
 msgid "The employee adress has a company linked"
-msgstr ""
+msgstr "Die Mitarbeiteradresse ist mit einem Unternehmen verknüpft."
 
 #. module: hr
 #: sql_constraint:hr.job:0
@@ -833,6 +841,9 @@ msgid ""
 "                                            This private address is used in the expense report reimbursement document.\n"
 "                                            It should be different from the work address."
 msgstr ""
+"Verwenden Sie hier die Privatadresse des Mitarbeiters.\n"
+" Diese private Adresse wird im  Rückerstattungsdokument des Spesenberichtes verwendet.\n"
+" Sie sollte sich von der Arbeitsadresse unterscheiden."
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_user_id
@@ -847,7 +858,7 @@ msgstr "Benutzer"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.hr_job_view_kanban
 msgid "Vacancies :"
-msgstr ""
+msgstr "Stellenangebote:"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire
@@ -879,7 +890,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_address_id
 msgid "Work Address"
-msgstr ""
+msgstr "Arbeitsadresse"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_work_email
@@ -889,7 +900,7 @@ msgstr "E-Mail (geschäftlich)"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
 msgid "Work Information"
-msgstr ""
+msgstr "Arbeitsinformation"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_work_location
@@ -904,7 +915,7 @@ msgstr "Handy (geschäftlich)"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Work Organization"
-msgstr ""
+msgstr "Arbeitsorganisation"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index a3bb7b3f7c9..2cf04138709 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -19,17 +19,18 @@
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Henri Cornuau <hcornuau@gmail.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # fr rev <e2ffr04@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: fr rev <e2ffr04@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -311,6 +312,8 @@ msgid ""
 "Enter here the private address of the employee, not the one linked to your "
 "company."
 msgstr ""
+"Saisissez ici l'adresse personnelle de l'employé, mais pas celle associée à "
+"votre entreprise."
 
 #. module: hr
 #: code:addons/hr/models/hr.py:303
@@ -520,7 +523,7 @@ msgstr "Gestionnaire de communauté et marketing"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married (or similar)"
-msgstr ""
+msgstr "Marié(e) (ou similaire)"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_image_medium
@@ -561,7 +564,7 @@ msgstr "Nationalité (Pays)"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Not Recruiting"
-msgstr ""
+msgstr "Pas de recrutement"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_department_note
@@ -597,6 +600,9 @@ msgid ""
 "                related to employees by departments: expenses, timesheets,\n"
 "                leaves, recruitments, etc."
 msgstr ""
+"La structure du service d'Odoo est utilisée pour gérer tous les documents\n"
+" associés aux employés par service : dépenses, feuilles de temps,\n"
+" congés, recrutements, etc."
 
 #. module: hr
 #: model:res.groups,name:hr.group_hr_user
@@ -636,12 +642,12 @@ msgstr "Poste"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
 msgid "Private Address"
-msgstr ""
+msgstr "Adresse personnelle"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
 msgid "Private Information"
-msgstr ""
+msgstr "Informations personnelles"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_hr_job_form
@@ -715,17 +721,17 @@ msgstr "Configuration"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_res_config_settings_module_hr_org_chart
 msgid "Show Organizational Chart"
-msgstr ""
+msgstr "Afficher l'organigramme"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form"
-msgstr ""
+msgstr "Afficher l'organigramme sur le formulaire de l'employé"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Show organizational chart on employee form."
-msgstr ""
+msgstr "Affichez l'organigramme sur le formulaire de l'employé."
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -793,7 +799,7 @@ msgstr "Étiquettes"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_is_address_home_a_company
 msgid "The employee adress has a company linked"
-msgstr ""
+msgstr "L'adresse de l'employé présente une entreprise qui lui est associée"
 
 #. module: hr
 #: sql_constraint:hr.job:0
@@ -834,6 +840,9 @@ msgid ""
 "                                            This private address is used in the expense report reimbursement document.\n"
 "                                            It should be different from the work address."
 msgstr ""
+"Utilisez ici l'adresse personnelle de l'employé.\n"
+" Cette adresse personnelle est utilisée pour le document de remboursement pour le rapport de dépenses.\n"
+" Cette adresse doit être différente de l'adresse professionnelle."
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_user_id
@@ -848,7 +857,7 @@ msgstr "Utilisateurs"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.hr_job_view_kanban
 msgid "Vacancies :"
-msgstr ""
+msgstr "Postes vacants :"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire
@@ -880,7 +889,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_address_id
 msgid "Work Address"
-msgstr ""
+msgstr "Adresse professionnelle"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_work_email
@@ -890,7 +899,7 @@ msgstr "Adresse électronique professionnelle"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
 msgid "Work Information"
-msgstr ""
+msgstr "Informations professionnelles"
 
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee_work_location
@@ -905,7 +914,7 @@ msgstr "Tél. portable professionnel"
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
 msgid "Work Organization"
-msgstr ""
+msgstr "Organisation professionnelle"
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_employee_form
@@ -945,6 +954,10 @@ msgid ""
 "recognized. Please send emails with the email address recorded on your "
 "employee information, or contact your HR manager."
 msgstr ""
+"Votre document n'a pas été créé, car votre adresse e-mail n'a pas été "
+"reconnue. Envoyez des e-mails en utilisant l'adresse e-mail enregistrée dans"
+" les informations d'employé vous concernant ou contactez votre responsable "
+"RH."
 
 #. module: hr
 #: model:ir.ui.view,arch_db:hr.view_department_form
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index f297c488963..03a9dda14b8 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -150,7 +150,7 @@ msgstr "Einchecken"
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_my_attendances
 msgid "Check In / Check Out"
-msgstr ""
+msgstr "An- und Abmeldung"
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_check_out
@@ -233,6 +233,8 @@ msgid ""
 "Create a few employees to be able to select an employee here and perform his"
 " check in / check out."
 msgstr ""
+"Legen Sie einige Mitarbeiter an, damit Sie hier einen Mitarbeiter auswählen "
+"und dessen An- und Abmeldung durchführen können."
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
@@ -460,7 +462,7 @@ msgstr "Kioskmodus"
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_last_attendance_id
 msgid "Last Attendance"
-msgstr ""
+msgstr "Letzte Anwesenheit"
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance___last_update
@@ -516,7 +518,7 @@ msgstr "Nicht ausgecheckt"
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action_employee
 msgid "No attendance records to display."
-msgstr ""
+msgstr "Keine Anwesenheitsaufzeichnungen anzuzeigen."
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_employee.py:72
@@ -560,6 +562,8 @@ msgstr "Bitte den PIN benutzen um auszuchecken"
 msgid ""
 "Please make sure you're using the correct filter if you expected to see any."
 msgstr ""
+"Bitte überprüfen Sie, dass Sie den richtigen Filter verwenden, falls Sie "
+"einen anwenden wollten."
 
 #. module: hr_attendance
 #. openerp-web
@@ -596,6 +600,8 @@ msgstr "Mitarbeiter Auswahl"
 #: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Set PIN codes in the employee detail form (in HR Settings tab)."
 msgstr ""
+"Legen Sie PIN-Codes im Mitarbeiter-Detailformular (im Tab für HR-"
+"Einstellungen) fest."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_settings
@@ -631,6 +637,7 @@ msgstr "Der PIN muss eine Ziffernfolge sein."
 #: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
 msgid "The attendance records of your employees will be displayed here."
 msgstr ""
+"Hier werden die Anwesenheitsaufzeichnungen Ihrer Mitarbeiter angezeigt."
 
 #. module: hr_attendance
 #. openerp-web
@@ -669,7 +676,7 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban
 msgid "To create employees go to the Employees menu."
-msgstr ""
+msgstr "Zum Anlegen eines Mitarbeiters, gehen Sie zum Mitarbeitermenü."
 
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
@@ -679,7 +686,7 @@ msgstr "Heute"
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Use PIN codes to check in in Kiosk Mode"
-msgstr ""
+msgstr "Verwenden Sie PIN-Codes, um sich im Kiosk-Modus anzumelden"
 
 #. module: hr_attendance
 #. openerp-web
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index 455f25ec0f7..d0ae981fdbd 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2017
@@ -13,13 +13,14 @@
 # Henri Cornuau <hcornuau@gmail.com>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -104,6 +105,8 @@ msgid ""
 "Cannot create new attendance record for %(empl_name)s, the employee hasn't "
 "checked out since %(datetime)s"
 msgstr ""
+"Impossible de créer un enregistrement de présence pour %(empl_name)s, "
+"l'employé(e) n'a pas effectué de pointage à la sortie depuis le %(datetime)s"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_attendance.py:72
@@ -113,12 +116,16 @@ msgid ""
 "Cannot create new attendance record for %(empl_name)s, the employee was "
 "already checked in on %(datetime)s"
 msgstr ""
+"Impossible de créer un enregistrement de présence pour %(empl_name)s, "
+"l'employé(e) a déjà effectué un pointage à l'entrée le %(datetime)s"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_employee.py:108
 #, python-format
 msgid "Cannot perform check in or check out on multiple employees."
 msgstr ""
+"Impossible d'effectuer un pointage à l'entrée ou à la sortie sur plusieurs "
+"employés."
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_employee.py:122
@@ -128,6 +135,9 @@ msgid ""
 "check in. Your attendances have probably been modified manually by human "
 "resources."
 msgstr ""
+"Impossible d'effectuer un pointage à la sortie sur %(empl_name)s, le "
+"pointage d'entrée correspondant est introuvable. Vos présences ont "
+"probablement été modifiées manuellement par les ressources humaines."
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_check_in
@@ -220,6 +230,8 @@ msgid ""
 "Create a few employees to be able to select an employee here and perform his"
 " check in / check out."
 msgstr ""
+"Créez quelques employés pour être en mesure d'en sélectionner un et "
+"d'effectuer son pointage à l'entrée/à la sortie."
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
@@ -300,21 +312,21 @@ msgstr "Employés"
 #. module: hr_attendance
 #: model:res.groups,name:hr_attendance.group_hr_attendance_use_pin
 msgid "Enable PIN use"
-msgstr ""
+msgstr "Activer l'utilisation de code PIN"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/js/my_attendances.js:29
 #, python-format
 msgid "Error : Could not find employee linked to user"
-msgstr ""
+msgstr "Erreur : impossible de trouver l'employé associé à l'utilisateur"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/xml/attendance.xml:35
 #, python-format
 msgid "Error : Could not find employee linked to user."
-msgstr ""
+msgstr "Erreur : impossible de trouver l'employé associé à l'utilisateur."
 
 #. module: hr_attendance
 #. openerp-web
@@ -419,7 +431,7 @@ msgstr "ID"
 #. module: hr_attendance
 #: model:ir.model.fields,help:hr_attendance.field_hr_employee_barcode
 msgid "ID used for employee identification."
-msgstr ""
+msgstr "Identifiant utilisé pour l'identification de l'employé."
 
 #. module: hr_attendance
 #. openerp-web
@@ -443,7 +455,7 @@ msgstr "Mode kiosque"
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_last_attendance_id
 msgid "Last Attendance"
-msgstr ""
+msgstr "Dernière présence"
 
 #. module: hr_attendance
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance___last_update
@@ -474,7 +486,7 @@ msgstr "Gestionnaire"
 #: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_manual_attendance
 #: model:res.groups,name:hr_attendance.group_hr_attendance
 msgid "Manual Attendance"
-msgstr ""
+msgstr "Présence manuelle"
 
 #. module: hr_attendance
 #: model:ir.actions.client,name:hr_attendance.hr_attendance_action_greeting_message
@@ -494,12 +506,12 @@ msgstr "Mes présences"
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
 msgid "No Check Out"
-msgstr ""
+msgstr "Aucun pointage à la sortie"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action_employee
 msgid "No attendance records to display."
-msgstr ""
+msgstr "Aucun enregistrement de présence à afficher."
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/models/hr_employee.py:72
@@ -521,20 +533,22 @@ msgstr "Code"
 #: model:ir.model.fields,help:hr_attendance.field_hr_employee_pin
 msgid "PIN used to Check In/Out in Kiosk Mode (if enabled in Configuration)."
 msgstr ""
+"Code PIN utilisé pour le pointage à l'entrée/à la sortie en mode kiosque (si"
+" cette option est activée dans Configuration)."
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/xml/attendance.xml:62
 #, python-format
 msgid "Please enter your PIN to check in"
-msgstr ""
+msgstr "Saisissez votre code PIN pour effectuer un pointage à l'entrée"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/xml/attendance.xml:59
 #, python-format
 msgid "Please enter your PIN to check out"
-msgstr ""
+msgstr "Saisissez votre code PIN pour effectuer un pointage à la sortie"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
@@ -573,12 +587,14 @@ msgstr "Scannez votre badge"
 #: code:addons/hr_attendance/static/src/xml/attendance.xml:15
 #, python-format
 msgid "Select Employee"
-msgstr ""
+msgstr "Sélectionner un employé"
 
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
 msgid "Set PIN codes in the employee detail form (in HR Settings tab)."
 msgstr ""
+"Définissez des codes PIN dans le formulaire de détails de l'employé (dans "
+"l'onglet Paramètres RH)."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_settings
@@ -608,12 +624,12 @@ msgstr ""
 #: code:addons/hr_attendance/models/hr_employee.py:63
 #, python-format
 msgid "The PIN must be a sequence of digits."
-msgstr ""
+msgstr "Le code PIN doit être une séquence de chiffres."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
 msgid "The attendance records of your employees will be displayed here."
-msgstr ""
+msgstr "Les enregistrements de présence de vos employés seront affichés ici."
 
 #. module: hr_attendance
 #. openerp-web
@@ -628,6 +644,8 @@ msgid ""
 "The employee will have access to the \"My Attendances\" menu to check in and"
 " out from his session"
 msgstr ""
+"L'employé aura accès au menu « Mes présences » pour effectuer le pointage à "
+"l'entrée et à la sortie pour sa session"
 
 #. module: hr_attendance
 #: model:res.groups,comment:hr_attendance.group_hr_attendance
@@ -635,6 +653,8 @@ msgid ""
 "The user will gain access to the human resources attendance menu, enabling "
 "him to manage his own attendance."
 msgstr ""
+"L'utilisateur pourra accéder au menu de présence des ressources humaines "
+"afin de gérer sa propre présence."
 
 #. module: hr_attendance
 #: model:res.groups,comment:hr_attendance.group_hr_attendance_use_pin
@@ -642,11 +662,13 @@ msgid ""
 "The user will have to enter his PIN to check in and out manually at the "
 "company screen."
 msgstr ""
+"L'utilisateur devra saisir son code PIN pour effectuer un pointage à "
+"l'entrée ou à la sortie sur l'écran de l'entreprise."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban
 msgid "To create employees go to the Employees menu."
-msgstr ""
+msgstr "Pour créer des employés, accédez au menu Employés."
 
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
@@ -700,12 +722,12 @@ msgstr "Mauvais PIN"
 #: code:addons/hr_attendance/models/hr_attendance.py:105
 #, python-format
 msgid "You cannot duplicate an attendance."
-msgstr ""
+msgstr "Vous ne pouvez pas dupliquer une présence."
 
 #. module: hr_attendance
 #: model:ir.model.fields,help:hr_attendance.field_hr_employee_attendance_ids
 msgid "list of attendances for the employee"
-msgstr ""
+msgstr "liste de présences pour l'employé"
 
 #. module: hr_attendance
 #. openerp-web
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 86e9cc52245..c2dd478d694 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -212,7 +212,7 @@ msgstr "Monatsbruttogehalt des Mitarbeiters"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id
 msgid "Employee's working schedule."
-msgstr ""
+msgstr "Arbeitszeitplan des Mitarbeiters."
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
@@ -222,12 +222,12 @@ msgstr "Enddatum"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_date_end
 msgid "End date of the contract (if it's a fixed-term contract)."
-msgstr ""
+msgstr "Enddatum des Vertrags (falls befristeter Vertrag)."
 
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_trial_date_end
 msgid "End date of the trial period (if there is one)."
-msgstr ""
+msgstr "Enddatum der Probezeit (falls vorhanden)."
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
@@ -255,7 +255,7 @@ msgstr "Gruppieren nach"
 #: model:ir.cron,cron_name:hr_contract.ir_cron_data_contract_update_state
 #: model:ir.cron,name:hr_contract.ir_cron_data_contract_update_state
 msgid "HR Contract: update state"
-msgstr ""
+msgstr "HR Arbeitsvertrag: Status aktualisieren"
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle_distance
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 7428e3892df..fa27414bfb1 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -9,7 +9,7 @@
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2017
 # leemannd <denis.leemann@camptocamp.com>, 2017
@@ -86,7 +86,7 @@ msgstr "Référence du contrat"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "Contract Terms"
-msgstr ""
+msgstr "Conditions du contrat"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_contract_type
@@ -187,7 +187,7 @@ msgstr "Nom affiché"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
 msgid "Edit Contract"
-msgstr ""
+msgstr "Modifier le contrat"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_employee
@@ -204,12 +204,12 @@ msgstr "Contrat de l'employé"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
 msgid "Employee's monthly gross wage."
-msgstr ""
+msgstr "Salaire brut mensuel de l'employé."
 
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id
 msgid "Employee's working schedule."
-msgstr ""
+msgstr "Calendrier de travail de l'employé."
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
@@ -219,17 +219,17 @@ msgstr "Date de fin"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_date_end
 msgid "End date of the contract (if it's a fixed-term contract)."
-msgstr ""
+msgstr "Date de fin du contrat (s'il s'agit d'un contrat à durée déterminée)."
 
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_trial_date_end
 msgid "End date of the trial period (if there is one)."
-msgstr ""
+msgstr "Date de fin de la période d'essai (le cas échéant)."
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
 msgid "End of Trial Period"
-msgstr ""
+msgstr "Fin de la période d'essai"
 
 #. module: hr_contract
 #: selection:hr.contract,state:0
@@ -252,7 +252,7 @@ msgstr "Regrouper par"
 #: model:ir.cron,cron_name:hr_contract.ir_cron_data_contract_update_state
 #: model:ir.cron,name:hr_contract.ir_cron_data_contract_update_state
 msgid "HR Contract: update state"
-msgstr ""
+msgstr "Contrat de personnel : mettre à jour l'état"
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle_distance
@@ -357,7 +357,7 @@ msgstr "En cours"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "Salary Information"
-msgstr ""
+msgstr "Informations sur le salaire"
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
@@ -383,7 +383,7 @@ msgstr "Date de début"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_date_start
 msgid "Start date of the contract."
-msgstr ""
+msgstr "Date de début du contrat."
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 8885b223e55..b8694308f3e 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -192,7 +192,7 @@ msgstr "Bestätigte Ausgaben"
 #: code:addons/hr_expense/static/src/js/tour.js:35
 #, python-format
 msgid "Attach your receipt here."
-msgstr ""
+msgstr "Hängen Sie hier Ihre Quittung an."
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
@@ -312,7 +312,7 @@ msgstr "Währung"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_module_sale_management
 msgid "Customer Billing"
-msgstr ""
+msgstr "Kundenabrechnung"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_accounting_date
@@ -433,7 +433,7 @@ msgstr "Spesenbericht"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "Spesenbericht Registrierungsassistent"
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_state
@@ -489,7 +489,7 @@ msgstr "Spesenabrechnung"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
 msgid "Expense refuse Reason wizard"
-msgstr ""
+msgstr "Assistent für die Spesenablehnung"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
@@ -519,12 +519,12 @@ msgstr "Spesenbericht vorgelegt, Genehmigung abwartend"
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_account_move_line_expense_id
 msgid "Expense where the move line come from"
-msgstr ""
+msgstr "Spesen, aus denen die Buchungszeile stammt"
 
 #. module: hr_expense
 #: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
 msgid "Expense: Submit To Manager"
-msgstr ""
+msgstr "Spesen: Manager vorlegen"
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_root
@@ -564,7 +564,7 @@ msgstr "Spesenbericht"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
 msgid "Expenses Reports Analysis"
-msgstr ""
+msgstr "Spesenberichtsanalyse"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_sheets_to_approve_count
@@ -629,7 +629,7 @@ msgstr "Die Spesen werden diese Schritte durchlaufen:"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_is_refused
 msgid "Explicitely Refused by manager or acccountant"
-msgstr ""
+msgstr "Ausdrücklich vom Manager oder Buchhalter abgelehnt"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -657,7 +657,7 @@ msgstr "Allgemeine Informationen"
 #: code:addons/hr_expense/static/src/js/tour.js:16
 #, python-format
 msgid "Go to the expense to attach a receipt."
-msgstr ""
+msgstr "Gehen Sie zu den Spesen, um eine Quittung anzuhängen."
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -678,17 +678,17 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_hide_payment_method
 msgid "Hide Payment Method"
-msgstr ""
+msgstr "Zahlungsmethode verbergen"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_ids
 msgid "Hr Expense"
-msgstr ""
+msgstr "Personalspesenabrechnung"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_sheet_id
 msgid "Hr Expense Sheet"
-msgstr ""
+msgstr "Personalspeseneingabeformular"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
@@ -736,7 +736,7 @@ msgstr "Zuletzt aktualisiert am"
 #: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_use_mailgateway
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Let your employees record expenses by email"
-msgstr ""
+msgstr "Lassen Sie Ihre Mitarbeiter Spesen per E-Mail aufzeichnen"
 
 #. module: hr_expense
 #: model:res.groups,name:hr_expense.group_hr_expense_manager
@@ -770,7 +770,7 @@ msgstr "Meine Spesen für die Einreichung"
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_refused
 msgid "My Refused Reports"
-msgstr ""
+msgstr "Meine abgelehnten Berichte"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
@@ -811,6 +811,8 @@ msgid ""
 "No Expense account found for the product %s (or for its category), please "
 "configure one."
 msgstr ""
+"Es konnte kein Spesenkonto für das Produkt %s (oder dessen Kategorie) "
+"gefunden werden. Bitte erstellen Sie eins."
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:241
@@ -831,7 +833,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_refused
 msgid "No refused reports to display."
-msgstr ""
+msgstr "Keine abgelehnten Berichte anzuzeigen."
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -884,13 +886,13 @@ msgstr ""
 #: code:addons/hr_expense/models/hr_expense.py:554
 #, python-format
 msgid "Only HR Officers can approve expenses"
-msgstr ""
+msgstr "Nur Personalmitarbeiter können Spesen genehmigen"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:545
 #, python-format
 msgid "Only HR Officers can refuse expenses"
-msgstr ""
+msgstr "Nur Personalmitarbeiter können Spesen ablehnen"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
@@ -1006,17 +1008,17 @@ msgstr "Grund"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "Reason :"
-msgstr ""
+msgstr "Grund:"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
 msgid "Reason to refuse Expense"
-msgstr ""
+msgstr "Begründung, für die Ablehnung der Spesen"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Recording"
-msgstr ""
+msgstr "Aufzeichnung"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -1049,7 +1051,7 @@ msgstr "Abgelehnte Spesen"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports_refused
 msgid "Refused Reports"
-msgstr ""
+msgstr "Abgelehnte Berichte"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_sheet_register_payment_wizard_action
@@ -1113,7 +1115,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Sell services and invoice expenses to customer"
-msgstr ""
+msgstr "Dienstleistungen verkaufen und Spesen für den"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_configuration
@@ -1189,6 +1191,8 @@ msgstr ""
 msgid ""
 "The accountant can register a payment to reimburse the employee directly."
 msgstr ""
+"Der Buchhalter kann eine Zahlung eintragen, um den Mitarbeiter direkt zu "
+"entschädigen."
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
@@ -1231,6 +1235,8 @@ msgid ""
 "This installs the Sales Management app.                             Expenses"
 " can be invoiced to customers from sales orders."
 msgstr ""
+"Das installiert die Verkaufsmanagement-App. Spesen können Kunden aus "
+"Verkaufsaufträgen in Rechnung gestellt werden."
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve
@@ -1318,6 +1324,8 @@ msgstr "Bericht anzeigen"
 #, python-format
 msgid "Write the name of the product, or select an existing one."
 msgstr ""
+"Schreiben Sie den Namen des Produkts oder wählen Sie einen bereits "
+"bestehenden."
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:569
@@ -1336,6 +1344,12 @@ msgid ""
 "between brackets, the product will be set automatically. Type the expense "
 "amount in the mail subject to set it on the expense too."
 msgstr ""
+"Sie können einen allgemeingültigen E-Mail-Alias einrichten, um eingehende "
+"Spesen ganz einfach zu erstellen. Schreiben Sie eine E-Mail mit dem Beleg im"
+" Anhang, um mit einem Klick eine Spesenposition zu erstellen. Wenn der E"
+"-Mail-Betreff die interne Referenz des Produktes enthält, wird das Produkt "
+"automatisch eingestellt. Geben Sie den Spesenbetrag im E-Mail-Betreff an, um"
+" ihn der Spesen"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:604
@@ -1389,7 +1403,7 @@ msgstr "Sie erfassen Spesen,"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "Your Expense"
-msgstr ""
+msgstr "Ihre Spesen"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
@@ -1409,7 +1423,7 @@ msgstr "z.B. Reise nach New York"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "has been refused"
-msgstr ""
+msgstr "Wurde abgelehnt"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:354
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 630c26880f8..fd0a0216c6a 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -13,7 +13,7 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Clo <clo@odoo.com>, 2016
 # Matillon Samantha <smatillon@gmail.com>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
@@ -205,7 +205,7 @@ msgstr "Frais approuvés"
 #: code:addons/hr_expense/static/src/js/tour.js:35
 #, python-format
 msgid "Attach your receipt here."
-msgstr ""
+msgstr "Ajoutez votre reçu ici."
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
@@ -444,7 +444,7 @@ msgstr "Note de frais"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "Assistant pour enregistrer le paiement des notes de frais"
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_state
@@ -500,7 +500,7 @@ msgstr "Note de frais"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
 msgid "Expense refuse Reason wizard"
-msgstr ""
+msgstr "Assistant pour indiquer le motif de refus d'une note de frais"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
@@ -530,7 +530,7 @@ msgstr "Note de frais en attente d'approbation"
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_account_move_line_expense_id
 msgid "Expense where the move line come from"
-msgstr ""
+msgstr "Note de frais d'où provient la ligne d'écriture"
 
 #. module: hr_expense
 #: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
@@ -575,7 +575,7 @@ msgstr "Rapport de dépenses"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
 msgid "Expenses Reports Analysis"
-msgstr ""
+msgstr "Analyse des notes de frais"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_sheets_to_approve_count
@@ -641,7 +641,7 @@ msgstr "Les dépenses vont passer par les états suivants:"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_is_refused
 msgid "Explicitely Refused by manager or acccountant"
-msgstr ""
+msgstr "Refusé par le responsable ou le comptable"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -669,7 +669,7 @@ msgstr "Information Générale"
 #: code:addons/hr_expense/static/src/js/tour.js:16
 #, python-format
 msgid "Go to the expense to attach a receipt."
-msgstr ""
+msgstr "Accédez à la note de frais pour joindre un reçu."
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -695,12 +695,12 @@ msgstr "Masquer la méthode de paiement"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_ids
 msgid "Hr Expense"
-msgstr ""
+msgstr "Dépense RH"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_sheet_id
 msgid "Hr Expense Sheet"
-msgstr ""
+msgstr "Note de frais RH"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
@@ -782,7 +782,7 @@ msgstr "Mes dépenses à soumettre"
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_refused
 msgid "My Refused Reports"
-msgstr ""
+msgstr "Mes notes de frais refusées"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
@@ -823,6 +823,8 @@ msgid ""
 "No Expense account found for the product %s (or for its category), please "
 "configure one."
 msgstr ""
+"Aucun compte de dépenses n'a été trouvé pour le produit %s (ou sa "
+"catégorie). Veuillez en configurer un."
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:241
@@ -839,7 +841,7 @@ msgstr "Pas de compte de crédit pour le journal %s, en configurer un SVP."
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_refused
 msgid "No refused reports to display."
-msgstr ""
+msgstr "Aucune note de frais refusée à afficher."
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -894,13 +896,13 @@ msgstr ""
 #: code:addons/hr_expense/models/hr_expense.py:554
 #, python-format
 msgid "Only HR Officers can approve expenses"
-msgstr ""
+msgstr "Seuls les agents RH peuvent approuver des dépenses"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:545
 #, python-format
 msgid "Only HR Officers can refuse expenses"
-msgstr ""
+msgstr "Seuls les agents RH peuvent refuser des dépenses"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
@@ -1014,17 +1016,17 @@ msgstr "Motif"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "Reason :"
-msgstr ""
+msgstr "Motif :"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
 msgid "Reason to refuse Expense"
-msgstr ""
+msgstr "Motif du refus de la note de frais"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Recording"
-msgstr ""
+msgstr "Enregistrement"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -1057,7 +1059,7 @@ msgstr "Dépenses refusées"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports_refused
 msgid "Refused Reports"
-msgstr ""
+msgstr "Notes de frais refusées"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_sheet_register_payment_wizard_action
@@ -1121,7 +1123,7 @@ msgstr ""
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Sell services and invoice expenses to customer"
-msgstr ""
+msgstr "Vendre des services et facturer des dépenses au client"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_configuration
@@ -1236,6 +1238,8 @@ msgid ""
 "This installs the Sales Management app.                             Expenses"
 " can be invoiced to customers from sales orders."
 msgstr ""
+"Cela installe l'application Gestion des ventes. Les dépenses peuvent être "
+"facturées aux clients à partir des bons de commande."
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve
@@ -1322,7 +1326,7 @@ msgstr "Voir le Rapport"
 #: code:addons/hr_expense/static/src/js/tour.js:26
 #, python-format
 msgid "Write the name of the product, or select an existing one."
-msgstr ""
+msgstr "Saisissez le nom de l'article ou sélectionnez un article existant."
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:569
@@ -1341,6 +1345,12 @@ msgid ""
 "between brackets, the product will be set automatically. Type the expense "
 "amount in the mail subject to set it on the expense too."
 msgstr ""
+"Vous pouvez configurer un email générique pour ajouter facilement vos "
+"dépenses. Écrivez un e-mail en ajoutant le reçu en pièce jointe pour créer "
+"une dépense en un clic. Si l'objet de l'e-mail contient la référence interne"
+" de l'article entre parenthèses, l'article sera configuré automatiquement. "
+"Entrez le montant de la dépense dans l'objet de l'e-mail pour le retrouver "
+"dans la dépense également."
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:604
@@ -1391,7 +1401,7 @@ msgstr "Vous enregistrez vos dépenses, "
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "Your Expense"
-msgstr ""
+msgstr "Votre dépense"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
@@ -1411,7 +1421,7 @@ msgstr "e.g. Voyage à New-York"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "has been refused"
-msgstr ""
+msgstr "refusé"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:354
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 17d6d3d9d51..9b2911978ce 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -151,7 +151,7 @@ msgstr "所有费用"
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_account_id
 msgid "An expense account is expected"
-msgstr ""
+msgstr "预期费用账户"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_analytic_account_id
@@ -180,7 +180,7 @@ msgstr "已批准的费用"
 #: code:addons/hr_expense/static/src/js/tour.js:35
 #, python-format
 msgid "Attach your receipt here."
-msgstr ""
+msgstr "在这附上您的收据。"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
@@ -298,7 +298,7 @@ msgstr "币种"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_module_sale_management
 msgid "Customer Billing"
-msgstr ""
+msgstr "客户开票"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_accounting_date
@@ -419,7 +419,7 @@ msgstr "费用报表"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "费用报告注册付款向导"
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_state
@@ -475,7 +475,7 @@ msgstr "费用表"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
 msgid "Expense refuse Reason wizard"
-msgstr ""
+msgstr "费用拒绝原因向导"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
@@ -505,12 +505,12 @@ msgstr "费用报告已提交，等待审判中"
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_account_move_line_expense_id
 msgid "Expense where the move line come from"
-msgstr ""
+msgstr "移动路线的费用"
 
 #. module: hr_expense
 #: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
 msgid "Expense: Submit To Manager"
-msgstr ""
+msgstr "费用：向经理提交"
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_root
@@ -550,7 +550,7 @@ msgstr "费用报告"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
 msgid "Expenses Reports Analysis"
-msgstr ""
+msgstr "费用报告分析"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_sheets_to_approve_count
@@ -612,7 +612,7 @@ msgstr "费用将通过这些步骤："
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_is_refused
 msgid "Explicitely Refused by manager or acccountant"
-msgstr ""
+msgstr "由经理或会计人员明确地拒绝"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -638,7 +638,7 @@ msgstr "一般信息"
 #: code:addons/hr_expense/static/src/js/tour.js:16
 #, python-format
 msgid "Go to the expense to attach a receipt."
-msgstr ""
+msgstr "附加收据的费用。"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -664,12 +664,12 @@ msgstr "隐藏付款方式"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_ids
 msgid "Hr Expense"
-msgstr ""
+msgstr "人力资源费用"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_hr_expense_sheet_id
 msgid "Hr Expense Sheet"
-msgstr ""
+msgstr "人力资源费用表"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
@@ -717,7 +717,7 @@ msgstr "最后更新时间"
 #: model:ir.model.fields,field_description:hr_expense.field_res_config_settings_use_mailgateway
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Let your employees record expenses by email"
-msgstr ""
+msgstr "允许员工通过电子邮件记录费用"
 
 #. module: hr_expense
 #: model:res.groups,name:hr_expense.group_hr_expense_manager
@@ -729,7 +729,7 @@ msgstr "管理员"
 #: code:addons/hr_expense/static/src/js/tour.js:60
 #, python-format
 msgid "Managers can get all reports to approve from this menu."
-msgstr ""
+msgstr "经理可以从该菜单中获取所有要批准的报告。"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_communication
@@ -750,7 +750,7 @@ msgstr "待提交的费用"
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_refused
 msgid "My Refused Reports"
-msgstr ""
+msgstr "我的拒绝报告"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
@@ -790,7 +790,7 @@ msgstr "新邮件"
 msgid ""
 "No Expense account found for the product %s (or for its category), please "
 "configure one."
-msgstr ""
+msgstr "找不到产品 %s (或者这个产品)的费用科目，请配置一下"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:241
@@ -807,7 +807,7 @@ msgstr "找不到%s日记账的贷方科目，　请配置一下"
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_refused
 msgid "No refused reports to display."
-msgstr ""
+msgstr "显示未拒绝的报告。"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
@@ -858,13 +858,13 @@ msgstr "当你生成了你的费用申请，发送给你的经理，他会验证
 #: code:addons/hr_expense/models/hr_expense.py:554
 #, python-format
 msgid "Only HR Officers can approve expenses"
-msgstr ""
+msgstr "只有人力资源主管可以批准开支"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:545
 #, python-format
 msgid "Only HR Officers can refuse expenses"
-msgstr ""
+msgstr "只有人力资源主管可以拒绝开支"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
@@ -912,7 +912,7 @@ msgstr "付款类型"
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "Periodically, you submit expenses report to your manager,"
-msgstr ""
+msgstr "定期地，向经理提交费用报告。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:281
@@ -981,12 +981,12 @@ msgstr "原因 :"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
 msgid "Reason to refuse Expense"
-msgstr ""
+msgstr "拒绝费用申请的理由"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Recording"
-msgstr ""
+msgstr "记录"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -1019,7 +1019,7 @@ msgstr "否决的费用"
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports_refused
 msgid "Refused Reports"
-msgstr ""
+msgstr "拒绝报告"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_sheet_register_payment_wizard_action
@@ -1081,7 +1081,7 @@ msgstr "选择不同类别的计量单位作为产品的计量单位"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid "Sell services and invoice expenses to customer"
-msgstr ""
+msgstr "向客户销售服务和发票费用"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_configuration
@@ -1152,17 +1152,17 @@ msgstr "技术领域用于隐藏的付款方法，如果选择的日记账只有
 #, python-format
 msgid ""
 "The accountant can register a payment to reimburse the employee directly."
-msgstr ""
+msgstr "为直接向员工报销，会计人员可以注册付款。"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "The accountant validates entries and reimburse you."
-msgstr ""
+msgstr "会计人员验证条目后，对您进行报销。"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
 msgid "The accountant validates journal entries and reimburse you."
-msgstr ""
+msgstr "会计人员验证日记账条目后，对您进行报销。"
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_journal_id
@@ -1183,14 +1183,14 @@ msgstr "此付费方式当费用由公司支付时使用"
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "The steps to process expenses are:"
-msgstr ""
+msgstr "处理费用的步骤是："
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
 msgid ""
 "This installs the Sales Management app.                             Expenses"
 " can be invoiced to customers from sales orders."
-msgstr ""
+msgstr "该操作可以安装销售管理应用。费用可以通过销售订单向客户开具发票。"
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve
@@ -1277,7 +1277,7 @@ msgstr "查看报告"
 #: code:addons/hr_expense/static/src/js/tour.js:26
 #, python-format
 msgid "Write the name of the product, or select an existing one."
-msgstr ""
+msgstr "写下产品的名称，或者选择一个现有的产品。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:569
@@ -1294,30 +1294,31 @@ msgid ""
 "between brackets, the product will be set automatically. Type the expense "
 "amount in the mail subject to set it on the expense too."
 msgstr ""
+"要轻松创建收入费用，您可以设置通用的电子邮件别名。要在一次点击中创建费用线，可以写一封附件中带有收据的电子邮件。如果邮件主题在括号之间包含产品的内部参考，则将自动设置产品。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:604
 #, python-format
 msgid "You cannot add expense lines of another employee."
-msgstr ""
+msgstr "您不能添加其他员工的费用线。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:325
 #, python-format
 msgid "You cannot delete a posted expense."
-msgstr ""
+msgstr "您不能删除已公布的费用。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:474
 #, python-format
 msgid "You cannot delete a posted or paid expense."
-msgstr ""
+msgstr "您不能删除已公布或者已支付的费用。"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:122
 #, python-format
 msgid "You cannot report expenses for different employees in the same report!"
-msgstr ""
+msgstr "您不能在同一个报告中为不同的员工报告费用！"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:611
@@ -1334,17 +1335,17 @@ msgstr "同一行你不能报告两次！"
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
 msgid "You record expenses"
-msgstr ""
+msgstr "您记录开支"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
 msgid "You record expenses,"
-msgstr ""
+msgstr "您记录开支"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "Your Expense"
-msgstr ""
+msgstr "您的费用"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
@@ -1354,23 +1355,23 @@ msgstr "例如:午餐"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
 msgid "e.g. Lunch with Customer"
-msgstr ""
+msgstr "例如，和客户共进午餐"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
 msgid "e.g. Trip to NY"
-msgstr ""
+msgstr "例如，去纽约旅行"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.hr_expense_template_refuse_reason
 msgid "has been refused"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:354
 #, python-format
 msgid "or send receipts by email to %s."
-msgstr ""
+msgstr "或者通过电子邮件向 % 发送收据。"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_res_config_settings
diff --git a/addons/hr_expense_check/i18n/de.po b/addons/hr_expense_check/i18n/de.po
index 73621eb2583..fbfb279091c 100644
--- a/addons/hr_expense_check/i18n/de.po
+++ b/addons/hr_expense_check/i18n/de.po
@@ -3,18 +3,19 @@
 # * hr_expense_check
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: darenkster <inactive+darenkster@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Code"
 #. module: hr_expense_check
 #: model:ir.model,name:hr_expense_check.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "Spesenbericht Registrierungsassistent"
 
 #. module: hr_expense_check
 #: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_manual_sequencing
diff --git a/addons/hr_expense_check/i18n/fr.po b/addons/hr_expense_check/i18n/fr.po
index 2cbaa6e6477..1b4a5f99142 100644
--- a/addons/hr_expense_check/i18n/fr.po
+++ b/addons/hr_expense_check/i18n/fr.po
@@ -6,15 +6,16 @@
 # Clo <clo@odoo.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
 # Benedicte HANET <hanetb@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -46,7 +47,7 @@ msgstr "Code"
 #. module: hr_expense_check
 #: model:ir.model,name:hr_expense_check.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "Assistant pour enregistrer le paiement des notes de frais"
 
 #. module: hr_expense_check
 #: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_manual_sequencing
diff --git a/addons/hr_expense_check/i18n/zh_CN.po b/addons/hr_expense_check/i18n/zh_CN.po
index 76beaaa5f47..d7a43c035b0 100644
--- a/addons/hr_expense_check/i18n/zh_CN.po
+++ b/addons/hr_expense_check/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * hr_expense_check
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
-# fausthuang <faust_huang@hotmail.com>, 2017
+# fausthuang, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: fausthuang <faust_huang@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -43,7 +44,7 @@ msgstr "代码"
 #. module: hr_expense_check
 #: model:ir.model,name:hr_expense_check.model_hr_expense_sheet_register_payment_wizard
 msgid "Expense Report Register Payment wizard"
-msgstr ""
+msgstr "费用报告注册付款向导"
 
 #. module: hr_expense_check
 #: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_sheet_register_payment_wizard_check_manual_sequencing
diff --git a/addons/hr_gamification/i18n/de.po b/addons/hr_gamification/i18n/de.po
index a6d75f5394b..c005c183102 100644
--- a/addons/hr_gamification/i18n/de.po
+++ b/addons/hr_gamification/i18n/de.po
@@ -3,21 +3,22 @@
 # * hr_gamification
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Winfried Grieb <inactive+wigrieb@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Thorsten Vocks <thorsten.vocks@openbig.org>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +41,8 @@ msgid ""
 "All employee badges, linked to the employee either directly or through the "
 "user"
 msgstr ""
+"Alle Mitarbeiterabzeichen, die entweder direkt oder über den Benutzer mit "
+"dem Mitarbeiter verknüpft sind"
 
 #. module: hr_gamification
 #: model:ir.actions.act_window,help:hr_gamification.challenge_list_action2
@@ -69,7 +72,7 @@ msgstr ""
 #. module: hr_gamification
 #: model:ir.model.fields,help:hr_gamification.field_hr_employee_direct_badge_ids
 msgid "Badges directly linked to the employee"
-msgstr ""
+msgstr "Abzeichen, die direkt mit dem Mitarbeiter verknüpft sind"
 
 #. module: hr_gamification
 #: model:ir.ui.view,arch_db:hr_gamification.view_badge_wizard_reward
@@ -110,7 +113,7 @@ msgstr ""
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_direct_badge_ids
 msgid "Direct Badge"
-msgstr ""
+msgstr "Direktes Abzeichen"
 
 #. module: hr_gamification
 #: model:ir.model,name:hr_gamification.model_hr_employee
@@ -158,12 +161,12 @@ msgstr "Vergebe Auszeichnung"
 #. module: hr_gamification
 #: model:ir.ui.view,arch_db:hr_gamification.hr_badge_form_view
 msgid "Granted"
-msgstr ""
+msgstr "Bewilligt"
 
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_granted_employees_count
 msgid "Granted Employees Count"
-msgstr ""
+msgstr "Bewilligte Mitarbeiteranzahl"
 
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_has_badges
diff --git a/addons/hr_gamification/i18n/fr.po b/addons/hr_gamification/i18n/fr.po
index dff20ed49a6..d5d6b9b562b 100644
--- a/addons/hr_gamification/i18n/fr.po
+++ b/addons/hr_gamification/i18n/fr.po
@@ -3,21 +3,22 @@
 # * hr_gamification
 # 
 # Translators:
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
-# Eloïse Stilmant <est@odoo.com>, 2017
-# Lionel Sausin <ls@numerigraphe.com>, 2017
+# Xavier Belmere <Info@cartmeleon.com>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Lionel Sausin <ls@numerigraphe.com>, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Fabien Pinckaers <fp@openerp.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
-# Fabien Pinckaers <fp@openerp.com>, 2017
+# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Fabien Pinckaers <fp@openerp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -110,7 +111,7 @@ msgstr ""
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_direct_badge_ids
 msgid "Direct Badge"
-msgstr ""
+msgstr "Badge direct"
 
 #. module: hr_gamification
 #: model:ir.model,name:hr_gamification.model_hr_employee
@@ -163,7 +164,7 @@ msgstr "Délivré"
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_granted_employees_count
 msgid "Granted Employees Count"
-msgstr ""
+msgstr "Nombre d'employés bénéficiaires"
 
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_has_badges
diff --git a/addons/hr_gamification/i18n/zh_CN.po b/addons/hr_gamification/i18n/zh_CN.po
index 4a5b825b586..85a46f2afda 100644
--- a/addons/hr_gamification/i18n/zh_CN.po
+++ b/addons/hr_gamification/i18n/zh_CN.po
@@ -7,13 +7,14 @@
 # Xu Lei <xulei8@qq.com>, 2017
 # Talway <9010446@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -33,7 +34,7 @@ msgstr "用户定义目标和目标类型。用挑战可以自动创建目标"
 msgid ""
 "All employee badges, linked to the employee either directly or through the "
 "user"
-msgstr ""
+msgstr "所有雇员的徽章，要么直接与雇员链接，要么通过用户链接"
 
 #. module: hr_gamification
 #: model:ir.actions.act_window,help:hr_gamification.challenge_list_action2
@@ -58,7 +59,7 @@ msgstr "徽章是对良好的工作的奖励。授予您认为应得的那些人
 #. module: hr_gamification
 #: model:ir.model.fields,help:hr_gamification.field_hr_employee_direct_badge_ids
 msgid "Badges directly linked to the employee"
-msgstr ""
+msgstr "直接与雇员链接的徽章"
 
 #. module: hr_gamification
 #: model:ir.ui.view,arch_db:hr_gamification.view_badge_wizard_reward
@@ -148,7 +149,7 @@ msgstr "授予"
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_granted_employees_count
 msgid "Granted Employees Count"
-msgstr ""
+msgstr "授予的员工人数"
 
 #. module: hr_gamification
 #: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_has_badges
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 5275988c647..b0f42b19c33 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -62,19 +62,19 @@ msgstr "!important; font-size: 8px; min-width: 18px\"&gt;"
 #: code:addons/hr_holidays/models/hr_holidays.py:123
 #, python-format
 msgid "%g remaining out of %g"
-msgstr ""
+msgstr "%g übrig von %g"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:341
 #, python-format
 msgid "%s : %.2f day(s)"
-msgstr ""
+msgstr "%s: %.2f Tag(e)"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:343
 #, python-format
 msgid "%s on %s : %.2f day(s)"
-msgstr ""
+msgstr "%s auf %s : %.2f Tag(e)"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
@@ -147,6 +147,8 @@ msgid ""
 "Absent Employee(s), Whose leaves request are either confirmed or validated "
 "on today"
 msgstr ""
+"Abwesende(r) Angestellte(r), deren Urlaubsantrag heute bestätigt wurde oder "
+"ab heute gültig ist"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_employee_action_from_department
@@ -167,7 +169,7 @@ msgstr "Aktiv"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Active Leaves and Allocations"
-msgstr ""
+msgstr "Derzeitige Abwesenheiten und Ansprüche"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
@@ -237,7 +239,7 @@ msgstr "Zuteilung für %s"
 #: code:addons/hr_holidays/models/hr_holidays.py:345
 #, python-format
 msgid "Allocation of %s : %.2f day(s) To %s"
-msgstr ""
+msgstr "Zuweisung von %s : %.2f Tag(e) An %s"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_allocation_to_approve_count
@@ -247,7 +249,7 @@ msgstr "Zu prüfende Urlaubsanfrage"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Allocations"
-msgstr ""
+msgstr "Urlaubsansprüche"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_department_leave_allocation_approve
@@ -384,19 +386,19 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_allocation_holidays
 msgid "Click here to create a new leave allocation request."
-msgstr ""
+msgstr "Hier klicken, um neue Urlaubsanspruchsanfrage zu erstellen."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_allocation_approve
 msgid "Click here to create a new leave allocation."
-msgstr ""
+msgstr "Hier klicken, um neuen Urlaubsanspruch zu erstellen."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_company_allocation
 #: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_approve
 #: model:ir.actions.act_window,help:hr_holidays.open_employee_leaves
 msgid "Click here to create a new leave request."
-msgstr ""
+msgstr "Hier klicken, um neuen Urlaubsantrag zu erstellen."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -474,7 +476,7 @@ msgstr "aktueller Abwesenheitstyp"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Current Year"
-msgstr ""
+msgstr "Aktuelles Jahr"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_dashboard
@@ -553,6 +555,8 @@ msgid ""
 "Filters only on allocations and requests that belong to an leave type that "
 "is 'active' (active field is True)"
 msgstr ""
+"Filter für Urlaubsansprüche und Anfragen, die 'aktiv' sind (Aktiv Feld ist "
+"angehakt)"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_first_approver_id
@@ -563,7 +567,7 @@ msgstr "Erste Genehmigung"
 #: code:addons/hr_holidays/report/holidays_summary_report.py:112
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
-msgstr ""
+msgstr "Der Inhalt fehlt; dieser Bericht kann nicht gedruckt werden."
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept_date_from
@@ -729,19 +733,20 @@ msgstr "Abwesenheitstypen"
 #: code:addons/hr_holidays/models/hr_holidays.py:450
 #, python-format
 msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
-msgstr ""
+msgstr "Der Urlaubsantrag muss bestätigt werden, um ihn zu genehmigen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:485
 #, python-format
 msgid "Leave request must be confirmed in order to approve it."
-msgstr ""
+msgstr "Der Urlaubsantrag muss bestätigt werden, um ihn zu genehmigen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:546
 #, python-format
 msgid "Leave request must be confirmed or validated in order to refuse it."
 msgstr ""
+"Der Urlaubsantrag muss bestätigt oder überprüft werden, um ihn abzulehnen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:434
@@ -749,6 +754,8 @@ msgstr ""
 msgid ""
 "Leave request must be in Draft state (\"To Submit\") in order to confirm it."
 msgstr ""
+"Der Urlaubsantrag muss sich im Entwurfszustand („Zuzustellen“) befinden, um "
+"ihn bestätigen zu können."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:419
@@ -757,6 +764,8 @@ msgid ""
 "Leave request state must be \"Refused\" or \"To Approve\" in order to reset "
 "to Draft."
 msgstr ""
+"Der Urlaubsantrag muss sich im Zustand „Abgelehnt“ oder „Zuzustimmen“ "
+"befinden, um ihn als Entwurf zurückzusetzen."
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_leave_to_approve_count
@@ -818,7 +827,7 @@ msgstr "Auswertung Urlaubskonto"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Leaves Taken:"
-msgstr ""
+msgstr "Bewilligte Urlaubstage:"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
@@ -866,17 +875,17 @@ msgstr "Urlaub/Anspruch abgelehnt"
 #. module: hr_holidays
 #: model:mail.message.subtype,name:hr_holidays.mt_department_holidays_confirmed
 msgid "Leaves/Allocations Confirmed"
-msgstr ""
+msgstr "Urlaub / Ansprüche bestätigt"
 
 #. module: hr_holidays
 #: model:mail.message.subtype,name:hr_holidays.mt_department_holidays_first_validated
 msgid "Leaves/Allocations First Approval"
-msgstr ""
+msgstr "Urlaub / Ansprüche erste Genehmigung"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves 2017"
-msgstr ""
+msgstr "Gesetzlicher Urlaub 2017"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -938,7 +947,7 @@ msgstr "Vorgesetzte"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Max Leaves:"
-msgstr ""
+msgstr "Maximaler Urlaub:"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_max_leaves
@@ -1016,7 +1025,7 @@ msgstr "Anzahl der Urlaube"
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_number_of_days_temp
 msgid ""
 "Number of days of the leave request according to your working schedule."
-msgstr ""
+msgstr "Anzahl Tage des Urlaubsantrags nach Ihren Arbeitsplänen."
 
 #. module: hr_holidays
 #: model:res.groups,name:hr_holidays.group_hr_holidays_user
@@ -1040,18 +1049,26 @@ msgid ""
 "                type (recuperation, legal leaves, sickness) and the exact\n"
 "                number of open days related to your leave."
 msgstr ""
+"Sobald Sie Ihren Urlaubsantrag aufgenommen haben, wird er an einen\n"
+" Vorgesetzten geschickt zur Überprüfung. Stellen Sie sicher, dass Sie den richtigen Urlaubstyp\n"
+" (Erholung, gesetzlicher Urlaub, Krankheit) und die genaue\n"
+" Anzahl der freien Tage für Ihren Urlaub festlegen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:487
 #, python-format
 msgid "Only an HR Manager can apply the second approval on leave requests."
 msgstr ""
+"Nur ein Personalmanager kann die zweite Genehmigung für Urlaubsanträge "
+"erteilen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:417
 #, python-format
 msgid "Only an HR Manager or the concerned employee can reset to draft."
 msgstr ""
+"Nur ein Personalmanager oder der betroffene Mitarbeiter können den Antrag "
+"als Entwurf zurücksetzen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:440
@@ -1059,12 +1076,14 @@ msgstr ""
 #, python-format
 msgid "Only an HR Officer or Manager can approve leave requests."
 msgstr ""
+"Nur ein Personalmitarbeiter oder -Manager kann Urlaubsanträge bewilligen."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:563
 #, python-format
 msgid "Only an HR Officer or Manager can refuse leave requests."
 msgstr ""
+"Nur ein Personalmitarbeiter oder -Manager kann Urlaubsanträge ablehnen."
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
@@ -1201,13 +1220,13 @@ msgstr "Zweite Genehmigung"
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Allocation"
-msgstr ""
+msgstr "Anspruch ansehen"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Leave"
-msgstr ""
+msgstr "Urlaub ansehen"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_holiday_type
@@ -1253,6 +1272,8 @@ msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
 " You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in Leaves Application to manage the leave days of the employees if the configuration does not allow to use this field."
 msgstr ""
+"Die Funktion hinter dem Feld „Verbleibender gesetzlicher Urlaub“ kann nur verwendet werden, wenn nur ein Urlaubstyp vorhanden ist und die Option „Limit überschreiben erlauben“ deaktiviert ist. (%s gefunden). Andernfalls ist das Update nicht eindeutig, da wir nicht entscheiden können, mit welchem Urlaubstyp das Update durchgeführt werden soll. \n"
+" Möglicherweise möchten Sie die klassischen Menüs „Urlaubsanträge“ und „Anspruchsanfragen“ in der Urlaubs-Anwendung verwenden, um die Abwesenheitstage der Mitarbeiter zu verwalten, wenn die Konfiguration die Verwendung dieses Feldes nicht zulässt."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -1282,6 +1303,10 @@ msgid ""
 "The status is 'Refused', when leave request is refused by manager.\n"
 "The status is 'Approved', when leave request is approved by manager."
 msgstr ""
+"Der Status wird auf „Zu Beantragen“ gesetzt, wenn eine Urlaubsanfrage neu erstellt wurde.\n"
+"Der Status ist „Zu Genehmigen“, wenn die erstellte Anfrage vom Benutzer bestätigt wurde.\n"
+"Der Status ist „Abgelehnt“, wenn die Urlaubsanfrage vom Vorgesetzten abgelehnt wird.\n"
+"Der Status ist „Genehmigt“, wenn die Urlaubsanfrage vom Vorgesetzten geprüft und genehmigt wurde."
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_first_approver_id
@@ -1305,18 +1330,24 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting > Leaves "
 "by Department."
 msgstr ""
+"Diese Farbe wird genutzt in der Statistik der Abwesenheitstage unter "
+"Statistiken > Urlaub nach Abteilungen"
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_leaves_taken
 msgid ""
 "This value is given by the sum of all leaves requests with a negative value."
 msgstr ""
+"Der Wert wird bestimmt durch die Summe aller Urlaubsanträge, die einen "
+"negativen Wert haben."
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_max_leaves
 msgid ""
 "This value is given by the sum of all leaves requests with a positive value."
 msgstr ""
+"Der Wert wird bestimmt durch die Summe aller Urlaubsanträge, die einen "
+"positiven Wert haben."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -1395,7 +1426,7 @@ msgstr "Bestätigen"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Validator"
-msgstr ""
+msgstr "Prüfer"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 4f889bc9751..d84aadbe1b9 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -152,6 +152,8 @@ msgid ""
 "Absent Employee(s), Whose leaves request are either confirmed or validated "
 "on today"
 msgstr ""
+"Employé(s) absent(s) dont la demande de congé a été confirmée ou validée "
+"aujourd'hui"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_employee_action_from_department
@@ -172,7 +174,7 @@ msgstr "Actif"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Active Leaves and Allocations"
-msgstr ""
+msgstr "Congés et allocations en cours"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
@@ -242,7 +244,7 @@ msgstr "Allocation pour %s"
 #: code:addons/hr_holidays/models/hr_holidays.py:345
 #, python-format
 msgid "Allocation of %s : %.2f day(s) To %s"
-msgstr ""
+msgstr "Allocation de %s : %.2f jour(s) jusqu'au %s"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_allocation_to_approve_count
@@ -388,12 +390,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_allocation_holidays
 msgid "Click here to create a new leave allocation request."
-msgstr ""
+msgstr "Cliquez ici pour créer une nouvelle demande d'allocation de congé."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_allocation_approve
 msgid "Click here to create a new leave allocation."
-msgstr ""
+msgstr "Cliquez ici pour créer une nouvelle allocation de congé."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_company_allocation
@@ -557,6 +559,8 @@ msgid ""
 "Filters only on allocations and requests that belong to an leave type that "
 "is 'active' (active field is True)"
 msgstr ""
+"Filtrer uniquement les demandes et les allocations correspondant à un type "
+"de congé \"actif\" (champ actif est défini sur vrai)"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_first_approver_id
@@ -736,18 +740,21 @@ msgstr "Type de congé"
 #, python-format
 msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
 msgstr ""
+"La demande de congé doit être confirmée (\"À approuver\") avant d'être "
+"approuvée."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:485
 #, python-format
 msgid "Leave request must be confirmed in order to approve it."
-msgstr ""
+msgstr "La demande de congé doit être confirmée avant d'être approuvée."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:546
 #, python-format
 msgid "Leave request must be confirmed or validated in order to refuse it."
 msgstr ""
+"La demande de congé doit être confirmée ou validée avant d'être refusée."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:434
@@ -755,6 +762,8 @@ msgstr ""
 msgid ""
 "Leave request must be in Draft state (\"To Submit\") in order to confirm it."
 msgstr ""
+"La demande de congé doit être à l'état de brouillon (\"À soumettre\") pour "
+"pouvoir être confirmée."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:419
@@ -763,6 +772,8 @@ msgid ""
 "Leave request state must be \"Refused\" or \"To Approve\" in order to reset "
 "to Draft."
 msgstr ""
+"La demande de congé doit être \"Refusée\" ou \"À approuver\" pour pouvoir "
+"être remise à l'état de brouillon."
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_leave_to_approve_count
@@ -824,7 +835,7 @@ msgstr "Résumé des congés"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Leaves Taken:"
-msgstr ""
+msgstr "Congés pris :"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
@@ -944,7 +955,7 @@ msgstr "Responsables"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Max Leaves:"
-msgstr ""
+msgstr "Jours de congés maximum :"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_max_leaves
@@ -1023,6 +1034,8 @@ msgstr "Nombre de congés"
 msgid ""
 "Number of days of the leave request according to your working schedule."
 msgstr ""
+"Nombre de jours de la demande de congé en fonction de vos horaires de "
+"travail."
 
 #. module: hr_holidays
 #: model:res.groups,name:hr_holidays.group_hr_holidays_user
@@ -1046,18 +1059,26 @@ msgid ""
 "                type (recuperation, legal leaves, sickness) and the exact\n"
 "                number of open days related to your leave."
 msgstr ""
+"Une fois votre demande de congé enregistrée, elle sera envoyée à un "
+"responsable pour validation. Assurez-vous d'avoir saisi le bon type de congé"
+" (récupération, congés légaux, maladie...) et le nombre exact de jours "
+"ouvrés correspondant à votre demande."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:487
 #, python-format
 msgid "Only an HR Manager can apply the second approval on leave requests."
 msgstr ""
+"Seul un responsable RH peut accorder la deuxième approbation d'une demande "
+"de congé."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:417
 #, python-format
 msgid "Only an HR Manager or the concerned employee can reset to draft."
 msgstr ""
+"Seul un responsable RH ou l'employé concerné peut remettre la demande à "
+"l'état de brouillon."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:440
@@ -1065,12 +1086,13 @@ msgstr ""
 #, python-format
 msgid "Only an HR Officer or Manager can approve leave requests."
 msgstr ""
+"Seul un agent ou un responsable RH peut approuver une demande de congé."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:563
 #, python-format
 msgid "Only an HR Officer or Manager can refuse leave requests."
-msgstr ""
+msgstr "Seul un agent ou un responsable RH peut refuser une demande de congé."
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
@@ -1207,13 +1229,13 @@ msgstr "Deuxième approbation"
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Allocation"
-msgstr ""
+msgstr "Voir l'allocation"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Leave"
-msgstr ""
+msgstr "Voir le congé"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_holiday_type
@@ -1259,6 +1281,8 @@ msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
 " You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in Leaves Application to manage the leave days of the employees if the configuration does not allow to use this field."
 msgstr ""
+"Le champ \"Jours de congés restants\" ne peut être utilisé que s'il n'existe qu'un seul type de congés et que l'option \"Autoriser à outrepasser la limite\" est décochée. (%s trouvé). Autrement, la mise à jour serait ambigüe car le système ne pourrait pas déterminer le type de congés devant être mis à jour.\n"
+" Si la configuration ne permet pas d'utiliser le champ précité, il est préférable de se servir des menus \"Demandes de congés\" et \"Demandes d'allocation\" dans l'application Congés pour gérer les congés des employés."
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -1288,6 +1312,10 @@ msgid ""
 "The status is 'Refused', when leave request is refused by manager.\n"
 "The status is 'Approved', when leave request is approved by manager."
 msgstr ""
+"Lorsqu'une demande de congé est créée, son état est défini sur \"À soumettre\".\n"
+"Lorsque la demande est confirmée par l'utilisateur, son état passe à \"À approuver\".\n"
+"Lorsque la demande est refusée par un responsable, son état passe à \"Refusée\".\n"
+"Lorsque la demande est approuvée par un responsable, son état passe à \"Approuvée\"."
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_first_approver_id
@@ -1312,18 +1340,24 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting > Leaves "
 "by Department."
 msgstr ""
+"Cette couleur sera utilisée dans le rapport récapitulatif des congés, "
+"accessible à partir de Rapports > Congés par département."
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_leaves_taken
 msgid ""
 "This value is given by the sum of all leaves requests with a negative value."
 msgstr ""
+"Cette valeur est calculée en faisant la somme de toutes les demandes de "
+"congé dont la valeur est négative."
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_max_leaves
 msgid ""
 "This value is given by the sum of all leaves requests with a positive value."
 msgstr ""
+"Cette valeur est calculée en faisant la somme de toutes les demandes de "
+"congé dont la valeur est positive."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -1401,7 +1435,7 @@ msgstr "Valider"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Validator"
-msgstr ""
+msgstr "Validateur"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index f32065ad940..d64906fe5a1 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # liAnGjiA <liangjia@qq.com>, 2017
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -57,13 +58,13 @@ msgstr "%g剩余%g"
 #: code:addons/hr_holidays/models/hr_holidays.py:341
 #, python-format
 msgid "%s : %.2f day(s)"
-msgstr ""
+msgstr "%：%.2f 天"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:343
 #, python-format
 msgid "%s on %s : %.2f day(s)"
-msgstr ""
+msgstr "% 上的%s  : %.2f day(s)"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
@@ -224,7 +225,7 @@ msgstr "%s 的分配"
 #: code:addons/hr_holidays/models/hr_holidays.py:345
 #, python-format
 msgid "Allocation of %s : %.2f day(s) To %s"
-msgstr ""
+msgstr "% 的分配：%.2f 天至 %s"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_allocation_to_approve_count
@@ -368,19 +369,19 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_allocation_holidays
 msgid "Click here to create a new leave allocation request."
-msgstr ""
+msgstr "点击此处创建一个新的休假分配申请。"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_allocation_approve
 msgid "Click here to create a new leave allocation."
-msgstr ""
+msgstr "点击此处创建一个新的休假分配。"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_company_allocation
 #: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_approve
 #: model:ir.actions.act_window,help:hr_holidays.open_employee_leaves
 msgid "Click here to create a new leave request."
-msgstr ""
+msgstr "点击此处创建一个新的休假申请。"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -536,7 +537,7 @@ msgstr "结束日期"
 msgid ""
 "Filters only on allocations and requests that belong to an leave type that "
 "is 'active' (active field is True)"
-msgstr ""
+msgstr "筛选只限于休假类型是“有效”(有效字段值为真)的分配以及申请"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_first_approver_id
@@ -706,26 +707,26 @@ msgstr "休假类型"
 #: code:addons/hr_holidays/models/hr_holidays.py:450
 #, python-format
 msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
-msgstr ""
+msgstr "必须确认休假申请（“待批准”），以便批准申请，。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:485
 #, python-format
 msgid "Leave request must be confirmed in order to approve it."
-msgstr ""
+msgstr "必须确认休假申请，以便批准申请。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:546
 #, python-format
 msgid "Leave request must be confirmed or validated in order to refuse it."
-msgstr ""
+msgstr "休假申请必须确认或验证，以便拒绝申请。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:434
 #, python-format
 msgid ""
 "Leave request must be in Draft state (\"To Submit\") in order to confirm it."
-msgstr ""
+msgstr "休假申请必须是“草拟”状态（“待提交”），以便确认申请。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:419
@@ -733,7 +734,7 @@ msgstr ""
 msgid ""
 "Leave request state must be \"Refused\" or \"To Approve\" in order to reset "
 "to Draft."
-msgstr ""
+msgstr "休假申请必须是“拒绝”或“待批准”状态，以便重新设置为草拟状态。"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_leave_to_approve_count
@@ -795,7 +796,7 @@ msgstr "休假摘要"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Leaves Taken:"
-msgstr ""
+msgstr "进行休假："
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
@@ -853,7 +854,7 @@ msgstr "休假/分配 一级批准"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves 2017"
-msgstr ""
+msgstr "2017 年的法定休假"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -915,7 +916,7 @@ msgstr "管理员"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
 msgid "Max Leaves:"
-msgstr ""
+msgstr "最长的休假是："
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_max_leaves
@@ -991,7 +992,7 @@ msgstr "休假天数"
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_number_of_days_temp
 msgid ""
 "Number of days of the leave request according to your working schedule."
-msgstr ""
+msgstr "根据您的工作安排，申请休假天数。"
 
 #. module: hr_holidays
 #: model:res.groups,name:hr_holidays.group_hr_holidays_user
@@ -1013,31 +1014,35 @@ msgid ""
 "                type (recuperation, legal leaves, sickness) and the exact\n"
 "                number of open days related to your leave."
 msgstr ""
+"如果休假申请已记录，该申请将发送 \n"
+" 给经理进行验证。确定休假的 \n"
+" 正确类型（康复期、法定休假、病假）和与休假相关的确切 \n"
+" 的开放天数。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:487
 #, python-format
 msgid "Only an HR Manager can apply the second approval on leave requests."
-msgstr ""
+msgstr "仅人力资源经理可以在休假申请上应用第二种批准方式。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:417
 #, python-format
 msgid "Only an HR Manager or the concerned employee can reset to draft."
-msgstr ""
+msgstr "仅人力资源经理或相关的雇员可以重新设置以便进行起草。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:440
 #: code:addons/hr_holidays/models/hr_holidays.py:476
 #, python-format
 msgid "Only an HR Officer or Manager can approve leave requests."
-msgstr ""
+msgstr "仅人力资源主管或经理可以批准休假申请。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:563
 #, python-format
 msgid "Only an HR Officer or Manager can refuse leave requests."
-msgstr ""
+msgstr "仅人力资源主管或经理可以拒绝休假申请。"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
@@ -1174,13 +1179,13 @@ msgstr "第二次审批"
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Allocation"
-msgstr ""
+msgstr "请查看分配"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/models/hr_holidays.py:607
 #, python-format
 msgid "See Leave"
-msgstr ""
+msgstr "请查看休假"
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_holiday_type
@@ -1226,6 +1231,8 @@ msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
 " You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in Leaves Application to manage the leave days of the employees if the configuration does not allow to use this field."
 msgstr ""
+"“剩余法定休假”字段后的功能仅在一种休假类型中使用，该类型休假的选项未锁定“允许覆盖限制”（%发现）。否则，更新是含糊不清的因为我们无法确定何种休假类型已经更新完毕。\n"
+" 如果在该领域不允许使用配置，您可能更喜欢使用位于休假申请中的经典菜单“休假请求”和“分配请求”，以便管理雇员的休假天数。"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -1255,6 +1262,10 @@ msgid ""
 "The status is 'Refused', when leave request is refused by manager.\n"
 "The status is 'Approved', when leave request is approved by manager."
 msgstr ""
+"创建休假申请时，状态设置为“待提交”。\n"
+" 当由用户确认休假申请时，状态为“待批准”。\n"
+" 当经理拒绝休假申请时，状态为“已拒绝”。\n"
+" 当经理批准休假申请时，状态为“已批准”。"
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_first_approver_id
@@ -1273,19 +1284,19 @@ msgstr "这个地方是自动填充的谁第二次生效这准假。（如果要
 msgid ""
 "This color will be used in the leaves summary located in Reporting > Leaves "
 "by Department."
-msgstr ""
+msgstr "这种颜色会用于位于报告的休假概要上> 部门休假上 。"
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_leaves_taken
 msgid ""
 "This value is given by the sum of all leaves requests with a negative value."
-msgstr ""
+msgstr "这值是给出休假申请的总和，它是一个负数。"
 
 #. module: hr_holidays
 #: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_max_leaves
 msgid ""
 "This value is given by the sum of all leaves requests with a positive value."
-msgstr ""
+msgstr "这值是给出休假申请的总和，它是一个正数。"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -1360,7 +1371,7 @@ msgstr "验证"
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 msgid "Validator"
-msgstr ""
+msgstr "验证者"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_maintenance/__manifest__.py b/addons/hr_maintenance/__manifest__.py
index 71be2347203..5554d8e2dec 100644
--- a/addons/hr_maintenance/__manifest__.py
+++ b/addons/hr_maintenance/__manifest__.py
@@ -14,5 +14,5 @@
     ],
     'demo': [],
     'installable': True,
-    'auto-install': True,
+    'auto_install': True,
 }
diff --git a/addons/hr_org_chart/i18n/de.po b/addons/hr_org_chart/i18n/de.po
index 59814cf5c79..da2f719a109 100644
--- a/addons/hr_org_chart/i18n/de.po
+++ b/addons/hr_org_chart/i18n/de.po
@@ -5,13 +5,14 @@
 # Translators:
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,14 +25,14 @@ msgstr ""
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
 #, python-format
 msgid "Direct Subordinates of %s"
-msgstr ""
+msgstr "Direkte Unterstellte von %s"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:126
 #, python-format
 msgid "Direct subordinates"
-msgstr ""
+msgstr "Direkte Unterstellte"
 
 #. module: hr_org_chart
 #: model:ir.model,name:hr_org_chart.model_hr_employee
@@ -44,51 +45,53 @@ msgstr "Mitarbeiter"
 #, python-format
 msgid "In order to get an organigram, set a manager and save the record."
 msgstr ""
+"Um ein Organigramm zu erhalten, legen Sie einen Vorgesetzten fest und "
+"speichern Sie das Protokoll."
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
 #, python-format
 msgid "Indirect Subordinates of %s"
-msgstr ""
+msgstr "Indirekte Unterstellte von %s"
 
 #. module: hr_org_chart
 #: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
 msgid "Indirect Surbordinates Count"
-msgstr ""
+msgstr "Anzahl indirekte Unterstellte"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:136
 #, python-format
 msgid "Indirect subordinates"
-msgstr ""
+msgstr "Indirekte Unterstellte"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
 #, python-format
 msgid "No hierarchy position."
-msgstr ""
+msgstr "Keine Hierarchieposition."
 
 #. module: hr_org_chart
 #: model:ir.ui.view,arch_db:hr_org_chart.hr_employee_view_form_inherit_org_chart
 msgid "Organization Chart"
-msgstr ""
+msgstr "Organisations-Charta"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
 #, python-format
 msgid "Subordinates of %s"
-msgstr ""
+msgstr "Unterstellte von %s"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:88
 #, python-format
 msgid "This employee has no manager or subordinate."
-msgstr ""
+msgstr "Dieser Mitarbeiter hat keinen Vorgesetzten oder Unterstellten."
 
 #. module: hr_org_chart
 #. openerp-web
diff --git a/addons/hr_org_chart/i18n/fr.po b/addons/hr_org_chart/i18n/fr.po
index 402e6e37553..c698730737c 100644
--- a/addons/hr_org_chart/i18n/fr.po
+++ b/addons/hr_org_chart/i18n/fr.po
@@ -5,13 +5,14 @@
 # Translators:
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -24,14 +25,14 @@ msgstr ""
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
 #, python-format
 msgid "Direct Subordinates of %s"
-msgstr ""
+msgstr "Subordonnés directs de %s"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:126
 #, python-format
 msgid "Direct subordinates"
-msgstr ""
+msgstr "Subordonnés directs"
 
 #. module: hr_org_chart
 #: model:ir.model,name:hr_org_chart.model_hr_employee
@@ -44,51 +45,52 @@ msgstr "Employé"
 #, python-format
 msgid "In order to get an organigram, set a manager and save the record."
 msgstr ""
+"Afin d'obtenir un organigramme, ajoutez un responsable et enregistrez."
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
 #, python-format
 msgid "Indirect Subordinates of %s"
-msgstr ""
+msgstr "Subordonnés indirects de %s"
 
 #. module: hr_org_chart
 #: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
 msgid "Indirect Surbordinates Count"
-msgstr ""
+msgstr "Nombre de subordonnés indirects"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:136
 #, python-format
 msgid "Indirect subordinates"
-msgstr ""
+msgstr "Subordonnés indirects"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
 #, python-format
 msgid "No hierarchy position."
-msgstr ""
+msgstr "Aucune position hiérarchique."
 
 #. module: hr_org_chart
 #: model:ir.ui.view,arch_db:hr_org_chart.hr_employee_view_form_inherit_org_chart
 msgid "Organization Chart"
-msgstr ""
+msgstr "Organigramme"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
 #, python-format
 msgid "Subordinates of %s"
-msgstr ""
+msgstr "Subordonnés de %s"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:88
 #, python-format
 msgid "This employee has no manager or subordinate."
-msgstr ""
+msgstr "Cet employé n'a pas de responsable ni de subordonné."
 
 #. module: hr_org_chart
 #. openerp-web
diff --git a/addons/hr_org_chart/i18n/zh_CN.po b/addons/hr_org_chart/i18n/zh_CN.po
index bd0c8583570..4d4ac402919 100644
--- a/addons/hr_org_chart/i18n/zh_CN.po
+++ b/addons/hr_org_chart/i18n/zh_CN.po
@@ -3,7 +3,7 @@
 # * hr_org_chart
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Tison He <hedisen@sina.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Xu Lei <xulei8@qq.com>, 2017
 msgid ""
@@ -25,14 +25,14 @@ msgstr ""
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
 #, python-format
 msgid "Direct Subordinates of %s"
-msgstr "直接下属 %s"
+msgstr "%s的直接下属"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:126
 #, python-format
 msgid "Direct subordinates"
-msgstr ""
+msgstr "直接下属"
 
 #. module: hr_org_chart
 #: model:ir.model,name:hr_org_chart.model_hr_employee
@@ -44,52 +44,52 @@ msgstr "员工"
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:89
 #, python-format
 msgid "In order to get an organigram, set a manager and save the record."
-msgstr ""
+msgstr "为了获取组织图，请设置一个上司然后保存"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
 #, python-format
 msgid "Indirect Subordinates of %s"
-msgstr ""
+msgstr "%s的非直接下属"
 
 #. module: hr_org_chart
 #: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
 msgid "Indirect Surbordinates Count"
-msgstr ""
+msgstr "非直接下属数量"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:136
 #, python-format
 msgid "Indirect subordinates"
-msgstr ""
+msgstr "非直接下属"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
 #, python-format
 msgid "No hierarchy position."
-msgstr ""
+msgstr "没有层级位置"
 
 #. module: hr_org_chart
 #: model:ir.ui.view,arch_db:hr_org_chart.hr_employee_view_form_inherit_org_chart
 msgid "Organization Chart"
-msgstr ""
+msgstr "组织图表"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
 #, python-format
 msgid "Subordinates of %s"
-msgstr ""
+msgstr "%s的下属"
 
 #. module: hr_org_chart
 #. openerp-web
 #: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:88
 #, python-format
 msgid "This employee has no manager or subordinate."
-msgstr ""
+msgstr "该员工没有上司或下属"
 
 #. module: hr_org_chart
 #. openerp-web
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 2f613da97c7..f0ba85fab57 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -5,25 +5,26 @@
 # Translators:
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: DE R1 <e2fes1@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,6 +49,13 @@ msgid ""
 "                \n"
 "* When user cancel payslip the status is 'Rejected'."
 msgstr ""
+"* Durch Erstellung einer Lohnabrechnung ist der Status zunächst 'Entwurf'.\n"
+" \n"
+"* Während der Prüfung ist der Status zwischenzeitlich 'Wartend'.\n"
+" \n"
+"* Wenn die Lohnabrechnung genehmigt wurde, ist der Status 'Erledigt'.\n"
+" \n"
+"* Wenn die Lohnabrechnung abgebrochen wird ist der Status 'Abgelehnt'."
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.report_payslip
@@ -136,6 +144,9 @@ msgid ""
 "            payment of the employees. It can be the social security, the\n"
 "            estate or anyone that collect or inject money on payslips."
 msgstr ""
+"Ein Beitragsregister ist ein Dritter, der an der Lohnzahlung\n"
+" der Arbeitnehmer beteiligt ist. Es kann sich um die Sozialversicherung, das\n"
+" Vermögen oder eine beliebige Person, die Gelder zu Lohnbescheinigungen hinzufügt handeln."
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
@@ -162,7 +173,7 @@ msgstr "Interne Anmerkung hinzufügen ..."
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.hr_contract_advantage_template_view_form
 msgid "Advantage Name"
-msgstr ""
+msgstr "Vorteilsname"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
@@ -215,7 +226,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_be_hr_payroll
 msgid "Belgium Payroll"
-msgstr ""
+msgstr "Belgien-Lohnabrechnung"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -246,7 +257,7 @@ msgstr "Lohnberechnung abbrechen"
 #: code:addons/hr_payroll/models/hr_payslip.py:98
 #, python-format
 msgid "Cannot cancel a payslip that is done."
-msgstr ""
+msgstr "Eine bereits erstellte Lohnabrechnung kann nicht storniert werden."
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id
@@ -280,7 +291,7 @@ msgstr "Definition von Abhängigkeiten"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Choose a Payroll Localization"
-msgstr ""
+msgstr "Wählen Sie eine Lohnabrechnungslokalisierung"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
@@ -311,7 +322,7 @@ msgstr "Code"
 #: model:ir.ui.view,arch_db:hr_payroll.hr_payroll_structure_view_kanban
 #: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_view_kanban
 msgid "Code:"
-msgstr ""
+msgstr "Code:"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
@@ -376,7 +387,7 @@ msgstr "Arbeitsvertrag"
 #: model:ir.actions.act_window,name:hr_payroll.hr_contract_advantage_template_action
 #: model:ir.ui.menu,name:hr_payroll.hr_contract_advantage_template_menu_action
 msgid "Contract Advantage Templates"
-msgstr ""
+msgstr "Vertragsbegünstigungsvorlagen"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.hr_contribution_register_form
@@ -461,12 +472,12 @@ msgstr "Datum bis"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_default_value
 msgid "Default value for this advantage"
-msgstr ""
+msgstr "Standardwert für diesen Vorteil"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_schedule_pay
 msgid "Defines the frequency of the wage payment."
-msgstr ""
+msgstr "Definiert die Häufigkeit der Lohnzahlung."
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_struct_id
@@ -586,7 +597,7 @@ msgstr "Mitarbeiter-Lohnabrechnung"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_advantage_template
 msgid "Employee's Advantage on Contract"
-msgstr ""
+msgstr "Vertraglicher Vorteil des Mitarbeiters"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_employee_ids
@@ -626,7 +637,7 @@ msgstr "zB 50.0 für 50%"
 #: code:addons/hr_payroll/report/report_contribution_register.py:34
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
-msgstr ""
+msgstr "Der Inhalt fehlt; dieser Bericht kann nicht gedruckt werden."
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_fr_hr_payroll
@@ -738,6 +749,10 @@ msgid ""
 "for Meal Voucher having fixed amount of 1€ per worked day can have its "
 "quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
+"Wird zur Berechnung für prozentuale und feste Beträge verwendet. Wenn Sie "
+"beispielsweise eine Regel für Essensgutscheine mit einem festen Betrag von 1"
+" € pro gearbeitetem Tag festgelegt haben, kann diese Menge in einem Ausdruck"
+" wie work_days.WORK100.number_of_days definiert werden."
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_input_amount
@@ -814,12 +829,12 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower Bound"
-msgstr ""
+msgstr "Untere Begrenzung"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "Untere Begrenzung genehmigt durch den Arbeitgeber für diesen Vorteil"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_paid
@@ -970,12 +985,12 @@ msgstr "Personalabrechnung"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Entries"
-msgstr ""
+msgstr "Einträge für Lohnabrechnung"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Rules"
-msgstr ""
+msgstr "Lohnabrechnungsregeln"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_structure_filter
@@ -985,7 +1000,7 @@ msgstr "Lohnkonto Strukturen"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll rules that apply to your country"
-msgstr ""
+msgstr "Lohnabrechnungsregeln für Ihr Land"
 
 #. module: hr_payroll
 #: model:ir.actions.report,name:hr_payroll.action_report_payslip
@@ -1050,7 +1065,7 @@ msgstr "Bezeichnung Gehaltsabrechnung"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_run
 msgid "Payslip Run"
-msgstr ""
+msgstr "Lohnabrechnungslauf"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
@@ -1106,7 +1121,7 @@ msgstr "Periode"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Post payroll slips in accounting"
-msgstr ""
+msgstr "Lohnabrechnungen in Buchhaltung einfügen"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_payslip_lines_contribution_register
@@ -1419,12 +1434,12 @@ msgstr "Gesamt Arbeitstage"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper Bound"
-msgstr ""
+msgstr "Obere Begrenzung"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "Obere Begrenzung genehmigt durch den Arbeitgeber für diesen Vorteil"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence
@@ -1515,6 +1530,8 @@ msgstr ""
 #, python-format
 msgid "You must set a contract to create a payslip line."
 msgstr ""
+"Sie müssen einen Vertrag festlegen, um eine Lohnabrechnungszeile zu "
+"erstellen."
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index 79abda954ed..1f64a055ed7 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Friderici Claude <claude@friderici.org>, 2016
+# Martin Trigaux, 2016
+# Friderici Claude, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -21,13 +21,14 @@
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -144,6 +145,9 @@ msgid ""
 "            payment of the employees. It can be the social security, the\n"
 "            estate or anyone that collect or inject money on payslips."
 msgstr ""
+"Un registre de contribution est une partie tierce impliquée dans le paiement"
+" des salaires des employés. Cela peut être la sécurité sociale, l'État ou "
+"toute personne qui collecte ou verse de l'argent dans les bulletins de paie."
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
@@ -170,7 +174,7 @@ msgstr "Ajouter une note interne…"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.hr_contract_advantage_template_view_form
 msgid "Advantage Name"
-msgstr ""
+msgstr "Nom de l'avantage"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
@@ -254,7 +258,7 @@ msgstr "Annuler la fiche de paie"
 #: code:addons/hr_payroll/models/hr_payslip.py:98
 #, python-format
 msgid "Cannot cancel a payslip that is done."
-msgstr ""
+msgstr "Impossible d'annuler un bulletin de paie terminé."
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id
@@ -319,7 +323,7 @@ msgstr "Code"
 #: model:ir.ui.view,arch_db:hr_payroll.hr_payroll_structure_view_kanban
 #: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_view_kanban
 msgid "Code:"
-msgstr ""
+msgstr "Code :"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
@@ -384,7 +388,7 @@ msgstr "Contrat"
 #: model:ir.actions.act_window,name:hr_payroll.hr_contract_advantage_template_action
 #: model:ir.ui.menu,name:hr_payroll.hr_contract_advantage_template_menu_action
 msgid "Contract Advantage Templates"
-msgstr ""
+msgstr "Modèles d'avantages de contrat"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.hr_contribution_register_form
@@ -469,12 +473,12 @@ msgstr "Date de fin"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_default_value
 msgid "Default value for this advantage"
-msgstr ""
+msgstr "Valeur par défaut pour cet avantage"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_schedule_pay
 msgid "Defines the frequency of the wage payment."
-msgstr ""
+msgstr "Définit la fréquence de paiement du salaire."
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_struct_id
@@ -596,7 +600,7 @@ msgstr "Bulletins de l'employé"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_advantage_template
 msgid "Employee's Advantage on Contract"
-msgstr ""
+msgstr "Avantage sur le contrat de l'employé"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_employee_ids
@@ -752,6 +756,10 @@ msgid ""
 "for Meal Voucher having fixed amount of 1€ per worked day can have its "
 "quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
+"Utilisé dans le calcul du montant en pourcentage et en valeur. Par exemple, "
+"dans le cas d'une règle pour une indemnité de repas ayant un montant fixe de"
+" 1 € par jour travaillé, la quantité peut être définie à l'aide d'une "
+"expression de type worked_days.WORK100.number_of_days."
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_input_amount
@@ -830,12 +838,12 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower Bound"
-msgstr ""
+msgstr "Limite inférieure"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "La limite inférieure autorisée par l'employeur pour cet avantage"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_paid
@@ -1066,7 +1074,7 @@ msgstr "Nom de bulletin de paie"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_run
 msgid "Payslip Run"
-msgstr ""
+msgstr "Création des bulletins de paie"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
@@ -1122,7 +1130,7 @@ msgstr "Période"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Post payroll slips in accounting"
-msgstr ""
+msgstr "Transmettre les bulletins de paie au service comptabilité"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_payslip_lines_contribution_register
@@ -1438,12 +1446,12 @@ msgstr "Nb. jours travaillés"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper Bound"
-msgstr ""
+msgstr "Limite supérieure"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "La limite supérieure autorisée par l'employeur pour cet avantage"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence
@@ -1536,6 +1544,7 @@ msgstr ""
 #, python-format
 msgid "You must set a contract to create a payslip line."
 msgstr ""
+"Vous devez définir un contrat pour créer une ligne de bulletin de paie."
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 3a9bb85de36..0c192b55d62 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # Martin Trigaux, 2016
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,6 +40,13 @@ msgid ""
 "                \n"
 "* When user cancel payslip the status is 'Rejected'."
 msgstr ""
+"* 当工资单创建时状态为“草稿“ \n"
+" \n"
+" * 如果工资单待审批时, 状态为“等待中“。\n"
+" \n"
+" * 如果工资单被确认后状态为 “已完成”。\n"
+" \n"
+" * 当用户取消工资单时状态为”取消“。"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.report_payslip
@@ -127,6 +135,9 @@ msgid ""
 "            payment of the employees. It can be the social security, the\n"
 "            estate or anyone that collect or inject money on payslips."
 msgstr ""
+"缴费注册是参与雇员工资 \n"
+" 支付的第三方。有可能是社会保障、\n"
+" 不动产或在工资单中收集或注入资金的任何人。"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
@@ -204,7 +215,7 @@ msgstr "如果表达式为真，适用这个规则。你可以输入条件，例
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings_module_l10n_be_hr_payroll
 msgid "Belgium Payroll"
-msgstr ""
+msgstr "比利时工资表"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -269,7 +280,7 @@ msgstr "下级定义"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Choose a Payroll Localization"
-msgstr ""
+msgstr "选择工资本地化"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
@@ -300,7 +311,7 @@ msgstr "代号"
 #: model:ir.ui.view,arch_db:hr_payroll.hr_payroll_structure_view_kanban
 #: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_view_kanban
 msgid "Code:"
-msgstr ""
+msgstr "代码："
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
@@ -365,7 +376,7 @@ msgstr "合约"
 #: model:ir.actions.act_window,name:hr_payroll.hr_contract_advantage_template_action
 #: model:ir.ui.menu,name:hr_payroll.hr_contract_advantage_template_menu_action
 msgid "Contract Advantage Templates"
-msgstr ""
+msgstr "合同优势模板"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.hr_contribution_register_form
@@ -450,12 +461,12 @@ msgstr "结束日期"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_default_value
 msgid "Default value for this advantage"
-msgstr ""
+msgstr "该优势的默认值"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_schedule_pay
 msgid "Defines the frequency of the wage payment."
-msgstr ""
+msgstr "定义工资支付的频率。"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_struct_id
@@ -573,7 +584,7 @@ msgstr "员工工资单"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_advantage_template
 msgid "Employee's Advantage on Contract"
-msgstr ""
+msgstr "雇员在合同中的优势"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees_employee_ids
@@ -722,6 +733,8 @@ msgid ""
 "for Meal Voucher having fixed amount of 1€ per worked day can have its "
 "quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
+"用于百分比和固定金额计算。例如，餐券在每个工作日得到固定 1 "
+"欧元的规则可以在表达式中定义数量，如下所示：worked_days.WORK100.number_of_days。"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_input_amount
@@ -796,12 +809,12 @@ msgstr "薪资类别的父级类别只用于报告目的"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower Bound"
-msgstr ""
+msgstr "下限"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_lower_bound
 msgid "Lower bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "雇主针对该优势的授权下限"
 
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_paid
@@ -952,12 +965,12 @@ msgstr "工资表"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Entries"
-msgstr ""
+msgstr "薪资条目"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll Rules"
-msgstr ""
+msgstr "薪资规则"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_structure_filter
@@ -967,7 +980,7 @@ msgstr "工资表结构"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Payroll rules that apply to your country"
-msgstr ""
+msgstr "适用于贵国的薪资规则"
 
 #. module: hr_payroll
 #: model:ir.actions.report,name:hr_payroll.action_report_payslip
@@ -1088,7 +1101,7 @@ msgstr "会计期间"
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
 msgid "Post payroll slips in accounting"
-msgstr ""
+msgstr "在会计账簿中发布工资单"
 
 #. module: hr_payroll
 #: model:ir.ui.view,arch_db:hr_payroll.view_payslip_lines_contribution_register
@@ -1395,12 +1408,12 @@ msgstr "工作天数总计"
 #. module: hr_payroll
 #: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper Bound"
-msgstr ""
+msgstr "上限"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_upper_bound
 msgid "Upper bound authorized by the employer for this advantage"
-msgstr ""
+msgstr "雇主针对该优势的授权上限"
 
 #. module: hr_payroll
 #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence
@@ -1485,7 +1498,7 @@ msgstr "您必须选择员工以生成工资单。"
 #: code:addons/hr_payroll/models/hr_payslip.py:517
 #, python-format
 msgid "You must set a contract to create a payslip line."
-msgstr ""
+msgstr "您必须设置一份合同以便创建工资核算单。"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule
diff --git a/addons/hr_payroll/views/hr_salary_rule_views.xml b/addons/hr_payroll/views/hr_salary_rule_views.xml
index 4de4538f76d..41571aec0ed 100644
--- a/addons/hr_payroll/views/hr_salary_rule_views.xml
+++ b/addons/hr_payroll/views/hr_salary_rule_views.xml
@@ -254,7 +254,7 @@
           </p><p>
             A contribution register is a third party involved in the salary
             payment of the employees. It can be the social security, the
-            estate or anyone that collect or inject money on payslips.
+            state or anyone that collect or inject money on payslips.
           </p>
         </field>
     </record>
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index 08ec4871626..72b41a1f635 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +93,7 @@ msgstr "Vergütungsposition"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
 msgid "Payslip Run"
-msgstr ""
+msgstr "Lohnabrechnungslauf"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/models/hr_payroll_account.py:64
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index 23149fc79c9..6364481c594 100644
--- a/addons/hr_payroll_account/i18n/fr.po
+++ b/addons/hr_payroll_account/i18n/fr.po
@@ -3,16 +3,17 @@
 # * hr_payroll_account
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# Martin Trigaux, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -92,7 +93,7 @@ msgstr "Ligne de bulletin de salaire"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
 msgid "Payslip Run"
-msgstr ""
+msgstr "Création des bulletins de paie"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/models/hr_payroll_account.py:64
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index 703fe3d69c3..75deb15615b 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -628,7 +628,7 @@ msgstr "Alias-Modell"
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ_all_app
 msgid "All Applications"
-msgstr ""
+msgstr "Alle Anwendungen"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant
@@ -687,6 +687,9 @@ msgid ""
 "            If you install the document management modules, all resumes are indexed automatically,\n"
 "            so that you can easily search through their content."
 msgstr ""
+"Bewerber mitsamt angehängtem Lebenslauf werden bei Empfang einer E-Mail automatisch erstellt.\n"
+"            Wenn Sie das Dokumentenmanagement mitinstallieren, werden alle Bewerbungen automatisch indiziert,\n"
+"            damit Sie einfach den kompletten Inhalt durchsuchen können."
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
@@ -744,7 +747,7 @@ msgstr "Dateianhänge"
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_template_id
 msgid "Automated Email"
-msgstr ""
+msgstr "Automatische E-Mail-Adresse"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_availability
@@ -785,7 +788,7 @@ msgstr "Kategorien Bewerber"
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
 msgid "Click here to create a new job position."
-msgstr ""
+msgstr "Klicken Sie hier, um einen neuen Job zu erstellen."
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee
@@ -878,7 +881,7 @@ msgstr "Mitarbeiter anlegen"
 #: model:ir.actions.act_window,name:hr_recruitment.create_job_simple
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
 msgid "Create a Job Position"
-msgstr ""
+msgstr "Einen Job erstellen"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_source_tree
@@ -890,6 +893,8 @@ msgstr "Alias erstellen"
 msgid ""
 "Create some aliases that will allow you to track where applicants come from."
 msgstr ""
+"Erstellen Sie einige Aliasnamen, mit denen Sie herausfinden können, wo die "
+"Bewerber herkommen."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_create_uid
@@ -922,7 +927,7 @@ msgstr "Erstellungswoche"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_action_activity
 msgid "Currently there are not any activity scheduled."
-msgstr ""
+msgstr "Derzeit sind keine Aktivitäten geplant."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_day_close
@@ -1245,7 +1250,7 @@ msgstr "Anfängliche Qualifikation"
 #: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Interview Forms"
-msgstr ""
+msgstr "Vorstellungsgesprächsarten"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/models/hr_job.py:94
@@ -1258,12 +1263,12 @@ msgstr "Arbeitsstelle"
 #. module: hr_recruitment
 #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations
 msgid "Job Application Confirmation: ${object.job_id.name | safe}"
-msgstr ""
+msgstr "Job-Bewerbungsbestätigung: ${object.job_id.name | safe}"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_pivot_view_job
 msgid "Job Applications"
-msgstr ""
+msgstr "Job-Bewerbungen"
 
 #. module: hr_recruitment
 #: model:utm.campaign,name:hr_recruitment.utm_campaign_job
@@ -1273,7 +1278,7 @@ msgstr "Stellenanzeige"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
 msgid "Job Email"
-msgstr ""
+msgstr "Job-E-Mail"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_job_id
@@ -1311,12 +1316,12 @@ msgstr "Arbeitsstellen"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Job Posting"
-msgstr ""
+msgstr "Job-Posting"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_job_id
 msgid "Job Specific"
-msgstr ""
+msgstr "Job-Spezifik"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
@@ -1406,12 +1411,12 @@ msgstr "Meine Aktivitäten"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
 msgid "My Applications"
-msgstr ""
+msgstr "Meine Bewerbungen"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_action_activity
 msgid "My Next Activities"
-msgstr ""
+msgstr "Meine nächsten Aktivitäten"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_name
@@ -1485,7 +1490,7 @@ msgstr "Kein Betreff"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
 msgid "No document yet."
-msgstr ""
+msgstr "Noch kein Dokument."
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -1500,7 +1505,7 @@ msgstr "Anzahl der Anhänge"
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_delay_close
 msgid "Number of days to close"
-msgstr ""
+msgstr "Anzahl der Tage zum Schließen"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_applications
@@ -1523,7 +1528,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
 msgid "Offer"
-msgstr ""
+msgstr "Angebot"
 
 #. module: hr_recruitment
 #: model:res.groups,name:hr_recruitment.group_hr_recruitment_user
@@ -1536,6 +1541,8 @@ msgid ""
 "Once a job position is created, you can track related applications\n"
 "              and manage the recruitment process."
 msgstr ""
+"Sobald ein Job erstellt wurde, können Sie darauf bezogene Bewerbungen\n"
+"              verfolgen und den Rekrutierungsprozess verwalten."
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
@@ -1544,17 +1551,20 @@ msgid ""
 "                  and manage the recruitment process related to the job\n"
 "                  position."
 msgstr ""
+"obald ein Job erstellt wurde, können Sie darauf bezogene Bewerber\n"
+"                  verfolgen und den Rekrutierungsprozess für diesen Job\n"
+"                  verwalten"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
 msgid "Ongoing"
-msgstr ""
+msgstr "Fortgehend"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_website_hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Online Posting"
-msgstr ""
+msgstr "Online-Posting"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_job_alias_force_thread_id
@@ -1596,7 +1606,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id
 msgid "Person responsible of validating the employee's contracts."
-msgstr ""
+msgstr "Person, die die Validierung der Verträge der Mitarbeiter durchführt."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone
@@ -1634,7 +1644,7 @@ msgstr "Vorgeschlagene ausserordentliche Bezüge"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Publish available jobs on your website"
-msgstr ""
+msgstr "Veröffentlichen Sie verfügbare Jobs auf Ihrer Website"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_alias_force_thread_id
@@ -1701,7 +1711,7 @@ msgstr "Verworfen"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
 msgid "Reopen Application"
-msgstr ""
+msgstr "Anwendung erneut öffnen"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.report_hr_recruitment
@@ -1813,6 +1823,8 @@ msgstr "Bewerberherkunft"
 #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id
 msgid "Specific job that uses this stage. Other jobs will not use this stage."
 msgstr ""
+"Spezifischer Job, der diese Phase verwendet. Andere Jobs werden diese Phase "
+"nicht verwenden."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_stage_id
@@ -1940,6 +1952,8 @@ msgid ""
 "These aliases can be emails or urls for every source. When the applicant "
 "arrives here through one of these you'll know where he came from."
 msgstr ""
+"Diese Aliasnamen können E-Mails oder URLs für jede Quelle sein. Wenn der "
+"Bewerber über eines von diesen hierhin gelangt, wissen Sie, woher er kommt."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_email_cc
@@ -1970,6 +1984,10 @@ msgid ""
 "                files so that you can search keywords from the content of these\n"
 "                files."
 msgstr ""
+"Mit diesem Menü finden Sie weitere Lebensläufe und Anschreiben.\n"
+"                 Odoo indexiert automatisch. .PDF, .DOC, DOCX, .TXT\n"
+"                Dateien, damit Sie Schlüsselwörter aus den Inhalten dieser\n"
+"                Dateien suchen können."
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_fold
@@ -1993,6 +2011,8 @@ msgid ""
 "Try to send an email to this address, it will create an application "
 "automatically."
 msgstr ""
+"Versuchen Sie, eine E-Mail an diese Adresse zu senden. Es wird automatisch "
+"eine Bewerbung erstellt."
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
@@ -2015,7 +2035,7 @@ msgstr "Aktualisierungsdatum"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Use interview forms during recruitment process"
-msgstr ""
+msgstr "Bewerbungsformulare während des Einstellungsverfahrens verwenden"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
@@ -2024,6 +2044,10 @@ msgid ""
 "process. Select the form to use in the job position detail form. This relies"
 " on Survey app."
 msgstr ""
+"Verwenden Sie Bewerbungsformulare, die während des Einstellungsverfahrens "
+"auf die jeweilige Position zugeschnitten sind. Wählen Sie das Formular, das "
+"im Detailformular des Jobs verwendet werden soll. Dies gilt für die Umfrage-"
+"App."
 
 #. module: hr_recruitment
 #. openerp-web
@@ -2057,7 +2081,7 @@ msgstr "E-Mails des Abonnenten"
 #. module: hr_recruitment
 #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_employee
 msgid "Welcome ${object.name} "
-msgstr ""
+msgstr "Willkommen ${object.name} "
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee
@@ -2081,12 +2105,12 @@ msgstr ""
 #. module: hr_recruitment
 #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest
 msgid "Your Application: ${object.job_id.name | safe}"
-msgstr ""
+msgstr "Ihre Bewerbung: ${object.job_id.name | safe}"
 
 #. module: hr_recruitment
 #: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse
 msgid "Your Job Application: ${object.job_id.name | safe}"
-msgstr ""
+msgstr "Ihre Job-Bewerbung: ${object.job_id.name | safe}"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 417057377d3..ecfa4c0cd67 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -872,7 +872,7 @@ msgstr "Créer"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
 msgid "Create & Edit"
-msgstr ""
+msgstr "Créer et modifier"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 0eab300fddd..e84fe094872 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -1209,7 +1209,7 @@ msgstr "初步评价"
 #: model:ir.model.fields,field_description:hr_recruitment.field_res_config_settings_module_hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
 msgid "Interview Forms"
-msgstr ""
+msgstr "面试表单"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/models/hr_job.py:94
diff --git a/addons/hr_recruitment_survey/i18n/de.po b/addons/hr_recruitment_survey/i18n/de.po
index 65287abffc5..b942f2aec2c 100644
--- a/addons/hr_recruitment_survey/i18n/de.po
+++ b/addons/hr_recruitment_survey/i18n/de.po
@@ -203,7 +203,7 @@ msgstr "Interview Formular"
 #. module: hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment_survey.res_config_settings_view_form
 msgid "Interview Forms"
-msgstr ""
+msgstr "Vorstellungsgesprächsarten"
 
 #. module: hr_recruitment_survey
 #: model:ir.model,name:hr_recruitment_survey.model_hr_job
diff --git a/addons/hr_recruitment_survey/i18n/zh_CN.po b/addons/hr_recruitment_survey/i18n/zh_CN.po
index fdd7dada8cd..c5e2f6f8eb2 100644
--- a/addons/hr_recruitment_survey/i18n/zh_CN.po
+++ b/addons/hr_recruitment_survey/i18n/zh_CN.po
@@ -204,7 +204,7 @@ msgstr "面试表单"
 #. module: hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment_survey.res_config_settings_view_form
 msgid "Interview Forms"
-msgstr ""
+msgstr "面试表单"
 
 #. module: hr_recruitment_survey
 #: model:ir.model,name:hr_recruitment_survey.model_hr_job
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index d692bfdbab5..18486e33def 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -62,13 +62,13 @@ msgstr "Aktivitäten"
 #: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
 #: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
 msgid "All Timesheets"
-msgstr ""
+msgstr "Alle Zeitnachweise"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_project_project_allow_timesheets
 #: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
 msgid "Allow timesheets"
-msgstr ""
+msgstr "Zeitnachweise erlauben"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
@@ -93,7 +93,7 @@ msgstr "Durch. Plan. - Eff."
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_project_timesheet_synchro
 msgid "Awesome Timesheet"
-msgstr ""
+msgstr "Fantastischer Zeitnachweis"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
@@ -116,12 +116,13 @@ msgstr "Nach Projekt"
 #: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_report_by_task
 #: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_report_timesheet_by_task
 msgid "By Task"
-msgstr ""
+msgstr "Nach Aufgabe"
 
 #. module: hr_timesheet
 #: constraint:project.task:0
 msgid "Circular references are not permitted between tasks and sub-tasks"
 msgstr ""
+"Rundkreisreferenzen zwischen Aufgaben und Unteraufgaben sind nicht erlaubt"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
@@ -149,7 +150,7 @@ msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
 #. module: hr_timesheet
 #: model:ir.model.fields,help:hr_timesheet.field_project_task_total_hours_spent
 msgid "Computed as: Time Spent + Sub-tasks Hours."
-msgstr ""
+msgstr "Berechnet als: Zeitaufwand + Stunden für Unteraufgaben."
 
 #. module: hr_timesheet
 #: model:ir.model.fields,help:hr_timesheet.field_project_task_effective_hours
@@ -203,7 +204,7 @@ msgstr "Mitarbeiter"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Google Chrome Store"
-msgstr ""
+msgstr "Google Chrome Store"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
@@ -259,7 +260,7 @@ msgstr "Projekt"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "Project -"
-msgstr ""
+msgstr "Projekt -"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_remaining_hours
@@ -270,7 +271,7 @@ msgstr "Verbleibende Stunden"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.view_task_kanban_inherited_progress
 msgid "Remaining hours"
-msgstr ""
+msgstr "Verbleibende Stunden"
 
 #. module: hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_timesheets_reports
@@ -290,11 +291,15 @@ msgid ""
 "Timesheets app and invoice them based on a fixed price (ordered quantity) or"
 " on the time spent (delivered quantity)"
 msgstr ""
+"Dienste verkaufen (z. B. Projekt, Wartung), Zeitaufwand für die Nutzung der "
+"Arbeitszeittabellen-App aufzeichnen und diese basierend auf einem festen "
+"Preis (bestellte Menge) oder auf der dafür aufgewendeten Zeit (Liefermenge) "
+"abrechnen."
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Sell services and invoice time spent"
-msgstr ""
+msgstr "Dienste verkaufen und Zeitaufwand abrechnen"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.hr_timesheet_config_settings_action
@@ -310,7 +315,7 @@ msgstr "Geleistete Stunden"
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_project_task_children_hours
 msgid "Sub-tasks Hours"
-msgstr ""
+msgstr "Arbeitszeit für Unteraufgaben"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,help:hr_timesheet.field_project_task_children_hours
@@ -318,11 +323,14 @@ msgid ""
 "Sum of the planned hours of all sub-tasks (when a sub-task is closed or its "
 "spent hours exceed its planned hours, spent hours are counted instead)"
 msgstr ""
+"Summe der geplanten Stunden aller Unteraufgaben (wenn eine Unteraufgabe "
+"geschlossen wird oder ihre verbrauchten Stunden die geplanten Stunden "
+"überschreiten, werden stattdessen die verbrauchten Stunden gezählt)"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Synchronize time spent with web/mobile app"
-msgstr ""
+msgstr "Verbrauchte Zeit mit Web / Mobile-App abgleichen"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_project_task
@@ -355,12 +363,12 @@ msgstr "Uhrzeit"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
 msgid "Time (Hours)"
-msgstr ""
+msgstr "Zeit (Stunden)"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_sale_timesheet
 msgid "Time Billing"
-msgstr ""
+msgstr "Zeitabrechnung"
 
 #. module: hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
@@ -379,13 +387,13 @@ msgstr "Zeiterfassungsaktivitäten"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Timesheet Apps"
-msgstr ""
+msgstr "Zeitnachweis-Apps"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
 #: model:ir.actions.report,name:hr_timesheet.timesheet_report
 msgid "Timesheet Entries"
-msgstr ""
+msgstr "Zeitnachweis-Einträge"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
@@ -435,7 +443,7 @@ msgstr "Benutzer"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Validated leaves create timesheets automatically."
-msgstr ""
+msgstr "Bestätigte Urlaube erstellen automatisch Zeitnachweise."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
@@ -448,6 +456,9 @@ msgid ""
 "                day. Every time spent on a project will become a cost and can be re-invoiced to\n"
 "                customers if required."
 msgstr ""
+"Sie können jeden Tag Ihre Arbeitsstunden pro Projekt\n"
+" aufzeichnen und verfolgen. Sämtliche für ein Projekt aufgewendete Zeit wird zu einem Kostenfaktor und kann den Kunden bei Bedarf erneut in\n"
+" Rechnung gestellt werden."
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_res_config_settings
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 94a6b38f53b..9baaf4cddf1 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -10,13 +10,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # Xu Lei <xulei8@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+0000\n"
-"Last-Translator: Xu Lei <xulei8@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -89,7 +90,7 @@ msgstr "计划实际平均偏差"
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_project_timesheet_synchro
 msgid "Awesome Timesheet"
-msgstr ""
+msgstr "超级棒的时间表"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
@@ -112,12 +113,12 @@ msgstr "项目"
 #: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_report_by_task
 #: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_report_timesheet_by_task
 msgid "By Task"
-msgstr ""
+msgstr "按任务"
 
 #. module: hr_timesheet
 #: constraint:project.task:0
 msgid "Circular references are not permitted between tasks and sub-tasks"
-msgstr ""
+msgstr "不允许循环引用任务和子任务"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
@@ -283,12 +284,12 @@ msgid ""
 "Sell services (e.g. project, maintenance), record time spent using "
 "Timesheets app and invoice them based on a fixed price (ordered quantity) or"
 " on the time spent (delivered quantity)"
-msgstr ""
+msgstr "销售服务（例如项目、维护）、使用时间表应用记录用时，并根据固定价格（ 订购数量）或用时（交货数量）为服务开发票"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Sell services and invoice time spent"
-msgstr ""
+msgstr "销售服务，并记录用时清单"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.hr_timesheet_config_settings_action
@@ -311,12 +312,12 @@ msgstr "子任务工时"
 msgid ""
 "Sum of the planned hours of all sub-tasks (when a sub-task is closed or its "
 "spent hours exceed its planned hours, spent hours are counted instead)"
-msgstr ""
+msgstr "所有子任务的总计划用时（当子任务关闭，或者其用时超出其计划用时，则将用时计入）"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Synchronize time spent with web/mobile app"
-msgstr ""
+msgstr "将用时与网页/手机应用同步"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_project_task
@@ -349,12 +350,12 @@ msgstr "时间"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
 msgid "Time (Hours)"
-msgstr ""
+msgstr "时间（小时）"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings_module_sale_timesheet
 msgid "Time Billing"
-msgstr ""
+msgstr "按时计费"
 
 #. module: hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
@@ -373,7 +374,7 @@ msgstr "记工单活动"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Timesheet Apps"
-msgstr ""
+msgstr "时间表应用"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
@@ -429,7 +430,7 @@ msgstr "用户"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
 msgid "Validated leaves create timesheets automatically."
-msgstr ""
+msgstr "经验证的休假可自动创建时间表。"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
@@ -442,6 +443,8 @@ msgid ""
 "                day. Every time spent on a project will become a cost and can be re-invoiced to\n"
 "                customers if required."
 msgstr ""
+"您每\n"
+" 天可以按项目登记并跟踪工作时间。在项目上花费的每段时间都将产生费用"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_res_config_settings
diff --git a/addons/hr_timesheet_attendance/i18n/de.po b/addons/hr_timesheet_attendance/i18n/de.po
index 9aa5f0f54bf..d4d6c047e50 100644
--- a/addons/hr_timesheet_attendance/i18n/de.po
+++ b/addons/hr_timesheet_attendance/i18n/de.po
@@ -3,19 +3,20 @@
 # * hr_timesheet_attendance
 # 
 # Translators:
+# Martin Trigaux, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# darenkster <inactive+darenkster@transifex.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
+# Renzo Meister, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: darenkster <inactive+darenkster@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "Anzeigename"
 #. module: hr_timesheet_attendance
 #: model:ir.actions.act_window,name:hr_timesheet_attendance.action_hr_timesheet_attendance_report
 msgid "HR Timesheet/Attendance Report"
-msgstr ""
+msgstr "Personal-Zeiterfassung / Anwesenheitsbericht"
 
 #. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_id
@@ -64,6 +65,8 @@ msgid ""
 "The timesheet cannot be validated as it contains an attendance record with "
 "no Check Out."
 msgstr ""
+"Der Zeiterfassung kann nicht überprüft werden, da sie einen "
+"Anwesenheitsdatensatz ohne Auschecken enthält."
 
 #. module: hr_timesheet_attendance
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
@@ -78,7 +81,7 @@ msgstr "Diese Woche"
 #. module: hr_timesheet_attendance
 #: model:ir.ui.menu,name:hr_timesheet_attendance.menu_hr_timesheet_attendance_report
 msgid "Timesheet / Attendance"
-msgstr ""
+msgstr "Zeiterfassung / Anwesenheit"
 
 #. module: hr_timesheet_attendance
 #: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_attendance
@@ -105,14 +108,15 @@ msgstr "Benutzer"
 #, python-format
 msgid "You cannot delete a timesheet that has attendance entries."
 msgstr ""
+"Sie können keine Zeiterfassung löschen, die Anwesenheitseinträge enthält."
 
 #. module: hr_timesheet_attendance
 #: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_attendance_report
 msgid "hr.timesheet.attendance.report"
-msgstr ""
+msgstr "hr.timesheet.attendance.report"
 
 #. module: hr_timesheet_attendance
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_pivot
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
 msgid "timesheet attendance"
-msgstr ""
+msgstr "Zeiterfassungs-Anwesenheit"
diff --git a/addons/hr_timesheet_attendance/i18n/zh_CN.po b/addons/hr_timesheet_attendance/i18n/zh_CN.po
index 85dec6460c4..b63ae7241fc 100644
--- a/addons/hr_timesheet_attendance/i18n/zh_CN.po
+++ b/addons/hr_timesheet_attendance/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * hr_timesheet_attendance
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2017
 # waveyeung <waveyeung@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: waveyeung <waveyeung@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -58,7 +59,7 @@ msgstr "请核实表格的总差异低于%.2f。"
 msgid ""
 "The timesheet cannot be validated as it contains an attendance record with "
 "no Check Out."
-msgstr ""
+msgstr "该时间表无法验证，因为它包含未登记的出勤记录。"
 
 #. module: hr_timesheet_attendance
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
@@ -99,12 +100,12 @@ msgstr "用户"
 #: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:53
 #, python-format
 msgid "You cannot delete a timesheet that has attendance entries."
-msgstr ""
+msgstr "您无法删除具有出勤记录的时间表。"
 
 #. module: hr_timesheet_attendance
 #: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_attendance_report
 msgid "hr.timesheet.attendance.report"
-msgstr ""
+msgstr "hr.timesheet.attendance.report"
 
 #. module: hr_timesheet_attendance
 #: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_pivot
diff --git a/addons/iap/i18n/es.po b/addons/iap/i18n/es.po
index 83e935e92ef..f13ed60c91a 100644
--- a/addons/iap/i18n/es.po
+++ b/addons/iap/i18n/es.po
@@ -6,13 +6,14 @@
 # José Matias Zuazo <jose.zuazo@tpsistemas.com.ar>, 2017
 # e2f_es_ t6 <e2f_es_t6@outlook.com>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+# ES R1 <e2fes@hotmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Last-Translator: ES R1 <e2fes@hotmail.com>, 2018\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"
@@ -84,7 +85,7 @@ msgstr "ID (identificación)"
 #: code:addons/iap/static/src/xml/iap_templates.xml:22
 #, python-format
 msgid "In-App Purchases"
-msgstr ""
+msgstr "Compras dentro de la aplicación"
 
 #. module: iap
 #. openerp-web
diff --git a/addons/iap/i18n/zh_CN.po b/addons/iap/i18n/zh_CN.po
index 2cf86365236..73f41ea6e8f 100644
--- a/addons/iap/i18n/zh_CN.po
+++ b/addons/iap/i18n/zh_CN.po
@@ -7,13 +7,14 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -29,7 +30,7 @@ msgstr "账号信息"
 #. module: iap
 #: model:ir.model.fields,field_description:iap.field_iap_account_account_token
 msgid "Account Token"
-msgstr ""
+msgstr "账户令牌"
 
 #. module: iap
 #. openerp-web
@@ -61,19 +62,19 @@ msgstr "显示名称"
 #. module: iap
 #: model:ir.ui.menu,name:iap.iap_root_menu
 msgid "IAP"
-msgstr ""
+msgstr "IAP"
 
 #. module: iap
 #: model:ir.actions.act_window,name:iap.iap_account_action
 #: model:ir.ui.view,arch_db:iap.iap_account_view_form
 msgid "IAP Account"
-msgstr ""
+msgstr "IAP 账户"
 
 #. module: iap
 #: model:ir.ui.menu,name:iap.iap_account_menu
 #: model:ir.ui.view,arch_db:iap.iap_account_view_tree
 msgid "IAP Accounts"
-msgstr ""
+msgstr "IAP 账户"
 
 #. module: iap
 #: model:ir.model.fields,field_description:iap.field_iap_account_id
@@ -92,14 +93,14 @@ msgstr "应用内购买"
 #: code:addons/iap/static/src/js/crash_manager.js:31
 #, python-format
 msgid "Insufficient Balance"
-msgstr ""
+msgstr "余额不足"
 
 #. module: iap
 #. openerp-web
 #: code:addons/iap/static/src/xml/iap_templates.xml:14
 #, python-format
 msgid "Insufficient credit to perform this service."
-msgstr ""
+msgstr "额度不足，无法执行此服务。"
 
 #. module: iap
 #: model:ir.model.fields,field_description:iap.field_iap_account___last_update
@@ -119,9 +120,9 @@ msgstr "最后更新时间"
 #. module: iap
 #: model:ir.model.fields,field_description:iap.field_iap_account_service_name
 msgid "Service Name"
-msgstr ""
+msgstr "服务名称"
 
 #. module: iap
 #: model:ir.model,name:iap.model_iap_account
 msgid "iap.account"
-msgstr ""
+msgstr "iap.account"
diff --git a/addons/im_livechat/i18n/de.po b/addons/im_livechat/i18n/de.po
index 8a0a5629e43..48282508710 100644
--- a/addons/im_livechat/i18n/de.po
+++ b/addons/im_livechat/i18n/de.po
@@ -58,6 +58,9 @@ msgid ""
 "* 'Auto popup' displays the button and automatically open the conversation pane.\n"
 "* 'Hide the button' hides the chat button on the pages."
 msgstr ""
+"* 'Die Schaltfläche anzeigen' zeigt die Chat-Schaltfläche auf den Seiten an.\n"
+"* 'Automatisches Popup' zeigt die Schaltfläche an und öffnet automatisch den Konversationsbereich.\n"
+"* 'Schaltfläche ausblenden' blendet die Chat-Schaltfläche auf den Seiten aus."
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -116,7 +119,7 @@ msgstr "Durchschnittliche Dauer"
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_message
 msgid "Average message"
-msgstr ""
+msgstr "Durchschnittliche Nachricht"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_time_to_answer
@@ -193,12 +196,12 @@ msgstr "Chat mit einem Ihrer Mitarbeiter"
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.im_livechat_canned_response_action
 msgid "Click to create a new canned response."
-msgstr ""
+msgstr "Klicken, um eine neue vorgefertigte Antwort zu erstellen."
 
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.im_livechat_channel_action
 msgid "Click to define a new website live chat channel."
-msgstr ""
+msgstr "Klicken Sie, um neuen Website-Live-Chat-Kanal zu definieren."
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_technical_name
@@ -230,7 +233,7 @@ msgstr "Kopiert !"
 #: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:12
 #, python-format
 msgid "Copy Text"
-msgstr ""
+msgstr "Text kopieren"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -299,7 +302,7 @@ msgstr "Kundenbewertungen"
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.rating_rating_action_livechat_report
 msgid "Customer ratings on livechat session."
-msgstr ""
+msgstr "Kundenbewertungen der Livechat-Sitzung."
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_button_text
@@ -313,6 +316,9 @@ msgid ""
 "selected action must be 'Auto popup' otherwise this parameter will not be "
 "taken into account."
 msgstr ""
+"Verzögerung (in Sekunden), um das Unterhaltungsfenster automatisch zu "
+"öffnen. Hinweis: Die ausgewählte Aktion muss als 'Auto-Popup' definiert "
+"sein, andernfalls wird dieser Parameter nicht berücksichtigt."
 
 #. module: im_livechat
 #. openerp-web
@@ -351,13 +357,15 @@ msgid ""
 "Each channel has it's own URL that you can send by email to\n"
 "                your customers in order to start chatting with you."
 msgstr ""
+"Jeder Kanal hat eine eigene URL, die Sie per E-Mail an Ihre\n"
+" Kunden senden können, um mit Ihnen zu chatten."
 
 #. module: im_livechat
 #. openerp-web
 #: code:addons/im_livechat/static/src/xml/im_livechat.xml:19
 #, python-format
 msgid "Explain your note"
-msgstr ""
+msgstr "Erklären Sie Ihre Nachricht"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -366,6 +374,10 @@ msgid ""
 " Then go to Website Admin &gt; Configuration &gt; Settings and select the "
 "Website Live Chat Channel you want to add on your website."
 msgstr ""
+"Für eine Website, die mit Odoo CMS erstellt wurde, installieren Sie bitte "
+"das Website-Modul_livechat. Dann rufen Sie Website Admin > Konfiguration > "
+"Einstellungen auf und wählen den Website-Live-Chat-Kanal, den Sie auf Ihrer "
+"Website hinzufügen möchten."
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_sequence
@@ -373,6 +385,9 @@ msgid ""
 "Given the order to find a matching rule. If 2 rules are matching for the "
 "given url/country, the one with the lowest sequence will be chosen."
 msgstr ""
+"Reihenfolge gegeben, um eine passende Regel zu finden. Wenn zwei Regeln für "
+"die angegebene URL / Land übereinstimmen, wird diejenige mit der niedrigsten"
+" Sequenz ausgewählt."
 
 #. module: im_livechat
 #. openerp-web
@@ -403,7 +418,7 @@ msgstr "Historie"
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_start_date_hour
 msgid "Hour of start Date of session"
-msgstr ""
+msgstr "Anfangszeit des Tages der Sitzung"
 
 #. module: im_livechat
 #. openerp-web
@@ -497,7 +512,7 @@ msgstr "Kanal verlassen"
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_mail_channel_partner
 msgid "Listeners of a Channel"
-msgstr ""
+msgstr "Hörer eines Kanals"
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_livechat_root
@@ -531,18 +546,22 @@ msgid ""
 "your company livechat session performance. Extract information about the "
 "missed sessions, the audiance, the duration of a session, etc."
 msgstr ""
+"Livechat Support Kanalstatistik gibt Ihnen die Möglichkeit, Ihre Livechat-"
+"Sitzungen im Unternehmensbereich ganz einfach zu überprüfen und zu "
+"analysieren. Extrahieren Sie Informationen über verpasste Sitzungen, das "
+"Publikum, die Dauer einer Sitzung usw."
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_im_livechat_report_channel
 #: model:ir.model,name:im_livechat.model_im_livechat_report_operator
 msgid "Livechat Support Report"
-msgstr ""
+msgstr "Livechat-Support-Bericht"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_channel_action
 #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_operator_action
 msgid "Livechat Support Report Channel"
-msgstr ""
+msgstr "Livechat-Support-Bericht-Kanal"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_graph
@@ -581,7 +600,7 @@ msgstr ""
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 msgid "Missed sessions"
-msgstr ""
+msgstr "Verpasste Sitzungen"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_name
@@ -592,7 +611,7 @@ msgstr "Name"
 #: code:addons/im_livechat/models/mail_channel.py:125
 #, python-format
 msgid "No history found"
-msgstr ""
+msgstr "Kein Verlauf gefunden"
 
 #. module: im_livechat
 #. openerp-web
@@ -638,7 +657,7 @@ msgstr "Ausführender"
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat_operator
 msgid "Operator Analysis"
-msgstr ""
+msgstr "Operatorenanalyse"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_user_ids
@@ -663,6 +682,8 @@ msgid ""
 "Operators that do not show any activity In Odoo for more than 30 minutes "
 "will be considered as disconnected."
 msgstr ""
+"Operatoren, die über 30 Minuten nicht aktiv in Odoo sind, werden als "
+"getrennt betrachtet."
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -672,7 +693,7 @@ msgstr "Optionen"
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rating_percentage_satisfaction
 msgid "Percentage of happy ratings over the past 7 days"
-msgstr ""
+msgstr "Prozent der positiven Bewertungen in den letzten 7 Tagen"
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_rating_rating
@@ -686,33 +707,35 @@ msgstr "Bewertung"
 #: code:addons/im_livechat/static/src/js/im_livechat.js:344
 #, python-format
 msgid "Rating: :rating_%d"
-msgstr ""
+msgstr "Bewertung: :rating_%d"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Bad"
-msgstr ""
+msgstr "Bewertung: schlecht"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Great"
-msgstr ""
+msgstr "Bewertung: großartig"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Okay"
-msgstr ""
+msgstr "Bewertung: Okay"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.rating_rating_action_view_livechat_rating
 msgid "Ratings for livechat channel"
-msgstr ""
+msgstr "Bewertungen für Livechat-Kanal"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
 msgid ""
 "Regular expression specifying the web pages this rule will be applied on."
 msgstr ""
+"Regelmäßiger Ausdruck, der die Webseiten festlegt, auf die diese Regel "
+"angewendet wird."
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat
@@ -739,29 +762,29 @@ msgstr "Suchverlauf"
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
 msgid "Search report"
-msgstr ""
+msgstr "Bericht suchen"
 
 #. module: im_livechat
 #: code:addons/im_livechat/models/mail_channel.py:113
 #, python-format
 msgid "See 15 last visited pages"
-msgstr ""
+msgstr "Siehe 15 zuletzt besuchte Seiten"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree
 msgid "Session Date"
-msgstr ""
+msgstr "Sitzungs-Tag"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
 msgid "Session Form"
-msgstr ""
+msgstr "Sitzungsformular"
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat_channel
 msgid "Session Statistics"
-msgstr ""
+msgstr "Sitzungsstatistiken"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.mail_channel_action_from_livechat_channel
@@ -774,7 +797,7 @@ msgstr "Sitzungen"
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.session_history
 msgid "Sessions History"
-msgstr ""
+msgstr "Sitzungsverlauf"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image_small
@@ -791,7 +814,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_start_date
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_start_date
 msgid "Start Date of session"
-msgstr ""
+msgstr "Startdatum der Sitzung"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_start_date
@@ -807,12 +830,12 @@ msgstr "Buttontext"
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_channel_id
 msgid "The channel of the rule"
-msgstr ""
+msgstr "Der Kanal dieser Regel"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_name
 msgid "The name of the channel"
-msgstr ""
+msgstr "Der Name des Kanals"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_country_ids
@@ -823,6 +846,11 @@ msgid ""
 "located in these 2 countries. This feature requires GeoIP installed on your "
 "server."
 msgstr ""
+"Die Regel wird nur für diese Länder angewendet. Beispiel: Wenn Sie 'Belgien'"
+" und 'Vereinigte Staaten' wählen und Sie die Aktion auf 'Schaltfläche "
+"verbergen' setzen, wird die Chat-Schaltfläche für Besucher der angegebenen "
+"URL aus diesen zwei Ländern verborgen. Diese Funktion benötigt GeoIP auf "
+"Ihrem Server."
 
 #. module: im_livechat
 #: model:res.groups,comment:im_livechat.im_livechat_group_manager
@@ -837,7 +865,7 @@ msgstr "Der Benutzer kann Supportkanäle nutzen"
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.rating_rating_action_view_livechat_rating
 msgid "There is no rating for this channel at the moment."
-msgstr ""
+msgstr "Derzeit gibt es keine Bewertung für diesen Kanal."
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image
@@ -863,12 +891,12 @@ msgstr "Vorschaubild"
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_time_to_answer
 msgid "Time to answer"
-msgstr ""
+msgstr "Zeit zum Antworten"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
 msgid "Treated sessions"
-msgstr ""
+msgstr "Behandelte Sitzungen"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_regex_url
@@ -910,7 +938,7 @@ msgstr "Website"
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.im_livechat_channel_action
 msgid "Website Live Chat Channels"
-msgstr ""
+msgstr "Website Live-Chat-Kanäle"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_default_message
@@ -924,6 +952,9 @@ msgid ""
 "                to integrate the website live chat widget, allowing your website\n"
 "                visitors to talk in real time with your operators."
 msgstr ""
+"Sie können für jede Website, auf der Sie das Livechat-Widget hinzugefügt\n"
+" haben, Kanäle anlegen. Dadurch können Besucher der Website\n"
+" in Echtzeit mit Ihren Operatoren in Kontakt treten."
 
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.mail_channel_action
@@ -931,6 +962,8 @@ msgid ""
 "Your chatter history is empty. Create a channel and start chatting to fill "
 "up your history."
 msgstr ""
+"Ihr Chatverlauf ist leer. Erstellen Sie einen Kanal und beginnen Sie einen "
+"Chat, um Ihren Verlauf zu füllen."
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
diff --git a/addons/im_livechat/i18n/zh_CN.po b/addons/im_livechat/i18n/zh_CN.po
index bfb4d1664a2..20f089af8c0 100644
--- a/addons/im_livechat/i18n/zh_CN.po
+++ b/addons/im_livechat/i18n/zh_CN.po
@@ -45,6 +45,9 @@ msgid ""
 "* 'Auto popup' displays the button and automatically open the conversation pane.\n"
 "* 'Hide the button' hides the chat button on the pages."
 msgstr ""
+"*“显示按钮”在页面上显示聊天按钮。\n"
+"*“自动弹出”显示按钮并自动打开对话窗口。\n"
+"*“隐藏按钮”在页面上隐藏聊天按钮。"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -216,7 +219,7 @@ msgstr "已复制 !"
 #: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:12
 #, python-format
 msgid "Copy Text"
-msgstr ""
+msgstr "复制文本"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -283,7 +286,7 @@ msgstr "客户点评"
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.rating_rating_action_livechat_report
 msgid "Customer ratings on livechat session."
-msgstr ""
+msgstr "Livechat 会话"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_button_text
@@ -296,7 +299,7 @@ msgid ""
 "Delay (in seconds) to automatically open the conversation window. Note: the "
 "selected action must be 'Auto popup' otherwise this parameter will not be "
 "taken into account."
-msgstr ""
+msgstr "自动打开对话窗口的延迟（以秒计）。注意：所选操作必须为“自动弹出”，否则将不会考虑此参数。"
 
 #. module: im_livechat
 #. openerp-web
@@ -350,6 +353,8 @@ msgid ""
 " Then go to Website Admin &gt; Configuration &gt; Settings and select the "
 "Website Live Chat Channel you want to add on your website."
 msgstr ""
+"对于使用 Odoo CMS 构建的网站，请安装 website_livechat 模块。然后转到“网站管理器 > 配置 > "
+"设置”，并选择您要在网站上添加的网站实时聊天频道。"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_sequence
@@ -514,7 +519,7 @@ msgid ""
 "Livechat Support Channel Statistics allows you to easily check and analyse "
 "your company livechat session performance. Extract information about the "
 "missed sessions, the audiance, the duration of a session, etc."
-msgstr ""
+msgstr "实时聊天支持频道统计允许您轻松检查和分析公司实时聊天会话的表现。提取关于错过的会话、观众、会话持续时间等的信息"
 
 #. module: im_livechat
 #: model:ir.model,name:im_livechat.model_im_livechat_report_channel
@@ -573,7 +578,7 @@ msgstr "名称"
 #: code:addons/im_livechat/models/mail_channel.py:125
 #, python-format
 msgid "No history found"
-msgstr ""
+msgstr "未找到历史记录"
 
 #. module: im_livechat
 #. openerp-web
@@ -641,7 +646,7 @@ msgstr ""
 msgid ""
 "Operators that do not show any activity In Odoo for more than 30 minutes "
 "will be considered as disconnected."
-msgstr ""
+msgstr "在 Odoo 中未显示任何活动超过 30 分钟的操作人员将被视为已断开连接。"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
@@ -665,33 +670,33 @@ msgstr "评级"
 #: code:addons/im_livechat/static/src/js/im_livechat.js:344
 #, python-format
 msgid "Rating: :rating_%d"
-msgstr ""
+msgstr "评价：:rating_%d"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Bad"
-msgstr ""
+msgstr "评价：糟糕"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Great"
-msgstr ""
+msgstr "评价：非常好"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
 msgid "Rating: Okay"
-msgstr ""
+msgstr "评价：好"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,name:im_livechat.rating_rating_action_view_livechat_rating
 msgid "Ratings for livechat channel"
-msgstr ""
+msgstr "实时聊天频道的评价"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
 msgid ""
 "Regular expression specifying the web pages this rule will be applied on."
-msgstr ""
+msgstr "指定此规则将在网页上应用的正则表达式。"
 
 #. module: im_livechat
 #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat
@@ -724,7 +729,7 @@ msgstr "搜索报表"
 #: code:addons/im_livechat/models/mail_channel.py:113
 #, python-format
 msgid "See 15 last visited pages"
-msgstr ""
+msgstr "查看最后访问的 15 个页面"
 
 #. module: im_livechat
 #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
@@ -799,6 +804,8 @@ msgid ""
 "located in these 2 countries. This feature requires GeoIP installed on your "
 "server."
 msgstr ""
+"该规则将仅适用于这些国家/地区。示例：如果您选择“比利时”和“美国”，然后将操作设置为“隐藏按钮”，将会对位于这两个国家/地区的访客的指定 URL "
+"隐藏聊天按钮。此功能的使用需要在服务器上安装 GeoIP。"
 
 #. module: im_livechat
 #: model:res.groups,comment:im_livechat.im_livechat_group_manager
@@ -813,7 +820,7 @@ msgstr "用户能够加入服务支持频道。"
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.rating_rating_action_view_livechat_rating
 msgid "There is no rating for this channel at the moment."
-msgstr ""
+msgstr "目前没有关于此频道的评价。"
 
 #. module: im_livechat
 #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image
@@ -896,6 +903,8 @@ msgid ""
 "                to integrate the website live chat widget, allowing your website\n"
 "                visitors to talk in real time with your operators."
 msgstr ""
+"您可以为每个想要\n"
+" 集成网站实时聊天小工具的网站创建频道，这样您的网站访客便能够与操作人员实时交流。"
 
 #. module: im_livechat
 #: model:ir.actions.act_window,help:im_livechat.mail_channel_action
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js
index ba2433abafc..e9d23227202 100644
--- a/addons/im_livechat/static/src/js/im_livechat.js
+++ b/addons/im_livechat/static/src/js/im_livechat.js
@@ -64,17 +64,19 @@ var LivechatButton = Widget.extend(ServiceProviderMixin, {
         var cookie = utils.get_cookie('im_livechat_session');
         var ready;
         if (!cookie) {
-            ready = session.rpc("/im_livechat/init", {channel_id: this.options.channel_id}).then(function (result) {
-                if (!result.available_for_me) {
-                    return $.Deferred().reject();
-                }
-                self.rule = result.rule;
-            });
+            ready = session.rpc("/im_livechat/init", {channel_id: this.options.channel_id})
+                .then(function (result) {
+                    if (!result.available_for_me) {
+                        return $.Deferred().reject();
+                    }
+                    self.rule = result.rule;
+                });
         } else {
             var channel = JSON.parse(cookie);
-            ready = session.rpc("/mail/chat_history", {uuid: channel.uuid, limit: 100}).then(function (history) {
-                self.history = history;
-            });
+            ready = session.rpc("/mail/chat_history", {uuid: channel.uuid, limit: 100})
+                .then(function (history) {
+                    self.history = history;
+                });
         }
         return ready.then(this.load_qweb_template.bind(this));
     },
@@ -87,7 +89,8 @@ var LivechatButton = Widget.extend(ServiceProviderMixin, {
         } else if (!config.device.isMobile && this.rule.action === 'auto_popup') {
             var auto_popup_cookie = utils.get_cookie('im_livechat_auto_popup');
             if (!auto_popup_cookie || JSON.parse(auto_popup_cookie)) {
-                this.auto_popup_timeout = setTimeout(this.open_chat.bind(this), this.rule.auto_popup_timer*1000);
+                this.auto_popup_timeout =
+                    setTimeout(this.open_chat.bind(this), this.rule.auto_popup_timer*1000);
             }
         }
         this.busBus.on('notification', this, function (notifications) {
diff --git a/addons/l10n_be/i18n_extra/nl_BE.po b/addons/l10n_be/i18n_extra/nl_BE.po
index 08330c05d08..88d6c4b61ee 100644
--- a/addons/l10n_be/i18n_extra/nl_BE.po
+++ b/addons/l10n_be/i18n_extra/nl_BE.po
@@ -147,7 +147,7 @@ msgstr "12% Diverse goederen"
 #: model:account.tax,name:l10n_be.1_attn_VAT-IN-V83-12-CC
 #: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-CC
 msgid "12% Cocont. - Biens d'investissement"
-msgstr "0% Medecont. - Investeringsgoederen"
+msgstr "12% Medecont. - Investeringsgoederen"
 
 #. module: l10n_be
 #: model:account.tax,name:l10n_be.1_attn_VAT-IN-V83-12-CC-C1
@@ -389,7 +389,7 @@ msgstr "21% Medecont. G."
 #: model:account.tax,name:l10n_be.1_attn_VAT-IN-V83-21-CC-C2
 #: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-CC-C2
 msgid "21% Cocont. Récupérable - Biens d'investissement"
-msgstr "12% Medecont. Verhaalbaar - Investeringsgoederen"
+msgstr "21% Medecont. Verhaalbaar - Investeringsgoederen"
 
 #. module: l10n_be
 #: model:account.tax,name:l10n_be.1_attn_VAT-IN-V81-21-CC-C2
diff --git a/addons/l10n_co/data/account.account.template.csv b/addons/l10n_co/data/account.account.template.csv
index 4bb5aedf148..e73728e96cf 100644
--- a/addons/l10n_co/data/account.account.template.csv
+++ b/addons/l10n_co/data/account.account.template.csv
@@ -58,6 +58,34 @@ co_puc_235510,235510,Socios,TRUE,account.data_account_type_payable,l10n_co_chart
 co_puc_236005,236005,Dividendos,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_236505,236505,Salarios y Pagos Laborales,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_236510,236510,Dividendos y/o Participaciones,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23651505,23651505,Retencion en la fuente por honorarios persona natural 10%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23651510,23651510,Retencion en la fuente por honorarios persona Juridica 11%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23651515,23651515,Retencion en la fuente por servicios de licencias software 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23651520,23651520,Retencion en la fuente por servicios de diseño web y consultorí informática 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652005,23652005,Retencion en la fuente por comisiones persona natural 10%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652010,23652010,Retencion en la fuente por comisiones persona juridica 11%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652505,23652505,Retencion en la fuente por servicios en general 4%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652510,23652510,Retencion en la fuente por servicios en general personas naturales no declarantes Renta 6%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652515,23652515,Retencion en la fuente por servicio transporte nacional carga 1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652520,23652520,Retencion en la fuente por servicio transporte terrestre nacional pasajeros 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652525,23652525,Retencion en la fuente por servicio transporte aereo y maritimo nacional pasajeros 1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652530,23652530,Retencion en la fuente por servicio temporales de empleo (sobre AIU) 1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652535,23652535,Retencion en la fuente por servicio de vigilancia y aseo (sobre AIU) 2%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652540,23652540,Retencion en la fuente por servicio integrales de salud 2%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652545,23652545,Retencion en la fuente por servicio de hoteles y restaurantes 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23652550,23652550,Retencion en la fuente por contratos de obra inmuebles 2%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23653005,23653005,Retencion en la fuente por arrendamientos Bienes Muebles 4%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23653010,23653010,Retencion en la fuente por arrendamientos Bienes Inmuebles 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23653510,23653510,Retencion en la fuente por rendimientos financieros generales 7%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654005,23654005,Retencion en la fuente por compras declarantes 2.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654010,23654010,Retencion en la fuente por compras no declarantes 3.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654015,23654015,Retencion en la fuente por compras bienes agricolas 1.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654020,23654020,Retencion en la fuente por compra cafe 0.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654025,23654025,Retencion en la fuente por compra combustibles 0.1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654030,23654030,Retencion en la fuente por adquisicion de vehiculos 1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654035,23654035,Retencion en la fuente por adquisicion de bienes raices comerciales 2.5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23654040,23654040,Retencion en la fuente por ventas de activos fijos 1%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_23655005,23655005,Retencion en la fuente por consultorias servicios tecnicos y asistencia tecnica pagos al exterior 10%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_236575,236575,Autorretenciones,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_236705,236705,Impuesto a Las Ventas Retenido,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_236805,236805,Impuesto de Industria y Comercio Retenido,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
@@ -81,6 +109,7 @@ co_puc_2408101005,2408101005,Compra Anulada Iva 19%,FALSE,account.data_account_t
 co_puc_2408101010,2408101010,Compra Anulada Iva 5%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_2408101015,2408101015,Compra Anulada Iva 16%,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_240820,240820,Iva Descontable a Regimen Simplificado (Commun/Proporcional) - Solo Esta la DIAN lo Interpreta Utilizable,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
+co_puc_24082005,24082005,Iva retenido a regimen simplificado,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_241205,241205,Vigencia Fiscal Corriente,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_245605,245605,a Las Importaciones,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
 co_puc_249505,249505,Otros,FALSE,account.data_account_type_current_liabilities,l10n_co_chart_template_generic
@@ -107,8 +136,45 @@ co_puc_340515,340515,de Reservas,FALSE,account.data_account_type_equity,l10n_co_
 co_puc_340520,340520,de Resultados de Ejercicios Anteriores,FALSE,account.data_account_type_equity,l10n_co_chart_template_generic
 co_puc_360505,360505,Utilidad Del Ejercicio,FALSE,account.data_account_type_equity,l10n_co_chart_template_generic
 co_puc_370505,370505,Utilidades Acumuladas,FALSE,account.data_account_type_equity,l10n_co_chart_template_generic
-co_puc_415505,415505,Arrendamientos de Bienes Inmuebles,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413502,413502,Venta de vehículos automotores,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413504,413504,"Mantenimiento, reparación y lavado de vehículos automotores",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413506,413506,"Venta de partes, piezas y accesorios de vehículos automotores",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413508,413508,"Venta de combustibles sólidos, líquidos, gaseosos",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413510,413510,"Venta de lubricantes, aditivos, llantas y lujos para automotores",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413512,413512,Venta a cambio de retribución o por contrata,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413514,413514,"Venta de insumos, materias primas agropecuarias y flores",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413516,413516,Venta de otros insumos y materias primas no agropecuarias,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413518,413518,Venta de animales vivos y cueros,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413520,413520,Venta de productos en almacenes no especializados,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413522,413522,Venta de productos agropecuarios,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413524,413524,"Venta de productos textiles, de vestir, de cuero y calzado",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413526,413526,Venta de papel y cartón,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413528,413528,"Venta de libros, revistas, elementos de papelería, útiles y textos escolares",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413530,413530,"Venta de juegos, juguetes y artículos deportivos",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413532,413532,Venta de instrumentos quirúrgicos y ortopédicos,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413534,413534,Venta de artículos en relojerías y joyerías,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413536,413536,Venta de electrodomésticos y muebles,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413538,413538,"Venta de productos de aseo, farmacéuticos, medicinales, y artículos de tocador",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413540,413540,"Venta de cubiertos, vajillas, cristalería, porcelanas, cerámicas y otros artículos de uso doméstico",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413542,413542,"Venta de materiales de construcción, fontanería y calefacción",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413544,413544,Venta de pinturas y lacas,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413546,413546,Venta de productos de vidrios y marquetería,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413548,413548,Venta de herramientas y artículos de ferretría,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413550,413550,Venta de químicos,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413552,413552,"Venta de productos intermedios, desperdicios y desechos",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413554,413554,"Venta de maquinaria, equipo de oficina y programas de computador",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413556,413556,Venta de artículos en cacharrerías y misceláneas,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413558,413558,Venta de instrumentos musicales,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413560,413560,Venta de artículos en casas de empeño y prenderías,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413562,413562,Venta de equipo fotográfico,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413564,413564,Venta de equipo óptico y de precisión,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413566,413566,Venta de empaques,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413568,413568,Venta de equipo profesional y científico,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413570,413570,"Venta de loterías, rifas, chance, apuestas y similares",FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413572,413572,Reparación de efectos personales y electrodomésticos,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
 co_puc_413595,413595,Venta de Otros Productos,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_413595,413595,Venta de otros productos,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
+co_puc_415505,415505,Arrendamientos de Bienes Inmuebles,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
 co_puc_421005,421005,Intereses,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
 co_puc_421020,421020,Diferencia en Cambio,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
 co_puc_421040,421040,Descuentos Comerciales Condicionados,FALSE,account.data_account_type_revenue,l10n_co_chart_template_generic
diff --git a/addons/l10n_co/data/account.tax.template.csv b/addons/l10n_co/data/account.tax.template.csv
index de0f14ca931..cf435a1232c 100644
--- a/addons/l10n_co/data/account.tax.template.csv
+++ b/addons/l10n_co/data/account.tax.template.csv
@@ -1,54 +1,54 @@
-id,amount,account_id:id,refund_account_id:id,name,type_tax_use,amount_type,children_tax_ids:id,chart_template_id:id
-l10n_co_tax_0,5.0,co_puc_2408100510,co_puc_2408101010,IVA Compra 5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_1,19.0,co_puc_2408100505,co_puc_2408101005,IVA Compra 19%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_2,16.0,co_puc_2408100515,co_puc_2408101015,IVA Descontable Compra 16% (2016 y Enero 2017),purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_3,0.0,co_puc_236505,co_puc_236505,RteFte Salarios y Pagos Laborales,None,fixed,,l10n_co_chart_template_generic
-l10n_co_tax_4,16.0,,,IVA Devoluciones Ventas 16% 2016,sale,percent,,l10n_co_chart_template_generic
-l10n_co_tax_5,0.0,,,IVA Compra Importaciones,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_6,0.0,,,IVA Compra Excluido,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_7,0.0,,,IVA Compra Exento,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_8,19.0,co_puc_2408050505,co_puc_2408051005,IVA Ventas 19%,sale,percent,,l10n_co_chart_template_generic
-l10n_co_tax_9,5.0,co_puc_2408050510,co_puc_2408051010,IVA Ventas 5%,sale,percent,,l10n_co_chart_template_generic
-l10n_co_tax_10,0.0,,,IVA Excento,sale,percent,,l10n_co_chart_template_generic
-l10n_co_tax_11,0.0,,,IVA Excluido,sale,percent,,l10n_co_chart_template_generic
-l10n_co_tax_12,-2.85,co_puc_236705,co_puc_236705,RteIVA 15% sobre el 19% IVA,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_13,-0.75,co_puc_236705,co_puc_236705,RteIVA 15% sobre el 5% IVA,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_14,0.75,,,RteIVA 15% sobre el 5% IVA Contrapartida,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_15,2.85,,,RteIVA 15% sobre el 19% IVA Contrapartida,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_16,-0.1,,,RteFte Compra Combustibles 0.1%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_17,-0.5,,,RteFte Compra Cafe 0.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_18,-10.0,,,RteFte Comisiones Persona Natural 10%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_19,-2.5,,,RteFte Compras Declarantes 2.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_20,-10.0,,,"RteFte Consultorias, Servicios Tecnicos y Asistencia Tecnica Pagos al Exterior 10%",purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_21,-1.0,,,RteFte Adquisicion de Vehiculos 1%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_22,-1.0,,,RteFte Compras de Bienes Raices 1%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_23,-4.0,,,RteFte Servicios P Jurídicas y PN Declarantes 4%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_24,-1.0,,,RteFte Servicio Transporte Nacional Carga 1%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_25,-6.0,,,RteFte Servicios en General Personas Naturales No Declarantes Renta 6%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_26,-2.0,,,RteFte Servicio de Vigilancia y Aseo (Sobre AIU) 2%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_27,-3.5,,,RteFte Honorarios Servicios Licencias Software 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_28,-2.0,,,RteFte Contratos de Obra Inmuebles 2%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_29,-4.0,,,RteFte Arrendamientos Bienes Muebles 4%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_30,-3.5,,,RteFte Arrendamientos Bienes Inmuebles 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_31,-7.0,,,RteFte Rendimientos Financieros Generales 7%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_32,-10.0,,,RteFte Honorarios Persona Natural 10%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_33,-3.5,,,RteFte Honorarios Diseno Web y Consultoria Informatica 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_34,-2.5,,,RteFte Adquisicion de Bienes Raices Comerciales 2.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_35,-3.5,,,RteFte Compras No Declarantes 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_36,-11.0,,,RteFte Comisiones Persona Juridica 11%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_37,-1.5,,,RteFte Compras Bienes Agricolas 1.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_38,-3.5,,,RteFte Servicio Transporte Terrestre Nacional Pasajeros 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_39,-1.0,,,RteFte Servicio Temporales de Empleo (Sobre AIU) 1%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_40,-11.0,,,RteFte Honorarios Persona Juridica 11%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_41,-2.0,,,RteFte Servicio Integrales de Salud 2%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_42,-3.5,,,RteFte Servicio de Hoteles y Restaurantes 3.5%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_43,0.0,co_puc_236805,co_puc_236805,RteICA,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_44,-0.69,co_puc_236805,co_puc_236805,RteICA 0.69%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_45,-1.104,co_puc_236805,co_puc_236805,RteICA 1.104%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_46,-0.414,co_puc_236805,co_puc_236805,RteICA 0.414%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_47,-1.38,co_puc_236805,co_puc_236805,RteICA 1.38%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_48,-0.966,co_puc_236805,co_puc_236805,RteICA 0.966%,purchase,percent,,l10n_co_chart_template_generic
-l10n_co_tax_49,16.0,,,IVA Compra 16% RC,purchase,group,"l10n_co_tax_1,l10n_co_tax_12",l10n_co_chart_template_generic
-l10n_co_tax_50,16.0,,,IVA Compra 16% RS,purchase,group,"l10n_co_tax_12,l10n_co_tax_15",l10n_co_chart_template_generic
-l10n_co_tax_51,5.0,,,IVA Compra 5% RS,purchase,group,"l10n_co_tax_13,l10n_co_tax_14",l10n_co_chart_template_generic
-l10n_co_tax_52,5.0,,,IVA Compra 5% RC,purchase,group,"l10n_co_tax_0,l10n_co_tax_13",l10n_co_chart_template_generic
+id,sequence,amount,account_id:id,refund_account_id:id,name,type_tax_use,amount_type,children_tax_ids:id,chart_template_id:id
+l10n_co_tax_0,1,5.0,co_puc_2408100510,co_puc_2408101010,IVA Compra 5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_1,0,19.0,co_puc_2408100505,co_puc_2408101005,IVA Compra 19%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_2,1,16.0,co_puc_2408100515,co_puc_2408101015,IVA Descontable Compra 16% (2016 y Enero 2017),purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_3,1,0.0,co_puc_236505,co_puc_236505,RteFte Salarios y Pagos Laborales,None,fixed,,l10n_co_chart_template_generic
+l10n_co_tax_4,1,16.0,,,IVA Devoluciones Ventas 16% 2016,sale,percent,,l10n_co_chart_template_generic
+l10n_co_tax_5,1,0.0,,,IVA Compra Importaciones,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_6,1,0.0,,,IVA Compra Excluido,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_7,1,0.0,,,IVA Compra Exento,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_8,0,19.0,co_puc_2408050505,co_puc_2408051005,IVA Ventas 19%,sale,percent,,l10n_co_chart_template_generic
+l10n_co_tax_9,1,5.0,co_puc_2408050510,co_puc_2408051010,IVA Ventas 5%,sale,percent,,l10n_co_chart_template_generic
+l10n_co_tax_10,1,0.0,,,IVA Excento,sale,percent,,l10n_co_chart_template_generic
+l10n_co_tax_11,1,0.0,,,IVA Excluido,sale,percent,,l10n_co_chart_template_generic
+l10n_co_tax_12,1,-2.85,co_puc_236705,co_puc_236705,RteIVA 15% sobre el 19% IVA,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_13,1,-0.75,co_puc_236705,co_puc_236705,RteIVA 15% sobre el 5% IVA,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_14,1,0.75,co_puc_24082005,co_puc_24082005,RteIVA 15% sobre el 5% IVA Contrapartida,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_15,1,2.85,co_puc_24082005,co_puc_24082005,RteIVA 15% sobre el 19% IVA Contrapartida,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_16,1,-0.1,co_puc_23654025,co_puc_23654025,RteFte Compra Combustibles 0.1%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_17,1,-0.5,co_puc_23654020,co_puc_23654020,RteFte Compra Cafe 0.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_18,1,-10.0,co_puc_23652005,co_puc_23652005,RteFte Comisiones Persona Natural 10%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_19,1,-2.5,co_puc_23654005,co_puc_23654005,RteFte Compras Declarantes 2.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_20,1,-10.0,co_puc_23655005,co_puc_23655005,"RteFte Consultorias, Servicios Tecnicos y Asistencia Tecnica Pagos al Exterior 10%",purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_21,1,-1.0,co_puc_23654030,co_puc_23654030,RteFte Adquisicion de Vehiculos 1%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_22,1,-1.0,co_puc_23654040,co_puc_23654040,RteFte Compras de Bienes Raices 1%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_23,1,-4.0,co_puc_23652505,co_puc_23652505,RteFte Servicios P Jurídicas y PN Declarantes 4%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_24,1,-1.0,co_puc_23652515,co_puc_23652515,RteFte Servicio Transporte Nacional Carga 1%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_25,1,-6.0,co_puc_23652510,co_puc_23652510,RteFte Servicios en General Personas Naturales No Declarantes Renta 6%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_26,1,-2.0,co_puc_23652535,co_puc_23652535,RteFte Servicio de Vigilancia y Aseo (Sobre AIU) 2%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_27,1,-3.5,co_puc_23651515,co_puc_23651515,RteFte Honorarios Servicios Licencias Software 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_28,1,-2.0,co_puc_23652550,co_puc_23652550,RteFte Contratos de Obra Inmuebles 2%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_29,1,-4.0,co_puc_23653005,co_puc_23653005,RteFte Arrendamientos Bienes Muebles 4%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_30,1,-3.5,co_puc_23653010,co_puc_23653010,RteFte Arrendamientos Bienes Inmuebles 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_31,1,-7.0,co_puc_23653510,co_puc_23653510,RteFte Rendimientos Financieros Generales 7%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_32,1,-10.0,co_puc_23651505,co_puc_23651505,RteFte Honorarios Persona Natural 10%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_33,1,-3.5,co_puc_23651520,co_puc_23651520,RteFte Honorarios Diseno Web y Consultoria Informatica 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_34,1,-2.5,co_puc_23654035,co_puc_23654035,RteFte Adquisicion de Bienes Raices Comerciales 2.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_35,1,-3.5,co_puc_23654010,co_puc_23654010,RteFte Compras No Declarantes 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_36,1,-11.0,co_puc_23652010,co_puc_23652010,RteFte Comisiones Persona Juridica 11%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_37,1,-1.5,co_puc_23654015,co_puc_23654015,RteFte Compras Bienes Agricolas 1.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_38,1,-3.5,co_puc_23652520,co_puc_23652520,RteFte Servicio Transporte Terrestre Nacional Pasajeros 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_39,1,-1.0,co_puc_23652530,co_puc_23652530,RteFte Servicio Temporales de Empleo (Sobre AIU) 1%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_40,1,-11.0,co_puc_23651510,co_puc_23651510,RteFte Honorarios Persona Juridica 11%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_41,1,-2.0,co_puc_23652540,co_puc_23652540,RteFte Servicio Integrales de Salud 2%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_42,1,-3.5,co_puc_23652545,co_puc_23652545,RteFte Servicio de Hoteles y Restaurantes 3.5%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_43,1,0.0,co_puc_236805,co_puc_236805,RteICA,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_44,1,-0.69,co_puc_236805,co_puc_236805,RteICA 0.69%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_45,1,-1.104,co_puc_236805,co_puc_236805,RteICA 1.104%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_46,1,-0.414,co_puc_236805,co_puc_236805,RteICA 0.414%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_47,1,-1.38,co_puc_236805,co_puc_236805,RteICA 1.38%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_48,1,-0.966,co_puc_236805,co_puc_236805,RteICA 0.966%,purchase,percent,,l10n_co_chart_template_generic
+l10n_co_tax_49,1,19.0,,,IVA Compra 19% RC,purchase,group,"l10n_co_tax_1,l10n_co_tax_12",l10n_co_chart_template_generic
+l10n_co_tax_50,1,19.0,,,IVA Compra 19% RS,purchase,group,"l10n_co_tax_12,l10n_co_tax_15",l10n_co_chart_template_generic
+l10n_co_tax_51,1,5.0,,,IVA Compra 5% RS,purchase,group,"l10n_co_tax_13,l10n_co_tax_14",l10n_co_chart_template_generic
+l10n_co_tax_52,1,5.0,,,IVA Compra 5% RC,purchase,group,"l10n_co_tax_0,l10n_co_tax_13",l10n_co_chart_template_generic
diff --git a/addons/l10n_co/models/res_partner.py b/addons/l10n_co/models/res_partner.py
index f0bc461e6dd..2de03275412 100644
--- a/addons/l10n_co/models/res_partner.py
+++ b/addons/l10n_co/models/res_partner.py
@@ -16,7 +16,7 @@ class ResPartner(models.Model):
                                               ('residence_document', 'Salvoconducto de Permanencia'),
                                               ('civil_registration', 'Registro Civil')], string='Document Type',
                                              help='Indicates to what document the information in here belongs to.')
-    l10n_co_verification_code = fields.Char(compute='_compute_verification_code', string='VC',
+    l10n_co_verification_code = fields.Char(compute='_compute_verification_code', string='VC',  # todo remove this field in master
                                             help='Redundancy check to verify the vat number has been typed in correctly.')
 
     @api.depends('vat')
@@ -44,3 +44,16 @@ class ResPartner(models.Model):
                     partner.l10n_co_verification_code = 11 - number
             except ValueError:
                 partner.l10n_co_verification_code = False
+
+    @api.constrains('vat', 'commercial_partner_country_id', 'l10n_co_document_type')
+    def check_vat(self):
+        # check_vat is implemented by base_vat which this localization
+        # doesn't directly depend on. It is however automatically
+        # installed for Colombia.
+        if self.sudo().env.ref('base.module_base_vat').state == 'installed':
+            # don't check Colombian partners unless they have RUT (= Colombian VAT) set as document type
+            self = self.filtered(lambda partner: partner.country_id != self.env.ref('base.co') or\
+                                                 partner.l10n_co_document_type == 'rut')
+            return super(ResPartner, self).check_vat()
+        else:
+            return True
diff --git a/addons/l10n_co/views/res_partner.xml b/addons/l10n_co/views/res_partner.xml
index 9912521fcca..5c55043fb44 100644
--- a/addons/l10n_co/views/res_partner.xml
+++ b/addons/l10n_co/views/res_partner.xml
@@ -9,7 +9,7 @@
                 <field name="l10n_co_document_type"/>
             </field>
             <field name="vat" position="after">
-                <field name="l10n_co_verification_code"/>
+                <field name="l10n_co_verification_code" invisible="1"/>
             </field>
         </field>
     </record>
diff --git a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
index 56a7e28210e..c9fcc8ae3fd 100644
--- a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
+++ b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
@@ -135,7 +135,7 @@
                                 <th>Net Imposable</th>
                                 <th>Plafond s.s.</th>
                                 <th></th>
-                                <th>Coût Global Salarié</th>
+                                <th>Total versé par l'employeur</th>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/addons/link_tracker/i18n/de.po b/addons/link_tracker/i18n/de.po
index b681f2acbbe..9cbc24bad32 100644
--- a/addons/link_tracker/i18n/de.po
+++ b/addons/link_tracker/i18n/de.po
@@ -4,24 +4,25 @@
 # 
 # Translators:
 # Henry Mineehen <info@mineehen.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Joachim <jj2282@hotmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # jonas <jonas.hillebrecht@bklynsoap.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: DE R1 <e2fes1@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,12 +85,12 @@ msgstr "Favicon"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_icon_src
 msgid "Favicon Source"
-msgstr ""
+msgstr "Favicon-Quelle"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_short_url_host
 msgid "Host of the short URL"
-msgstr ""
+msgstr "Host der kurzen URL"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_id
@@ -149,17 +150,17 @@ msgstr "Seitentitel"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_redirected_url
 msgid "Redirected URL"
-msgstr ""
+msgstr "Umgeleitete URL"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_code
 msgid "Short URL Code"
-msgstr ""
+msgstr "Kurzer URL-Code"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code
 msgid "Short URL code"
-msgstr ""
+msgstr "Kurzer URL-Code"
 
 #. module: link_tracker
 #: model:ir.actions.act_window,name:link_tracker.action_view_click_statistics
@@ -174,7 +175,7 @@ msgstr "Ziel-URL"
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter
 msgid "Title and URL"
-msgstr ""
+msgstr "Titel und URL"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter
@@ -184,45 +185,45 @@ msgstr "Verfolgter Link"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_short_url
 msgid "Tracked URL"
-msgstr ""
+msgstr "Nachverfolgte URL"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form
 msgid "Visit Page"
-msgstr ""
+msgstr "Seite besuchen"
 
 #. module: link_tracker
 #: code:addons/link_tracker/models/link_tracker.py:141
 #, python-format
 msgid "Visit Webpage"
-msgstr ""
+msgstr "Website besuchen"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form
 msgid "Website Link"
-msgstr ""
+msgstr "Websiten-Link"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_form
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_graph
 msgid "Website Link Clicks"
-msgstr ""
+msgstr "Klicks für Websiten-Links"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form_stats
 msgid "Website Link Graph"
-msgstr ""
+msgstr "Websiten-Link-Diagramm"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_graph
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_tree
 msgid "Website Links"
-msgstr ""
+msgstr "Websiten-Links"
 
 #. module: link_tracker
 #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_tree
 msgid "Website Links Clicks"
-msgstr ""
+msgstr "Klicks für Websiten-Links"
 
 #. module: link_tracker
 #: model:ir.model,name:link_tracker.model_link_tracker
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 4ce5c9456a7..ab675222366 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -117,6 +117,8 @@ msgid ""
 "Alerts are used to warn employee from possible issues concerning the lunch orders.\n"
 "                To create a lunch alert you have to define its recurrence, the time interval during which the alert should be executed and the message to display."
 msgstr ""
+"Warnungen werden dazu verwendet, Mitarbeiter vor möglichen Problemen bei der Essensbestellung zu warnen.\n"
+" Um eine Mahlzeitenbenachrichtigung zu erstellen, müssen Sie die Häufigkeit festlegen, den Zeitintervall, in dem die Warnung ausgeführt und die Nachricht angezeigt werden soll."
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_amount
@@ -137,7 +139,7 @@ msgstr "Archiviert"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_balance_visible
 msgid "Balance Visible"
-msgstr ""
+msgstr "Sichtbarer Saldo"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_alert_start_hour
@@ -157,7 +159,7 @@ msgstr "Nach Mitarbeiter"
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
 msgid "By Order"
-msgstr ""
+msgstr "Nach Bestellung"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search
@@ -180,6 +182,8 @@ msgid ""
 "Can be positive (payment) or negative (order or payment if user wants to get"
 " his money back)"
 msgstr ""
+"Kann positiv (Zahlung) oder negativ sein (Bestellung oder Zahlung, wenn der "
+"Benutzer sein Geld zurückfordert)"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban
@@ -202,7 +206,7 @@ msgstr "Einzahlung"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_cash_move_balance
 msgid "Cash Move Balance"
-msgstr ""
+msgstr "Einzahlungssaldo"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id
@@ -337,6 +341,8 @@ msgstr "Mitarbeiter Einzahlungen"
 #: model:ir.model.fields,help:lunch.field_lunch_order_line_lucky_is_max_budget
 msgid "Enable this option to set a maximal budget for your lucky order."
 msgstr ""
+"Aktivieren Sie diese Option, um ein Maximalbudget für Ihre Glücksbestellung "
+"festzulegen."
 
 #. module: lunch
 #: selection:lunch.alert,alert_type:0
@@ -395,6 +401,8 @@ msgid ""
 "Here you can see the employees' payment. A payment is a cash move from the "
 "employee to the company."
 msgstr ""
+"Hier können Sie die Zahlung der Mitarbeiter sehen. Eine Zahlung ist eine "
+"Einzahlung vom Mitarbeiter an das Unternehmen."
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
@@ -507,22 +515,22 @@ msgstr "Auftrag Mittagessen"
 #. module: lunch
 #: model:ir.actions.server,name:lunch.action_server_lunch_archive_product
 msgid "Lunch: Archive/Restore products"
-msgstr ""
+msgstr "Mittagessen: Produkte archivieren / wiederherstellen"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_cancel
 msgid "Lunch: Cancel meals"
-msgstr ""
+msgstr "Mittagessen: Mahlzeiten stornieren"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_order
 msgid "Lunch: Order meals"
-msgstr ""
+msgstr "Mittagessen: Mahlzeiten bestellen"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_confirm
 msgid "Lunch: Receive meals"
-msgstr ""
+msgstr "Mittagessen: Mahlzeiten empfangen"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_admin
@@ -604,13 +612,13 @@ msgstr "Nur deine Frühstücks Manager können diesen Befehl rückgängig machen
 #: code:addons/lunch/models/lunch.py:194
 #, python-format
 msgid "Only your lunch manager processes the orders."
-msgstr ""
+msgstr "Nur Ihr Mahzeitenmanager bearbeitet die Bestellungen."
 
 #. module: lunch
 #: code:addons/lunch/models/lunch.py:214
 #, python-format
 msgid "Only your lunch manager sets the orders as received."
-msgstr ""
+msgstr "Nur Ihr Mahlzeitenmanager erstellt die gelieferten Bestellungen."
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_order_id
@@ -662,12 +670,12 @@ msgstr "Zahlung"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_ids
 msgid "Previous Order"
-msgstr ""
+msgstr "Vorherige Bestellung"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_widget
 msgid "Previous Order Widget"
-msgstr ""
+msgstr "Vorheriges Bestell-Widget"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.lunch_order_menu_tree
@@ -814,6 +822,7 @@ msgstr "Status"
 #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
 msgid "Summary of all lunch orders, grouped by vendor and by date."
 msgstr ""
+"Zusammenfassung aller Essensbestellungen gruppiert nach Lieferant und Datum."
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_alert_sunday
@@ -837,6 +846,8 @@ msgid ""
 "There is no previous order recorded. Click on \"My Lunch\" and then create a"
 " new lunch order."
 msgstr ""
+"Es wurde keine vorherige Bestellung aufgezeichnet. Klicken Sie auf „Mein "
+"Mittagessen“ und erstellen Sie dann eine neue Essensbestellung."
 
 #. module: lunch
 #. openerp-web
@@ -976,4 +987,4 @@ msgstr "Essen-Produktkategorie"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_line_lucky
 msgid "lunch.order.line.lucky"
-msgstr ""
+msgstr "lunch.order.line.lucky"
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index ad1aa5e7ace..d9b8031ce53 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Loic <loic.richard2@gmail.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2016
@@ -20,13 +20,14 @@
 # Xavier Symons <xsy@openerp.com>, 2016
 # Martin Malorni <mmalorni@gmail.com>, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Sébastien Le Ray <sebastien-github@orniz.org>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -764,7 +765,7 @@ msgstr "Reçu"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_alert_alert_type
 msgid "Recurrence"
-msgstr ""
+msgstr "Récurrence"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.lunch_cashmove_action_payment
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index a9a25439563..9c2180b9c8a 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -103,6 +103,8 @@ msgid ""
 "Alerts are used to warn employee from possible issues concerning the lunch orders.\n"
 "                To create a lunch alert you have to define its recurrence, the time interval during which the alert should be executed and the message to display."
 msgstr ""
+"提醒功能用于提醒员工与午餐订单相关的可能问题。\n"
+" 要创建午餐提醒您必须定义在执行提醒和显示信息期间的循环次数、时间间隔。"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_amount
@@ -188,7 +190,7 @@ msgstr "现金划拨"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_cash_move_balance
 msgid "Cash Move Balance"
-msgstr ""
+msgstr "现金划转余额"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id
@@ -498,22 +500,22 @@ msgstr "午餐订单"
 #. module: lunch
 #: model:ir.actions.server,name:lunch.action_server_lunch_archive_product
 msgid "Lunch: Archive/Restore products"
-msgstr ""
+msgstr "午餐：归档/修复产品"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_cancel
 msgid "Lunch: Cancel meals"
-msgstr ""
+msgstr "午餐：取消用餐"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_order
 msgid "Lunch: Order meals"
-msgstr ""
+msgstr "午餐：订餐"
 
 #. module: lunch
 #: model:ir.actions.server,name:lunch.lunch_order_line_action_confirm
 msgid "Lunch: Receive meals"
-msgstr ""
+msgstr "午餐：收到餐食"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_admin
@@ -652,12 +654,12 @@ msgstr "付款"
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_ids
 msgid "Previous Order"
-msgstr ""
+msgstr "先前的订单"
 
 #. module: lunch
 #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_widget
 msgid "Previous Order Widget"
-msgstr ""
+msgstr "先前的订购小工具"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.lunch_order_menu_tree
@@ -825,7 +827,7 @@ msgstr "你的订单日期是过去的时间"
 msgid ""
 "There is no previous order recorded. Click on \"My Lunch\" and then create a"
 " new lunch order."
-msgstr ""
+msgstr "未记录先前订单。单击“我的午餐”然后创建新增午餐订单。"
 
 #. module: lunch
 #. openerp-web
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index a6c9b62e019..fa48b112aa8 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -68,12 +68,12 @@
 <div>
 <div t-if="has_button_access" itemscope="itemscope" itemtype="http://schema.org/EmailMessage">
     <div itemprop="potentialAction" itemscope="itemscope" itemtype="http://schema.org/ViewAction">
-        <link itemprop="target" href="${ctx['button_access']['url']}"/>
-        <link itemprop="url" href="${ctx['button_access']['url']}"/>
-        <meta itemprop="name" content="View ${ctx['model_name']}"/>
+        <link itemprop="target" t-att-href="button_access['url']"/>
+        <link itemprop="url" t-att-href="button_access['url']"/>
+        <meta itemprop="name" t-att-content="button_access['title']"/>
     </div>
 </div>
-<div t-if="has_button_access or len(actions) &gt; 0 or is_notification"
+<div t-if="has_button_access or len(actions) &gt; 0 or not is_discussion"
         summary="o_mail_notification" style="padding: 0px; width:600px;">
     <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin-top: 5px;">
     <tbody><tr>
@@ -116,9 +116,9 @@
 <p style="color: #555555;">
     Sent by
     <a t-if="website_url" t-att-href="website_url" style="text-decoration:none; color: #875A7B;">
-        <span t-esc="company_name"/>
+        <span t-esc="company.name"/>
     </a>
-    <span t-if="not website_url" t-esc="company_name"/>
+    <span t-if="not website_url" t-esc="company.name"/>
     using
     <a target="_blank" href="https://www.odoo.com" style="text-decoration:none; color: #875A7B;">Odoo</a>.
 </p>
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 6a7b1f181ec..065a45f4099 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Markus Menner <markus.menner@axxelia.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Leon Fischer <leon.fischer621@gmail.com>, 2017
@@ -19,28 +19,29 @@
 # key six <mobile.umts@gmail.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Thomas Neu <t.neu@runbox.com>, 2017
-# Tom <github@strohmeier.email>, 2017
+# Tom, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Dejan Dinic <dejan.dinic@bluewin.ch>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -311,7 +312,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/activity.xml:49
 #, python-format
 msgid ", due on"
-msgstr ""
+msgstr ", fällig am"
 
 #. module: mail
 #. openerp-web
@@ -2962,7 +2963,7 @@ msgstr "Zuhörer"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_channel_partner
 msgid "Listeners of a Channel"
-msgstr ""
+msgstr "Hörer eines Kanals"
 
 #. module: mail
 #: selection:mail.channel,channel_type:0
@@ -4888,6 +4889,9 @@ msgid ""
 "Specify a model if the activity should be specific to a model and not "
 "available when managing activities for other models."
 msgstr ""
+"Spezifizieren Sie ein Modell, wenn die Aktivität für ein Modell spezifisch "
+"sein und beim Verwalten von Tätigkeiten für andere Modelle nicht verfügbar "
+"sein soll."
 
 #. module: mail
 #. openerp-web
@@ -5593,7 +5597,7 @@ msgstr "Ansicht"
 #: code:addons/mail/models/mail_thread.py:668
 #, python-format
 msgid "View %s"
-msgstr ""
+msgstr "%s ansehen"
 
 #. module: mail
 #. openerp-web
@@ -5877,7 +5881,7 @@ msgstr "Nicht richtig konfigurierter alias "
 #: code:addons/mail/models/mail_alias.py:278
 #, python-format
 msgid "incorrectly configured alias (unknown reference record)"
-msgstr ""
+msgstr "Nicht richtig konfigurierter Alias (unbekannter Referenzdatensatz)"
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_actions_server
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 2836fe7d31d..8e88042d498 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -5543,7 +5543,7 @@ msgstr "关注者"
 #: code:addons/mail/static/src/xml/activity.xml:30
 #, python-format
 msgid "for"
-msgstr ""
+msgstr "由于"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_origin_link
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 0d855dd15de..724f78ed827 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -749,9 +749,10 @@ class Message(models.Model):
                         'datas_fname': name,
                         'res_model': 'mail.message',
                     })
+                    attachment.generate_access_token()
                     values['attachment_ids'].append((4, attachment.id))
-                    data_to_url[key] = '/web/image/%s' % attachment.id
-                return '%s%s alt="%s"' % (data_to_url[key], match.group(3), name)
+                    data_to_url[key] = ['/web/image/%s?access_token=%s' % (attachment.id, attachment.access_token), name]
+                return '%s%s alt="%s"' % (data_to_url[key][0], match.group(3), data_to_url[key][1])
             values['body'] = _image_dataurl.sub(base64_to_boundary, tools.ustr(values['body']))
 
         # delegate creation of tracking after the create as sudo to avoid access rights issues
diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index 2407e58fdbd..17cea52deac 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -315,45 +315,8 @@ class MailTemplate(models.Model):
     # ----------------------------------------
 
     @api.model
-    def _replace_local_links(self, html):
-        """ Post-processing of html content to replace local links to absolute
-        links, using web.base.url as base url. """
-        if not html:
-            return html
-
-        # form a tree
-        root = lxml.html.fromstring(html)
-        if not len(root) and root.text is None and root.tail is None:
-            html = u'<div>%s</div>' % html
-            root = lxml.html.fromstring(html, encoding='unicode')
-
-        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        base = urls.url_parse(base_url)
-
-        def _process_link(url):
-            new_url = urls.url_parse(url)
-            if new_url.scheme and (new_url.netloc or new_url.scheme == 'mailto'):
-                return url
-            return new_url.replace(scheme=base.scheme, netloc=base.netloc).to_url()
-
-        # check all nodes, replace :
-        # - img src -> check URL
-        # - a href -> check URL
-        for node in root.iter():
-            if node.tag == 'a' and node.get('href'):
-                node.set('href', _process_link(node.get('href')))
-            elif node.tag == 'img' and not node.get('src', 'data').startswith(u'data'):
-                node.set('src', _process_link(node.get('src')))
-
-        html = lxml.html.tostring(root, pretty_print=False, method='html', encoding='unicode')
-        # this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that
-        if html.startswith(u'<div>') and html.endswith(u'</div>'):
-            html = html[5:-6]
-        return html
-
-    @api.model
     def render_post_process(self, html):
-        html = self._replace_local_links(html)
+        html = self.env['mail.thread']._replace_local_links(html)
         return html
 
     @api.model
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 4ec3af5159e..32639ae75a9 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -23,9 +23,10 @@ from email.message import Message
 from email.utils import formataddr
 from lxml import etree
 from werkzeug import url_encode
+from werkzeug import urls
 
 from odoo import _, api, exceptions, fields, models, tools
-from odoo.tools import pycompat
+from odoo.tools import pycompat, ustr
 from odoo.tools.safe_eval import safe_eval
 
 
@@ -374,6 +375,38 @@ class MailThread(models.AbstractModel):
     # Technical methods / wrappers / tools
     # ------------------------------------------------------
 
+    def _replace_local_links(self, html, base_url=None):
+        """ Replace local links by absolute links. It is required in various
+        cases, for example when sending emails on chatter or sending mass
+        mailings. It replaces
+
+         * href of links (mailto will not match the regex)
+         * src of images (base64 hardcoded data will not match the regex)
+         * styling using url like background-image: url
+
+        It is done using regex because it is shorten than using an html parser
+        to create a potentially complex soupe and hope to have a result that
+        has not been harmed.
+        """
+        if not html:
+            return html
+
+        html = ustr(html)
+
+        def _sub_relative2absolute(match):
+            # compute here to do it only if really necessary + cache will ensure it is done only once
+            # if not base_url
+            if not _sub_relative2absolute.base_url:
+                _sub_relative2absolute.base_url = self.env["ir.config_parameter"].sudo().get_param("web.base.url")
+            return match.group(1) + urls.url_join(_sub_relative2absolute.base_url, match.group(2))
+
+        _sub_relative2absolute.base_url = base_url
+        html = re.sub(r"""(<img(?=\s)[^>]*\ssrc=")(/[^/][^"]+)""", _sub_relative2absolute, html)
+        html = re.sub(r"""(<a(?=\s)[^>]*\shref=")(/[^/][^"]+)""", _sub_relative2absolute, html)
+        html = re.sub(r"""(<[^>]+\bstyle="[^"]+\burl\('?)(/[^/'][^'")]+)""", _sub_relative2absolute, html)
+
+        return html
+
     @api.model
     def _garbage_collect_attachments(self):
         """ Garbage collect lost mail attachments. Those are attachments
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index 6999acc015b..4cee80af16a 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -73,17 +73,15 @@ class Partner(models.Model):
         if message.res_id and message.model in self.env:
             record = self.env[message.model].browse(message.res_id)
 
-        company = user.company_id;
+        company = user.company_id
         if record and hasattr(record, 'company_id'):
-            company = record.company_id;
-        company_name = company.name;
+            company = record.company_id
 
         return {
             'message': message,
             'signature': signature,
             'website_url': website_url,
             'company': company,
-            'company_name': company_name,
             'model_name': model_name,
             'record': record,
             'record_name': record_name,
@@ -187,6 +185,7 @@ class Partner(models.Model):
                     'subject': message.subject or (message.record_name and 'Re: %s' % message.record_name),
                     'body': base_template.render(template_ctx, engine='ir.qweb'),
                 }
+                fol_values['body'] = self.env['mail.thread']._replace_local_links(fol_values['body'])
                 # send email
                 new_emails, new_recipients_nbr = self._notify_send(fol_values['body'], fol_values['subject'], recipient_template_values['recipients'], **base_mail_values)
                 # update notifications
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index 06675ec3902..c4ad1b53306 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -790,11 +790,11 @@ var BasicComposer = Widget.extend({
         var def = $.Deferred();
         clearTimeout(this.canned_timeout);
         this.canned_timeout = setTimeout(function () {
-            var canned_responses = self.call('chat_manager', 'getCannedResponses');
-            var matches = fuzzy.filter(utils.unaccent(search), _.pluck(canned_responses, 'source'));
+            var cannedResponses = self.call('chat_manager', 'getCannedResponses');
+            var matches = fuzzy.filter(utils.unaccent(search), _.pluck(cannedResponses, 'source'));
             var indexes = _.pluck(matches.slice(0, self.options.mention_fetch_limit), 'index');
             def.resolve(_.map(indexes, function (i) {
-                return canned_responses[i];
+                return cannedResponses[i];
             }));
         }, 500);
         return def;
diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js
index 52bf2b75822..3b405761169 100644
--- a/addons/mail/static/src/js/discuss.js
+++ b/addons/mail/static/src/js/discuss.js
@@ -63,13 +63,14 @@ var PartnerInviteDialog = Dialog.extend({
                 return $('<span>').text(item.text).prepend(status);
             },
             query: function (query) {
-                self.call('chat_manager', 'searchPartner', query.term, 20).then(function (partners) {
-                    query.callback({
-                        results: _.map(partners, function (partner) {
-                            return _.extend(partner, { text: partner.label });
-                        }),
+                self.call('chat_manager', 'searchPartner', query.term, 20)
+                    .then(function (partners) {
+                        query.callback({
+                            results: _.map(partners, function (partner) {
+                                return _.extend(partner, { text: partner.label });
+                            }),
+                        });
                     });
-                });
             }
         });
         return this._super.apply(this, arguments);
@@ -152,15 +153,13 @@ var Discuss = Widget.extend(ControlPanelMixin, {
             .then(function (fields_view) {
                 self.fields_view = fields_view;
             });
-        var chatReady = this.call('chat_manager', 'isReady');
-        return $.when(this._super(), chatReady, def);
+        return $.when(this._super(), this.call('chat_manager', 'isReady'), def);
     },
     /**
      * @override
      */
     start: function () {
         var self = this;
-
         var defaultChannel = this.call('chat_manager', 'getChannel', this.defaultChannelID) ||
                                 this.call('chat_manager', 'getChannel', 'channel_inbox');
 
@@ -214,8 +213,7 @@ var Discuss = Widget.extend(ControlPanelMixin, {
      * @override
      */
     on_attach_callback: function () {
-        var chatBus = this.call('chat_manager', 'getChatBus');
-        chatBus.trigger('discuss_open', true);
+        this.call('chat_manager', 'getChatBus').trigger('discuss_open', true);
         if (this.channel) {
             this.thread.scroll_to({offset: this.channelsScrolltop[this.channel.id]});
         }
@@ -224,8 +222,7 @@ var Discuss = Widget.extend(ControlPanelMixin, {
      * @override
      */
     on_detach_callback: function () {
-        var chatBus = this.call('chat_manager', 'getChatBus');
-        chatBus.trigger('discuss_open', false);
+        this.call('chat_manager', 'getChatBus').trigger('discuss_open', false);
         this.channelsScrolltop[this.channel.id] = this.thread.get_scrolltop();
     },
 
@@ -582,7 +579,7 @@ var Discuss = Widget.extend(ControlPanelMixin, {
         chatBus.on('new_channel', this, this._onNewChannel);
         chatBus.on('anyone_listening', this, function (channel, query) {
             query.is_displayed = query.is_displayed ||
-                                 (channel.id === this.channel.id && this.thread.is_at_bottom());
+                                (channel.id === this.channel.id && this.thread.is_at_bottom());
         });
         chatBus.on('unsubscribe_from_channel', this, this._onChannelLeft);
         chatBus.on('update_needaction', this, this.throttledUpdateChannels);
@@ -642,7 +639,7 @@ var Discuss = Widget.extend(ControlPanelMixin, {
             needaction_counter: this.call('chat_manager', 'getNeedactionCounter'),
             starred_counter: this.call('chat_manager', 'getStarredCounter'),
         });
-        self.$(".o_mail_chat_sidebar").html($sidebar.contents());
+        this.$(".o_mail_chat_sidebar").html($sidebar.contents());
         _.each(['dm', 'public', 'private'], function (type) {
             var $input = self.$('.o_mail_add_channel[data-type=' + type + '] input');
             self._prepareAddChannelInput($input, type);
@@ -791,10 +788,10 @@ var Discuss = Widget.extend(ControlPanelMixin, {
                         domain: this.domain
                 }).then(function (messages) {
                     var options = self._getThreadRenderingOptions(messages);
-                    self.thread.remove_message_and_render(message.id, messages, options).then(function () {
-                        self._updateButtonStatus(messages.length === 0, type);
-                
-                    });
+                    self.thread.remove_message_and_render(message.id, messages, options)
+                        .then(function () {
+                            self._updateButtonStatus(messages.length === 0, type);
+                        });
                 });
         } else if (_.contains(message.channel_ids, currentChannelID)) {
             this._fetchAndRenderThread();
diff --git a/addons/mail/static/src/js/extended_chat_window.js b/addons/mail/static/src/js/extended_chat_window.js
index a8aa5673b81..a85740ac5e1 100644
--- a/addons/mail/static/src/js/extended_chat_window.js
+++ b/addons/mail/static/src/js/extended_chat_window.js
@@ -48,8 +48,7 @@ return ChatWindow.extend({
         event.stopPropagation();
     },
     on_reverse_breadcrumb: function () {
-        var chatBus = this.call('chat_manager', 'getChatBus');
-        chatBus.trigger('discuss_open', false);
+        this.call('chat_manager', 'getChatBus').trigger('discuss_open', false);
      },
     on_click_expand: _.debounce(function (event) {
         event.preventDefault();
diff --git a/addons/mail/static/src/js/services/chat_manager.js b/addons/mail/static/src/js/services/chat_manager.js
index b7c46f2d4c1..fb4b6672bc6 100644
--- a/addons/mail/static/src/js/services/chat_manager.js
+++ b/addons/mail/static/src/js/services/chat_manager.js
@@ -16,11 +16,11 @@ var _lt = core._lt;
 
 var LIMIT = 30; // max number of fetched messages from the server
 var PREVIEW_MSG_MAX_SIZE = 350;  // optimal for native english speakers
-var ODOOBOT_ID = "ODOOBOT"; // default author_id for messages 
+var ODOOBOT_ID = "ODOOBOT"; // default author_id for messages
 
 /**
  * This service handles everything about chat channels and messages.
- * 
+ *
  * There are basically two points of entry:
  *
  *      1. Calling a public method by means of 'this.call'
@@ -54,13 +54,13 @@ var ChatManager =  AbstractService.extend({
         this.pinnedDmPartners = [];  // partner_ids we have a pinned DM with
         this.discussOpen = false;
 
-        this.chatBus = new Bus();
+        this.chatBus = new Bus(this);
         this.busBus = this.call('bus_service', 'getBus');
 
         this.chatBus.on('discuss_open', null, function (open) {
             self.discussOpen = open;
         });
-        
+
         this.busBus.on('notification', this, this._onNotification);
         this.busBus.on('window_focus', this, this._onWindowFocus);
 
@@ -77,12 +77,12 @@ var ChatManager =  AbstractService.extend({
 
         this._isReady = this._initMessaging();
 
+        // Add static channels
         this._addChannel({
             id: "channel_inbox",
             name: _lt("Inbox"),
             type: "static",
         }, { displayNeedactions: true });
-
         this._addChannel({
             id: "channel_starred",
             name: _lt("Starred"),
@@ -181,7 +181,7 @@ var ChatManager =  AbstractService.extend({
      * Returns a channel corresponding to the given id.
      *
      * @param  {string|integer} id e.g. 'channel_inbox', 'channel_starred'
-     * @return {Object|undefined} channel
+     * @return {Object|undefined} the channel, if it exists
      */
     getChannel: function (id) {
         return _.findWhere(this.channels, {id: id});
@@ -189,7 +189,7 @@ var ChatManager =  AbstractService.extend({
     /**
      * Returns a list of channels
      *
-     * @return {Object[]}
+     * @return {Object[]} list of channels
      */
     getChannels: function () {
         return _.clone(this.channels);
@@ -282,12 +282,13 @@ var ChatManager =  AbstractService.extend({
      * Show the list of available commands next to a message (e.g. star)
      *
      * @param  {Object} channel
-     * @return {Array}
+     * @return {Array} list of commands
      */
     getCommands: function (channel) {
-        return _.filter(this.commands, function (command) {
+        var commands = _.filter(this.commands, function (command) {
             return !command.channel_types || _.contains(command.channel_types, channel.server_type);
         });
+        return commands;
     },
     /**
      * Returns the record id of ir.ui.menu for Discuss
@@ -309,7 +310,7 @@ var ChatManager =  AbstractService.extend({
     /**
      * Returns list of emojis Objects
      *
-     * @return {Object[]}
+     * @return {Object[]} list of emojis
      * ['id', 'source', 'unicode_source', 'substitution', 'description']
      */
     getEmojis: function () {
@@ -319,9 +320,10 @@ var ChatManager =  AbstractService.extend({
      * Get the last seen message for a given channel
      *
      * @param  {Object} channel
-     * @return {Object} Message Object
+     * @return {Object|undefined} last seen Message Object (if any)
      */
     getLastSeenMessage: function (channel) {
+        var result;
         if (channel.last_seen_message_id) {
             var messages = channel.cache['[]'].messages;
             var msg = _.findWhere(messages, {id: channel.last_seen_message_id});
@@ -332,9 +334,10 @@ var ChatManager =  AbstractService.extend({
                         msg = messages[i];
                         i++;
                 }
-                return msg;
+                result = msg;
             }
         }
+        return result;
     },
     /**
      * Get all listeners of a channel.
@@ -378,22 +381,22 @@ var ChatManager =  AbstractService.extend({
      * Gets message from its id
      *
      * @param  {integer} msgID
-     * @return {Object|undefined} Message Object
+     * @return {Object|undefined} Message Object (if any)
      */
     getMessage: function (msgID) {
         return _.findWhere(this.messages, {id: msgID});
     },
     /**
      * Gets messages from channel or ids or record (model and res_id):
-     * 
+     *
      *      1. From channel if we have 'channelID' in options
      *      2. From ids if we have 'ids' in options
      *      3. From model if we have 'model' and 'res_id' in options
-     * 
+     *
      * Rule of precedence:
-     * 
+     *
      *      'channelID' < 'ids' < 'model' and 'res_id'
-     * 
+     *
      * If we have none of the cases above, we return an empty list.
      *
      * @param  {Object} [options]
@@ -451,7 +454,7 @@ var ChatManager =  AbstractService.extend({
      * Returns the number of messages received from followed channels
      * + all messages where the current user is notified.
      *
-     * @return {integer}
+     * @return {integer} needaction counter
      */
     getNeedactionCounter: function () {
         return this.needactionCounter;
@@ -459,7 +462,7 @@ var ChatManager =  AbstractService.extend({
     /**
      * Gets the number of starred message
      *
-     * @return {integer}
+     * @return {integer} starred counter
      */
     getStarredCounter: function () {
         return this.starredCounter;
@@ -467,7 +470,7 @@ var ChatManager =  AbstractService.extend({
     /**
      * Gets the number of conversation which contains unread messages
      *
-     * @return {integer}
+     * @return {integer} unread conversation counter
      */
     getUnreadConversationCounter: function () {
         return this.unreadConversationCounter;
@@ -491,7 +494,7 @@ var ChatManager =  AbstractService.extend({
     /**
      * join an existing channel
      * See @createChannel to join a new channel
-     * 
+     *
      * @param  {integer} channelID
      * @param  {Object} [options]
      * @return {$.Promise<Object>} resolved with channel object
@@ -593,7 +596,7 @@ var ChatManager =  AbstractService.extend({
     },
     /**
      * Open the channel:
-     * 
+     *
      *      1. If discuss is opened, asks discuss to open the channel
      *      2. Otherwise, asks the chat_window_manager to detach the channel
      *
@@ -604,14 +607,14 @@ var ChatManager =  AbstractService.extend({
     },
     /**
      * Prepares and sends a message to the server:
-     * 
+     *
      *      1. Either the message is posted on a channel
      *      2. Or the message is posted in a model's record (chatter)
      *
      * Rule of precedence:
-     * 
+     *
      *      'channelID' < 'model' & 'res_id'
-     * 
+     *
      * If options as none of these parameters, do nothing and return
      * a promise no resolved item.
      *
@@ -856,7 +859,7 @@ var ChatManager =  AbstractService.extend({
      * @param  {string} [data.state] e.g. 'open', 'folded'
      * @param  {Object|integer} [options=undefined]
      * @param  {boolean} [options.silent]
-     * @return {Object} the newly or already exisiting channel
+     * @return {Object} the newly or already existing channel
      */
     _addChannel: function (data, options) {
         options = typeof options === "object" ? options : {};
@@ -909,7 +912,7 @@ var ChatManager =  AbstractService.extend({
      * @param  {Object} data message data
      * @param  {integer} data.id
      * @param  {Object} [options]
-     * @param  {Array} [options.domain] 
+     * @param  {Array} [options.domain]
      * @param  {boolean} [options.increment_unread] whether we should increment
      *      the unread_counter of channel.
      * @param  {boolean} [options.silent] whether it should inform in the chatBus
@@ -1134,6 +1137,7 @@ var ChatManager =  AbstractService.extend({
                     }
                 }
             });
+
             self.busBus.start_polling();
         });
     },
@@ -1466,7 +1470,7 @@ var ChatManager =  AbstractService.extend({
         }
     },
     /**
-     * Updates channel_inbox when a message has marked as read. 
+     * Updates channel_inbox when a message has marked as read.
      *
      * @private
      * @param  {Object} data
@@ -1746,6 +1750,8 @@ var ChatManager =  AbstractService.extend({
 
 });
 
+core.serviceRegistry.add('chat_manager', ChatManager);
+
 return ChatManager;
 
 });
diff --git a/addons/mail/static/src/js/services/chat_window_manager.js b/addons/mail/static/src/js/services/chat_window_manager.js
index f82da369ecf..bab6fbf7729 100644
--- a/addons/mail/static/src/js/services/chat_window_manager.js
+++ b/addons/mail/static/src/js/services/chat_window_manager.js
@@ -40,8 +40,7 @@ var ChatWindowManager =  AbstractService.extend({
             spaceLeft: 0,
             windowsDropdownIsOpen: false,  // used to keep dropdown open when closing chat windows
         };
-        var chatReady = this.call('chat_manager', 'isReady');
-        chatReady.then(function () {
+        this.call('chat_manager', 'isReady').then(function () {
             var channels = self.call('chat_manager', 'getChannels');
             _.each(channels, function (channel) {
                 if (channel.is_detached) {
@@ -88,7 +87,7 @@ var ChatWindowManager =  AbstractService.extend({
      * @param {boolean} [options.passively] if set to true, open the chat window
      * without focusing the input and marking messages as read if it is not
      * open yet, and do nothing otherwise
-     */ 
+     */
     openChat: function (session, options) {
         var self = this;
         if (!session) {
@@ -188,7 +187,7 @@ var ChatWindowManager =  AbstractService.extend({
     },
     /**
      * Called when unfolding the chat window
-     * 
+     *
      * @param {Object} channel
      * @param {integer} channel.id
      * @param {boolean} [channel.is_folded]
@@ -326,12 +325,13 @@ var ChatWindowManager =  AbstractService.extend({
                     var channel = self.call('chat_manager', 'getChannel', session.id);
                     self.call('chat_manager', 'markChannelAsSeen', channel);
                 }
-                self.call('chat_manager', 'getMessages', {channelID: session.id}).then(function (messages) {
-                    session.window.render(messages);
-                    if (scrollBottom && messageVisible) {
-                        session.window.thread.scroll_to();
-                    }
-                });
+                self.call('chat_manager', 'getMessages', {channelID: session.id})
+                    .then(function (messages) {
+                        session.window.render(messages);
+                        if (scrollBottom && messageVisible) {
+                            session.window.thread.scroll_to();
+                        }
+                    });
             }
         });
     },
@@ -386,7 +386,7 @@ var ChatWindowManager =  AbstractService.extend({
         });
         this.displayState.hiddenSessions = hiddenSessions;
         this.displayState.hiddenUnreadCounter = hiddenUnreadCounter;
-    
+
         if (this.displayState.$hidden_windows_dropdown) {
             this.displayState.$hidden_windows_dropdown.remove();
         }
@@ -397,7 +397,7 @@ var ChatWindowManager =  AbstractService.extend({
                                     .appendTo($('body'));
             this._repositionHiddenSessionsDropdown();
             this.displayState.windowsDropdownIsOpen = false;
-    
+
             $hiddenWindowsDropdown.on('click', '.o_chat_header', function (event) {
                 var sessionID = $(event.currentTarget).data('session-id');
                 var session = _.findWhere(hiddenSessions, {id: sessionID});
@@ -527,6 +527,8 @@ var ChatWindowManager =  AbstractService.extend({
 
 });
 
+core.serviceRegistry.add('chat_window_manager', ChatWindowManager);
+
 return ChatWindowManager;
 
 });
diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js
index f2dfdc631ab..f6c19a1c164 100644
--- a/addons/mail/static/src/js/systray.js
+++ b/addons/mail/static/src/js/systray.js
@@ -36,8 +36,7 @@ var MessagingMenu = Widget.extend({
         var chatBus = this.call('chat_manager', 'getChatBus');
         chatBus.on("update_needaction", this, this.update_counter);
         chatBus.on("update_channel_unread_counter", this, this.update_counter);
-        var chatReady = this.call('chat_manager', 'isReady');
-        chatReady.then(this.update_counter.bind(this));
+        this.call('chat_manager', 'isReady').then(this.update_counter.bind(this));
         return this._super();
     },
     is_open: function () {
@@ -58,8 +57,7 @@ var MessagingMenu = Widget.extend({
 
         // Display spinner while waiting for channels preview
         this.$channels_preview.html(QWeb.render('Spinner'));
-        var chatReady = this.call('chat_manager', 'isReady');
-        chatReady.then(function () {
+        this.call('chat_manager', 'isReady').then(function () {
             var allChannels = self.call('chat_manager', 'getChannels');
             var channels = _.filter(allChannels, function (channel) {
                 if (self.filter === 'chat') {
@@ -70,23 +68,28 @@ var MessagingMenu = Widget.extend({
                     return channel.type !== 'static';
                 }
             });
-            self.call('chat_manager', 'getMessages', {channelID: 'channel_inbox'}).then(function (result) {
-                var res = [];
-                _.each(result, function (message) {
-                    message.unread_counter = 1;
-                    var duplicatedMessage = _.findWhere(res, {model: message.model, 'res_id': message.res_id});
-                    if (message.model && message.res_id && duplicatedMessage) {
-                        message.unread_counter = duplicatedMessage.unread_counter + 1;
-                        res[_.findIndex(res, duplicatedMessage)] = message;
-                    } else {
-                        res.push(message);
+            self.call('chat_manager', 'getMessages', {channelID: 'channel_inbox'})
+                .then(function (messages) {
+                    var res = [];
+                    _.each(messages, function (message) {
+                        message.unread_counter = 1;
+                        var duplicatedMessage = _.findWhere(res, {
+                            model: message.model,
+                            'res_id': message.res_id
+                        });
+                        if (message.model && message.res_id && duplicatedMessage) {
+                            message.unread_counter = duplicatedMessage.unread_counter + 1;
+                            res[_.findIndex(res, duplicatedMessage)] = message;
+                        } else {
+                            res.push(message);
+                        }
+                    });
+                    if (self.filter === 'channel_inbox' || !self.filter) {
+                        channels = _.union(channels, res);
                     }
+                    self.call('chat_manager', 'getChannelsPreview', channels)
+                        .then(self._render_channels_preview.bind(self));
                 });
-                if (self.filter === 'channel_inbox' || !self.filter) {
-                    channels = _.union(channels, res);
-                }
-                self.call('chat_manager', 'getChannelsPreview', channels).then(self._render_channels_preview.bind(self));
-            });
         });
     },
     _render_channels_preview: function (channels_preview) {
@@ -129,7 +132,7 @@ var MessagingMenu = Widget.extend({
                 this.do_action({
                     type: 'ir.actions.act_window',
                     res_model: resModel,
-                    views: [[false, 'form'], [false, 'kanban']],
+                    views: [[false, 'form']],
                     res_id: resID
                 });
             } else {
@@ -142,7 +145,7 @@ var MessagingMenu = Widget.extend({
         } else {
             var channel = this.call('chat_manager', 'getChannel', channelID);
             if (channel) {
-                self.call('chat_manager', 'openChannel', channel);
+                this.call('chat_manager', 'openChannel', channel);
             }
         }
     },
@@ -159,10 +162,8 @@ var ActivityMenu = Widget.extend({
     },
     start: function () {
         this.$activities_preview = this.$('.o_mail_navbar_dropdown_channels');
-        var chatBus = this.call('chat_manager', 'getChatBus');
-        chatBus.on("activity_updated", this, this._updateCounter);
-        var chatReady = this.call('chat_manager', 'isReady');
-        chatReady.then(this._updateCounter.bind(this));
+        this.call('chat_manager', 'getChatBus').on("activity_updated", this, this._updateCounter);
+        this.call('chat_manager', 'isReady').then(this._updateCounter.bind(this));
         this._updateActivityPreview();
         return this._super();
     },
diff --git a/addons/mail/static/src/js/thread_field.js b/addons/mail/static/src/js/thread_field.js
index 0a745b69a96..6d036208eb2 100644
--- a/addons/mail/static/src/js/thread_field.js
+++ b/addons/mail/static/src/js/thread_field.js
@@ -21,8 +21,7 @@ var ThreadField = AbstractField.extend({
         this.msgIDs = this.value.res_ids;
     },
     willStart: function () {
-        var chatReady = this.call('chat_manager', 'isReady');
-        return this.alive(chatReady);
+        return this.alive(this.call('chat_manager', 'isReady'));
     },
     start: function () {
         var self = this;
@@ -78,7 +77,7 @@ var ThreadField = AbstractField.extend({
     /**
      * @param  {Object} message
      * @param  {integer[]} message.partner_ids
-     * @return {Deferred}
+     * @return {$.Promise}
      */
     postMessage: function (message) {
         var self = this;
diff --git a/addons/mail/static/tests/chat_window_tests.js b/addons/mail/static/tests/chat_window_tests.js
index a892d8e26e6..ab5a9f03538 100644
--- a/addons/mail/static/tests/chat_window_tests.js
+++ b/addons/mail/static/tests/chat_window_tests.js
@@ -11,7 +11,11 @@ var Widget = require('web.Widget');
 
 var createBusService = mailTestUtils.createBusService;
 
-QUnit.module('mail', {}, function () {
+QUnit.module('mail', {
+    beforeEach: function () {
+        this.services = [ChatManager, createBusService()];
+    },
+}, function () {
 
     QUnit.module('chat_window');
 
@@ -39,6 +43,7 @@ QUnit.module('mail', {}, function () {
         }];
         var parent = createParent({
             data: {},
+            services: this.services,
         });
 
         var chatWindow = new ChatWindow(parent, 1, "user", false, messages, {});
@@ -67,6 +72,7 @@ QUnit.module('mail', {}, function () {
         }
         var parent = createParent({
             data: {},
+            services: this.services,
         });
 
         var $dom = $('#qunit-fixture');
@@ -93,8 +99,6 @@ QUnit.module('mail', {}, function () {
     QUnit.test('emoji popover should open correctly in chat windows', function (assert) {
         assert.expect(1);
 
-        var BusService = createBusService();
-
         function createParent(params) {
             var widget = new Widget();
 
@@ -107,7 +111,7 @@ QUnit.module('mail', {}, function () {
         }
         var parent = createParent({
             data: {},
-            services: [ChatManager, BusService],
+            services: this.services,
         });
 
         var $dom = $('#qunit-fixture');
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index d348decbb1a..985f61047b3 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -21,7 +21,7 @@ QUnit.module('mail', {}, function () {
 
 QUnit.module('Chatter', {
     beforeEach: function () {
-        this.BusService = createBusService();
+        this.services = [ChatManager, createBusService()];
         this.data = {
             partner: {
                 fields: {
@@ -98,6 +98,7 @@ QUnit.test('basic rendering', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -121,7 +122,6 @@ QUnit.test('basic rendering', function (assert) {
             }
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
         res_id: 2,
     });
 
@@ -150,6 +150,7 @@ QUnit.test('chatter in create mode', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -165,7 +166,6 @@ QUnit.test('chatter in create mode', function (assert) {
             }
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
     });
 
     assert.strictEqual(form.$('.o_chatter').length, 1,
@@ -213,6 +213,7 @@ QUnit.test('chatter rendering inside the sheet', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -232,7 +233,6 @@ QUnit.test('chatter rendering inside the sheet', function (assert) {
             }
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
     });
 
     assert.strictEqual(form.$('.o_chatter').length, 1,
@@ -241,7 +241,7 @@ QUnit.test('chatter rendering inside the sheet', function (assert) {
     form.$buttons.find('.o_form_button_create').click();
     assert.ok(form.$el.find('.o_form_view').hasClass('o_form_editable'),
         "we should be in create mode");
-    
+
     assert.strictEqual(form.$('.o_chatter').length, 1,
         "chatter should be displayed");
 
@@ -396,6 +396,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: [ChatManager, BusService],
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -455,7 +456,6 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
             return this._super(route, args);
         },
         session: {},
-        services: [ChatManager, BusService],
     });
 
     assert.ok(form.$('.o_chatter_topbar .o_chatter_button_log_note').length,
@@ -546,6 +546,7 @@ QUnit.test('chatter: post a message and switch in edit mode', function (assert)
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -582,10 +583,9 @@ QUnit.test('chatter: post a message and switch in edit mode', function (assert)
                 });
                 return $.when(42);
             }
-            
+
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
     });
 
     assert.strictEqual(form.$('.o_thread_message').length, 0, "thread should not contain messages");
@@ -652,6 +652,7 @@ QUnit.test('chatter: Attachment viewer', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -675,7 +676,6 @@ QUnit.test('chatter: Attachment viewer', function (assert) {
             }
             return this._super.apply(this, arguments);
         },
-        services: [ChatManager, this.BusService],
     });
     assert.strictEqual(form.$('.o_thread_message .o_attachment').length, 4,
         "there should be three attachment on message");
@@ -720,6 +720,7 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -746,7 +747,6 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
             }
             return this._super.apply(this, arguments);
         },
-        services: [ChatManager, this.BusService],
         intercepts: {
             do_action: function (event) {
                 assert.deepEqual(event.data.action, {
@@ -784,6 +784,7 @@ QUnit.test('form activity widget: schedule activity does not discard changes', f
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -800,7 +801,6 @@ QUnit.test('form activity widget: schedule activity does not discard changes', f
             }
             return this._super.apply(this, arguments);
         },
-        services: [ChatManager, this.BusService],
         intercepts: {
             do_action: function (event) {
                 event.data.options.on_close();
@@ -852,6 +852,7 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -903,7 +904,6 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
             }
             return this._super.apply(this, arguments);
         },
-        services: [ChatManager, this.BusService],
     });
 
     assert.strictEqual(form.$('.o_mail_activity .o_thread_message').length, 2,
@@ -951,6 +951,7 @@ QUnit.test('followers widget: follow/unfollow, edit subtypes', function (assert)
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -1071,6 +1072,7 @@ QUnit.test('followers widget: do not display follower duplications', function (a
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form>' +
                 '<sheet></sheet>' +
                 '<div class="oe_chatter">' +
@@ -1129,6 +1131,7 @@ QUnit.test('does not render and crash when destroyed before chat system is ready
         View: FormView,
         model: 'partner',
         data: this.data,
+        services: this.services,
         arch: '<form string="Partners">' +
                 '<sheet>' +
                     '<field name="foo"/>' +
@@ -1159,7 +1162,6 @@ QUnit.test('does not render and crash when destroyed before chat system is ready
             }
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
         intercepts: {
             get_session: function (event) {
                 event.stopPropagation();
diff --git a/addons/mail/static/tests/discuss_mobile_tests.js b/addons/mail/static/tests/discuss_mobile_tests.js
index 431a433c19f..4e96c87f512 100644
--- a/addons/mail/static/tests/discuss_mobile_tests.js
+++ b/addons/mail/static/tests/discuss_mobile_tests.js
@@ -11,7 +11,7 @@ QUnit.module('mail', {}, function () {
 
 QUnit.module('Discuss client action in mobile', {
     beforeEach: function () {
-        this.BusService = createBusService();
+        this.services = [ChatManager, createBusService()];
         this.data = {
             'mail.message': {
                 fields: {},
@@ -33,17 +33,17 @@ QUnit.test('mobile basic rendering', function (assert) {
         id: 1,
         context: {},
         params: {},
+        data: this.data,
+        services: this.services,
         mockRPC: function (route, args) {
             if (args.method === 'message_fetch') {
                 return $.when([]);
             }
             return this._super.apply(this, arguments);
         },
-        services: [ChatManager, this.BusService],
     });
 
-    var chatReady = discuss.call('chat_manager', 'isReady');
-    chatReady.then(function () {
+    discuss.call('chat_manager', 'isReady').then(function () {
         // test basic rendering in mobile
         assert.strictEqual(discuss.$('.o_mail_chat_mobile_control_panel').length, 1,
             "should have rendered a control panel");
diff --git a/addons/mail/static/tests/helpers/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js
index 3d107688537..e0a8a0a13de 100644
--- a/addons/mail/static/tests/helpers/test_utils.js
+++ b/addons/mail/static/tests/helpers/test_utils.js
@@ -17,43 +17,41 @@ var Widget = require('web.Widget');
 
 /**
  * Create a mock bus_service, using 'bus' instead of bus.bus
- * 
+ *
  * @param {web.bus} bus
  * @return {AbstractService} the mock bus_service
  */
 function createBusService(bus) {
-
     var BusService =  AbstractService.extend({
         name: 'bus_service',
         /**
          * @override
          */
-        init: function (parent) {
+        init: function () {
             this._super.apply(this, arguments);
             if (!bus) {
                 bus = new Bus();
             }
             this.bus = new _.extend(bus, {
                 /**
-                 * Do nothing 
+                 * Do nothing
                  */
                 start_polling: function () {},
             });
         },
-    
+
         //--------------------------------------------------------------------------
         // Public
         //--------------------------------------------------------------------------
-    
+
         /**
          * Get the bus
          */
         getBus: function () {
             return this.bus;
         },
-    
     });
-    
+
     return BusService;
 }
 
diff --git a/addons/mail/static/tests/systray_tests.js b/addons/mail/static/tests/systray_tests.js
index 2481c4d6550..4ac60c7e123 100644
--- a/addons/mail/static/tests/systray_tests.js
+++ b/addons/mail/static/tests/systray_tests.js
@@ -13,7 +13,7 @@ QUnit.module('mail', {}, function () {
 
 QUnit.module('ActivityMenu', {
     beforeEach: function () {
-        this.BusService = createBusService();
+        this.services = [ChatManager, createBusService()];
         this.data = {
             'mail.activity.menu': {
                 fields: {
@@ -58,13 +58,13 @@ QUnit.test('activity menu widget: menu with no records', function (assert) {
 
     var activityMenu = new systray.ActivityMenu();
     testUtils.addMockEnvironment(activityMenu, {
+            services: this.services,
             mockRPC: function (route, args) {
                 if (args.method === 'activity_user_count') {
                     return $.when([]);
                 }
                 return this._super(route, args);
             },
-            services: [ChatManager, this.BusService]
         });
     activityMenu.appendTo($('#qunit-fixture'));
     assert.ok(activityMenu.$('.o_no_activity').hasClass('o_no_activity'), "should not have instance of widget");
@@ -76,13 +76,13 @@ QUnit.test('activity menu widget: activity menu with 3 records', function (asser
     var self = this;
     var activityMenu = new systray.ActivityMenu();
     testUtils.addMockEnvironment(activityMenu, {
+        services: this.services,
         mockRPC: function (route, args) {
             if (args.method === 'activity_user_count') {
                 return $.when(self.data['mail.activity.menu']['records']);
             }
             return this._super(route, args);
         },
-        services: [ChatManager, this.BusService],
     });
     activityMenu.appendTo($('#qunit-fixture'));
     assert.ok(activityMenu.$el.hasClass('o_mail_navbar_item'), 'should be the instance of widget');
diff --git a/addons/maintenance/i18n/de.po b/addons/maintenance/i18n/de.po
index ea06aa8882b..89d1923f5b2 100644
--- a/addons/maintenance/i18n/de.po
+++ b/addons/maintenance/i18n/de.po
@@ -3,19 +3,19 @@
 # * maintenance
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Tom <github@strohmeier.email>, 2017
+# Tom, 2017
 # Andreas Stauder <andreas.stauder@brain-tec.ch>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
@@ -23,17 +23,18 @@
 # DE R1 <e2fes1@hotmail.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -738,27 +739,27 @@ msgstr "Notiz"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count
 msgid "Number of Requests"
-msgstr ""
+msgstr "Anzahl der Anfragen"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_block
 msgid "Number of Requests Blocked"
-msgstr ""
+msgstr "Anzahl blockierter Anfragen"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_date
 msgid "Number of Requests Scheduled"
-msgstr ""
+msgstr "Anzahl geplanter Anfragen"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_unscheduled
 msgid "Number of Requests Unscheduled"
-msgstr ""
+msgstr "Anzahl nicht geplanter Anfragen"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_high_priority
 msgid "Number of Requests in High Priority"
-msgstr ""
+msgstr "Anzahl von Anfragen mit hoher Priorität"
 
 #. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_force_thread_id
@@ -927,7 +928,7 @@ msgstr "Angefragt von:"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_ids
 msgid "Requests"
-msgstr ""
+msgstr "Anfragen"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id
diff --git a/addons/maintenance/i18n/zh_CN.po b/addons/maintenance/i18n/zh_CN.po
index 42941d300a1..37de8247b89 100644
--- a/addons/maintenance/i18n/zh_CN.po
+++ b/addons/maintenance/i18n/zh_CN.po
@@ -10,13 +10,14 @@
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -572,7 +573,7 @@ msgstr "保养时长"
 #. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_maintenance_duration
 msgid "Maintenance Duration in hours."
-msgstr ""
+msgstr "数小时的维护持续时间。"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
@@ -712,27 +713,27 @@ msgstr "笔记"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count
 msgid "Number of Requests"
-msgstr ""
+msgstr "请求数量"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_block
 msgid "Number of Requests Blocked"
-msgstr ""
+msgstr "已阻止请求的数量"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_date
 msgid "Number of Requests Scheduled"
-msgstr ""
+msgstr "已计划请求的数量"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_unscheduled
 msgid "Number of Requests Unscheduled"
-msgstr ""
+msgstr "未计划请求的数量"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_high_priority
 msgid "Number of Requests in High Priority"
-msgstr ""
+msgstr "高优先级的请求数量"
 
 #. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_force_thread_id
@@ -839,7 +840,7 @@ msgstr "准备好下一个阶段"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
 msgid "Record Colour"
-msgstr ""
+msgstr "记录颜色"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_force_thread_id
@@ -891,12 +892,12 @@ msgstr "请求人"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
 msgid "Requested by :"
-msgstr ""
+msgstr "由谁请求："
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_ids
 msgid "Requests"
-msgstr ""
+msgstr "请求"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id
@@ -908,7 +909,7 @@ msgstr "负责人"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
 msgid "Responsible :"
-msgstr ""
+msgstr "主管："
 
 #. module: maintenance
 #: model:maintenance.equipment,name:maintenance.equipment_monitor1
@@ -1014,7 +1015,7 @@ msgstr "团队成员"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
 msgid "Team Name"
-msgstr ""
+msgstr "团队名称"
 
 #. module: maintenance
 #: model:ir.actions.act_window,name:maintenance.maintenance_team_action_settings
@@ -1070,6 +1071,10 @@ msgid ""
 "                an employee or department. You will manage allocations, issues\n"
 "                and maintenance of equipment."
 msgstr ""
+"该应用程序通过雇员帮助您使用跟踪设备。\n"
+" 创建一些笔记本电脑、打印机或手机并将每一个设备连接到 \n"
+" 雇员或部门。您将管理分配、问题 \n"
+" 以及设备的维护。"
 
 #. module: maintenance
 #: model:ir.actions.act_window,help:maintenance.hr_equipment_action_from_category_form
@@ -1078,6 +1083,9 @@ msgid ""
 "                Create some laptop, printer or phone and link each equipment to an employee or department.\n"
 "                You will manage allocations, issues and maintenance of equipment."
 msgstr ""
+"该应用程序通过雇员帮助您使用跟踪设备。\n"
+" 创建一些笔记本电脑、打印机或手机并将每一个设备连接到雇员或部门。\n"
+" 您将管理分配、问题以及设备的维护。"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
@@ -1121,7 +1129,7 @@ msgstr "未读消息"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
 msgid "Unscheduled"
-msgstr ""
+msgstr "未计划"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
@@ -1136,7 +1144,7 @@ msgstr "未完成的活动(7天内)"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
 msgid "Upcoming Activities (All)"
-msgstr ""
+msgstr "即将到来的活动（全部）"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
@@ -1180,7 +1188,7 @@ msgstr "天"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
 msgid "for"
-msgstr ""
+msgstr "由于"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
diff --git a/addons/mass_mailing/i18n/de.po b/addons/mass_mailing/i18n/de.po
index 1178ef9d1d4..1ac0077567c 100644
--- a/addons/mass_mailing/i18n/de.po
+++ b/addons/mass_mailing/i18n/de.po
@@ -3,34 +3,35 @@
 # * mass_mailing
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Renzo Meister, 2017
+# Niki Waibel, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
-# Tina Milas <tina@uvid.hr>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Tina Milas, 2017
+# Andi, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Philipp Hug <philipp@hug.cx>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1532,7 +1533,7 @@ msgstr "Geplanter Monat"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_next_departure
 msgid "Scheduled date"
-msgstr ""
+msgstr "Geplantes Datum"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
diff --git a/addons/mass_mailing/i18n/zh_CN.po b/addons/mass_mailing/i18n/zh_CN.po
index 43b5427730c..fbedb107cdd 100644
--- a/addons/mass_mailing/i18n/zh_CN.po
+++ b/addons/mass_mailing/i18n/zh_CN.po
@@ -240,7 +240,7 @@ msgstr "有效"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
 msgid "Allow A/B Testing"
-msgstr ""
+msgstr "支持 A/B 测试"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line
@@ -393,7 +393,7 @@ msgstr "点击定义一个新的群发邮件活动"
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_clicked
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
 msgid "Clicked"
-msgstr ""
+msgstr "点击率"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
@@ -540,7 +540,7 @@ msgstr "导致邮件发送失败的技术错误日期"
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_clicked
 msgid "Date when customer clicked on at least one tracked link"
-msgstr ""
+msgstr "客户点击至少一个跟踪链接的日期"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_scheduled
@@ -641,7 +641,7 @@ msgstr "复制"
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.action_view_mail_mail_statistics_mailing_list
 msgid "EMails Sent"
-msgstr ""
+msgstr "已发送的电子邮件"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_email
@@ -688,7 +688,7 @@ msgstr "享受!"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
 msgid "Enjoy,"
-msgstr ""
+msgstr "尽情享受吧，"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_exception
@@ -699,7 +699,7 @@ msgstr "异常"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
 msgid "Exclude Bounced"
-msgstr ""
+msgstr "排除已退回邮件"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
@@ -714,7 +714,7 @@ msgstr "扩展筛选..."
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
 msgid "FROM YOUR NEXT ORDER!"
-msgstr ""
+msgstr "从您的下一个订单开始！"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_facebook
@@ -743,7 +743,7 @@ msgstr "从"
 msgid ""
 "Get your inside sales (CRM) fully integrated with online sales (eCommerce), "
 "in-store sales (Point of Sale) and marketplaces like eBay and Amazon."
-msgstr ""
+msgstr "将内部销售 (CRM) 与网上销售（电子商务）、店内销售（销售点）和市场（如 eBay 和 Amazon）完全集成。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_github
@@ -790,6 +790,7 @@ msgid ""
 "related mail_mail can be deleted separately from its statistics. However the"
 " ID is needed for several action and controllers."
 msgstr ""
+"相关 mail_mail 的 ID。此字段为整数字段，因为可单独将相关 mail_mail 从其统计数据中删除。但是，若干操作和控制器均需要使用 ID。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
@@ -798,6 +799,7 @@ msgid ""
 " lets you send different mailings to randomly selected recipients and test "
 "the effectiveness of the mailings, without causing duplicate messages."
 msgstr ""
+"选中后，在整个营销活动期间，将只向收件人发送一次邮件。这将允许您向随机选择的收件人发送不同邮件，并测试邮件的有效性，而不会导致出现重复的消息。"
 
 #. module: mass_mailing
 #: code:addons/mass_mailing/models/mass_mailing.py:549
@@ -821,7 +823,7 @@ msgstr "归档"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
 msgid "LOGIN"
-msgstr ""
+msgstr "登录"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics___last_update
@@ -990,7 +992,7 @@ msgstr "管理群发邮件营销"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid "Manage campaigns of mass emails with process stages"
-msgstr ""
+msgstr "通过进程阶段管理邮件群发的营销活动"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_name
@@ -1087,7 +1089,7 @@ msgstr "群发邮件标签"
 #: model:ir.cron,cron_name:mass_mailing.ir_cron_mass_mailing_queue
 #: model:ir.cron,name:mass_mailing.ir_cron_mass_mailing_queue
 msgid "Mass Mailing: Process queue"
-msgstr ""
+msgstr "邮件群发：进程队列"
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.action_create_ab_mass_mailings_from_campaign
@@ -1189,7 +1191,7 @@ msgstr "名称"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
 msgid "Name / Email"
-msgstr ""
+msgstr "姓名/电子邮件"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge_new_list_name
@@ -1224,7 +1226,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_kanban
 msgid "Number of bounced email."
-msgstr ""
+msgstr "已退回电子邮件的数量。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_clicks_ratio
@@ -1239,17 +1241,17 @@ msgstr "关闭"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "OFF YOUR NEXT ORDER!"
-msgstr ""
+msgstr "下一个订单优惠！"
 
 #. module: mass_mailing
 #: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1
 msgid "Odoo Presents"
-msgstr ""
+msgstr "Odoo 出品"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_image_text
 msgid "Omnichannel sales"
-msgstr ""
+msgstr "全渠道销售"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
@@ -1303,7 +1305,7 @@ msgstr "出去的邮件"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "PRO"
-msgstr ""
+msgstr "Pro"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_ab_pc
@@ -1365,12 +1367,12 @@ msgstr "收件人模型"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_name
 msgid "Recipients Model Name"
-msgstr ""
+msgstr "收件人模型"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mailing_model_real
 msgid "Recipients Real Model"
-msgstr ""
+msgstr "收件人实物模型"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
@@ -1477,12 +1479,12 @@ msgstr "月计划"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_next_departure
 msgid "Scheduled date"
-msgstr ""
+msgstr "安排的日期"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
 msgid "Select a template"
-msgstr ""
+msgstr "选择模板"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -1666,12 +1668,12 @@ msgstr "已测试"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
 msgid "Thank you for joining us!"
-msgstr ""
+msgstr "感谢您的加入！"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
 msgid "That way, Odoo evolves much faster than any other solution."
-msgstr ""
+msgstr "采用这种方式，Odoo 比其他解决方案发展更快。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_opt_out
@@ -1684,6 +1686,8 @@ msgid ""
 "The open source model of Odoo has allowed us to leverage thousands of developers and\n"
 "                                business experts to build hundreds of apps in just a few years."
 msgstr ""
+"Odoo 的开源模式已允许我们利用数以千计的开发人员和\n"
+" 商务专家，在短短数年内打造数百款应用。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image
@@ -1691,44 +1695,44 @@ msgid ""
 "The open source model of Odoo has allowed us to leverage thousands of "
 "developers and business experts to build hundreds of apps in just a few "
 "years."
-msgstr ""
+msgstr "Odoo 的开源模式已允许我们利用数以千计的开发人员和商务专家，在短短数年内打造数百款应用。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_medium_id
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_medium_id
 msgid "This is the delivery method, e.g. Postcard, Email, or Banner Ad"
-msgstr ""
+msgstr "这是交付方式，例如，明信片、电子邮件或横幅广告"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_source_id
 msgid ""
 "This is the link source, e.g. Search Engine, another domain, or name of "
 "email list"
-msgstr ""
+msgstr "这是链接源，例如，搜索引擎、其他域名或电子邮件列表名称"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_source_id
 msgid ""
 "This is the link source, e.g. Search Engine, another domain,or name of email"
 " list"
-msgstr ""
+msgstr "这是链接源，例如，搜索引擎、其他域名或电子邮件列表名称"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_res_config_settings_group_mass_mailing_campaign
 msgid ""
 "This is useful if your marketing campaigns are composed of several emails"
-msgstr ""
+msgstr "如果您的市场营销活动由多个电子邮件组成，则此工具十分有用"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid ""
 "This is useful if your marketing campaigns are composed of several emails."
-msgstr ""
+msgstr "如果您的市场营销活动由多个电子邮件组成，则此工具十分有用。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
 msgid "This mass mailing is scheduled for"
-msgstr ""
+msgstr "计划此邮件群发以便"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_campaign_id
@@ -1736,14 +1740,14 @@ msgstr ""
 msgid ""
 "This name helps you tracking your different campaign efforts, e.g. "
 "Fall_Drive, Christmas_Special"
-msgstr ""
+msgstr "此名称有助您跟踪不同的营销活动投入，例如 Fall_Drive、Christmas_Special"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
 msgid ""
 "This tool is advised if your marketing campaign is composed of several "
 "emails."
-msgstr ""
+msgstr "如果您的市场营销活动由多个电子邮件组成，则建议使用此工具。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -1794,16 +1798,18 @@ msgid ""
 "Usability improvements made on Odoo will automatically apply to all\n"
 "                                of our fully integrated apps."
 msgstr ""
+"对 Odoo 所做的可用性改进将自动应用于所有\n"
+" 完全集成的应用。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "Use This Promo Code BEFORE 1st of August"
-msgstr ""
+msgstr "在 8 月 1 日之前使用此促销代码"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "Use now"
-msgstr ""
+msgstr "立即使用"
 
 #. module: mass_mailing
 #: model:res.groups,name:mass_mailing.group_mass_mailing_user
@@ -1818,6 +1824,8 @@ msgid ""
 " back please accept this 20% discount on you next purchase by clicking the "
 "button."
 msgstr ""
+"我们在不断成长，迫切地想看到您成为 Odoo 的一员！我们已延长商店营业时间，并提供大量新品牌。为了欢迎您的归来，单击此按钮即可在下次购买时享受 20%"
+" 的折扣。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
@@ -1832,6 +1840,8 @@ msgid ""
 "With strong technical foundations, Odoo's framework is unique.\n"
 "                                It provides top notch usability that scales across all apps."
 msgstr ""
+"借助强大的技术基础，Odoo 独一无二的框架应运而生。\n"
+" 它能够在全部应用范围内提供最顶级的可用性。"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_image
@@ -1847,17 +1857,20 @@ msgid ""
 "                                    services or a specific feature. To be successful\n"
 "                                    your content needs to be useful to your readers."
 msgstr ""
+"写一段描述您的产品、\n"
+" 服务或特定功能的内容。要取得成功，\n"
+" 您的内容必须对读者有用。"
 
 #. module: mass_mailing
 #: code:addons/mass_mailing/controllers/main.py:33
 #, python-format
 msgid "You have been unsubscribed successfully"
-msgstr ""
+msgstr "您已成功退订"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_banner
 msgid "Your Banner Image"
-msgstr ""
+msgstr "横幅图片"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_header_logo
@@ -1881,7 +1894,7 @@ msgstr "你的图片"
 msgid ""
 "Your platform is ready for work. It will help you reduce the costs of "
 "digital signage, attract new customers and increase sales."
-msgstr ""
+msgstr "您的平台已准备就绪。它将帮助您降低数字标牌成本、吸引新客户以及提高销售额。"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_res_company_social_youtube
@@ -1891,7 +1904,7 @@ msgstr "Youtube账号"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "and save $20 on your next order!"
-msgstr ""
+msgstr "并在完成下一个订单时节省 20 美元！"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_campaign_id
@@ -1906,7 +1919,7 @@ msgstr "例如客户新闻邮件"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_form
 msgid "e.g. John Smith"
-msgstr ""
+msgstr "例如 John Smith"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index e67010ca3a7..5889bbeede1 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -71,15 +71,7 @@ class MailMail(models.Model):
                     new_href = href.replace(url, url + '/m/' + str(self.statistics_ids[0].id))
                     body = body.replace(href, new_href)
 
-        # prepend <base> tag for images using absolute urls
-        domain = self.env["ir.config_parameter"].sudo().get_param("web.base.url")
-        base = "<base href='%s'>" % domain
-        body = tools.append_content_to_html(base, body, plaintext=False, container_tag='div')
-        # resolve relative image url to absolute for outlook.com
-        def _sub_relative2absolute(match):
-            return match.group(1) + werkzeug.urls.url_join(domain, match.group(2))
-        body = re.sub('(<img(?=\s)[^>]*\ssrc=")(/[^/][^"]+)', _sub_relative2absolute, body)
-        body = re.sub(r'(<[^>]+\bstyle="[^"]+\burl\(\'?)(/[^/\'][^\'")]+)', _sub_relative2absolute, body)
+        body = self.env['mail.thread']._replace_local_links(body)
 
         # generate tracking URL
         if self.statistics_ids:
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 24370c1be2c..a714259f7f5 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -746,7 +746,7 @@ class MassMailing(models.Model):
                 raise UserError(_('Please select recipients.'))
 
             # Convert links in absolute URLs before the application of the shortener
-            mailing.body_html = self.env['mail.template']._replace_local_links(mailing.body_html)
+            mailing.body_html = self.env['mail.thread']._replace_local_links(mailing.body_html)
 
             composer_values = {
                 'author_id': author_id,
diff --git a/addons/mass_mailing/wizard/test_mailing.py b/addons/mass_mailing/wizard/test_mailing.py
index 24b395c7c53..f1231fd2b38 100644
--- a/addons/mass_mailing/wizard/test_mailing.py
+++ b/addons/mass_mailing/wizard/test_mailing.py
@@ -20,7 +20,7 @@ class TestMassMailing(models.TransientModel):
         test_emails = tools.email_split(self.email_to)
         for test_mail in test_emails:
             # Convert links in absolute URLs before the application of the shortener
-            mailing.write({'body_html': self.env['mail.template']._replace_local_links(mailing.body_html)})
+            mailing.write({'body_html': self.env['mail.thread']._replace_local_links(mailing.body_html)})
             mail_values = {
                 'email_from': mailing.email_from,
                 'reply_to': mailing.reply_to,
diff --git a/addons/mass_mailing_event/i18n/de.po b/addons/mass_mailing_event/i18n/de.po
index 987200af7e8..30934767028 100644
--- a/addons/mass_mailing_event/i18n/de.po
+++ b/addons/mass_mailing_event/i18n/de.po
@@ -3,14 +3,15 @@
 # * mass_mailing_event
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,4 +27,4 @@ msgstr "Event"
 #. module: mass_mailing_event
 #: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
 msgid "Mail Attendees"
-msgstr ""
+msgstr "E-Mail an Teilnehmer senden"
diff --git a/addons/mass_mailing_event/i18n/zh_CN.po b/addons/mass_mailing_event/i18n/zh_CN.po
index 0103e5017ef..ed808b5ffec 100644
--- a/addons/mass_mailing_event/i18n/zh_CN.po
+++ b/addons/mass_mailing_event/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * mass_mailing_event
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,4 +27,4 @@ msgstr "活动"
 #. module: mass_mailing_event
 #: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
 msgid "Mail Attendees"
-msgstr ""
+msgstr "邮件参与者"
diff --git a/addons/mass_mailing_event_track/i18n/de.po b/addons/mass_mailing_event_track/i18n/de.po
index 19b442c60ae..6ca732102ca 100644
--- a/addons/mass_mailing_event_track/i18n/de.po
+++ b/addons/mass_mailing_event_track/i18n/de.po
@@ -3,14 +3,15 @@
 # * mass_mailing_event_track
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,4 +27,4 @@ msgstr "Event"
 #. module: mass_mailing_event_track
 #: model:ir.ui.view,arch_db:mass_mailing_event_track.event_event_view_form_inherit_mass_mailing_track
 msgid "Mail Track Speakers"
-msgstr ""
+msgstr "E-Mail an Track-Referenten senden"
diff --git a/addons/mass_mailing_event_track/i18n/zh_CN.po b/addons/mass_mailing_event_track/i18n/zh_CN.po
index 399f75a4343..55b48e064f8 100644
--- a/addons/mass_mailing_event_track/i18n/zh_CN.po
+++ b/addons/mass_mailing_event_track/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * mass_mailing_event_track
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,4 +27,4 @@ msgstr "活动"
 #. module: mass_mailing_event_track
 #: model:ir.ui.view,arch_db:mass_mailing_event_track.event_event_view_form_inherit_mass_mailing_track
 msgid "Mail Track Speakers"
-msgstr ""
+msgstr "邮件跟踪扬声器"
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index 49f280cb662..fb517cb12d6 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -534,7 +534,7 @@ msgstr "Mitgliedschafts-Produkte"
 #: model:ir.cron,cron_name:membership.ir_cron_update_membership
 #: model:ir.cron,name:membership.ir_cron_update_membership
 msgid "Membership: update memberships"
-msgstr ""
+msgstr "Mitgliedschaft: Mitgliedschaften aktualisieren"
 
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.view_partner_form
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index acb87437d9b..bee75eebc8a 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -5,13 +5,14 @@
 # Translators:
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -50,7 +51,7 @@ msgstr "<strong>到：</strong>"
 msgid ""
 "A member with whom you want to associate your membership. It will consider "
 "the membership state of the associated member."
-msgstr ""
+msgstr "想要与其关联您的会员资格的成员。该工具将会考虑已关联成员的会员资格状态。"
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line_account_invoice_line
@@ -367,6 +368,11 @@ msgid ""
 "-Invoiced Member: A member whose invoice has been created.\n"
 "-Paid Member: A member who has paid the membership amount."
 msgstr ""
+"该工具用于指示会员资格状态。\n"
+"-非会员：未申请任何会员资格的成员。\n"
+"-已注销会员：已注销会员资格的会员。\n"
+"-过期会员：超出会员资格有效期的会员。\n"
+"-已申请会员资格，发票处于待创建状态的成员"
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line_date
@@ -513,7 +519,7 @@ msgstr "会员产品"
 #: model:ir.cron,cron_name:membership.ir_cron_update_membership
 #: model:ir.cron,name:membership.ir_cron_update_membership
 msgid "Membership: update memberships"
-msgstr ""
+msgstr "会员资格：更新会员资格"
 
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.view_partner_form
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 5a6c508b1df..1c026aeb69e 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Andreas Stauder <andreas.stauder@brain-tec.ch>, 2017
@@ -21,11 +21,11 @@
 # Tina Rittmüller <tr@ife.de>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Christopher Bendlin <inactive+cbeodoo@transifex.com>, 2017
@@ -34,13 +34,14 @@
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Malte Jansen <work@maltejansen.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,7 +92,7 @@ msgstr "# Arbeistaufträge"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_product_template_used_in_bom_count
 msgid "# of BoM Where is Used"
-msgstr ""
+msgstr "# vom BoM, wo es verwendet wird"
 
 #. module: mrp
 #: code:addons/mrp/models/mrp_bom.py:293
@@ -355,12 +356,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_post_visible
 msgid "Allowed to Post Inventory"
-msgstr ""
+msgstr "Buchung der Bestandsänderung zugelassen"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_unreserve_visible
 msgid "Allowed to Unreserve Inventory"
-msgstr ""
+msgstr "Abbruch der Lagereservierung zugelassen"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
@@ -770,12 +771,12 @@ msgstr "Verbraucht"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_consume_line_ids
 msgid "Consumed Disassembly Lines"
-msgstr ""
+msgstr "Verbrauchte Demontagereihen"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_move_consume_unbuild_id
 msgid "Consumed Disassembly Order"
-msgstr ""
+msgstr "Verbrauchter Demontageauftrag"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_consumed_less_than_planned
@@ -937,7 +938,7 @@ msgstr "Lagerort (Ziel)"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_move_unbuild_id
 msgid "Disassembly Order"
-msgstr ""
+msgstr "Demontageauftrag"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
@@ -1192,7 +1193,7 @@ msgstr "Hat Anhänge"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_is_produced
 msgid "Has Been Produced"
-msgstr ""
+msgstr "Wurde produziert"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_has_moves
@@ -1370,7 +1371,7 @@ msgstr "Ist öffentliches Dokument"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_is_user_working
 msgid "Is the Current User Working"
-msgstr ""
+msgstr "Arbeitet der aktuelle Benutzer"
 
 #. module: mrp
 #: code:addons/mrp/models/mrp_workcenter.py:162
@@ -1885,17 +1886,17 @@ msgstr "Notizen"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_late
 msgid "Number of Manufacturing Orders Late"
-msgstr ""
+msgstr "Anzahl der verspäteten Fertigungsaufträge"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_waiting
 msgid "Number of Manufacturing Orders Waiting"
-msgstr ""
+msgstr "Anzahl der wartenden Fertigungsaufträge"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_todo
 msgid "Number of Manufacturing Orders to Process"
-msgstr ""
+msgstr "Anzahl der zu bearbeitenden Fertigungsaufträge"
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_workcenter_capacity
@@ -2120,7 +2121,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_produce_line_ids
 msgid "Processed Disassembly Lines"
-msgstr ""
+msgstr "Verarbeitete Demontagereihen"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_procurement_group_id
@@ -2233,7 +2234,7 @@ msgstr "Fertigungsdatum"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_document
 msgid "Production Document"
-msgstr ""
+msgstr "Produktionsdokument"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_production_location_id
@@ -2705,6 +2706,8 @@ msgid ""
 "to produce after the quantity set in 'Quantity To Process' has been "
 "produced."
 msgstr ""
+"Stellen Sie „Nein“ ein, um den nächsten Fertigungsauftrag nach dem "
+"vorherigen zu planen. Stellen Sie „Ja“ ein, um nach"
 
 #. module: mrp
 #: selection:mrp.routing.workcenter,time_mode:0
@@ -2777,7 +2780,7 @@ msgstr "Lagerbuchung"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_production_move_dest_ids
 msgid "Stock Movements of Produced Goods"
-msgstr ""
+msgstr "Lagerbewegungen der erzeugten Waren"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_unbuild_moves
@@ -2962,7 +2965,7 @@ msgstr ""
 #: code:addons/mrp/wizard/mrp_product_produce.py:94
 #, python-format
 msgid "The production order for '%s' has no quantity specified"
-msgstr ""
+msgstr "Beim Produktionsauftrag für '%s' ist keine Menge angegeben."
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
@@ -3301,7 +3304,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
 #: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button
 msgid "Used In"
-msgstr ""
+msgstr "Verwendet bei"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_user_id
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index a59dfce3518..f7ea2039ada 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -33,13 +33,14 @@
 # e2f_es_ t6 <e2f_es_t6@outlook.com>, 2017
 # Julio Fiallos <jfiallos@vision-estrategica.com>, 2017
 # e2f <projects@e2f.com>, 2018
+# ES R1 <e2fes@hotmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"Last-Translator: ES R1 <e2fes@hotmail.com>, 2018\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"
@@ -2155,7 +2156,7 @@ msgstr "Producto"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_res_config_settings_module_mrp_plm
 msgid "Product Lifecycle Management (PLM)"
-msgstr ""
+msgstr "Gestión del ciclo de vida del producto (PLM)"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_unbuild_move_line
@@ -2987,6 +2988,11 @@ msgid ""
 "the efficiency factor is 200%, however the expected duration will be 30 "
 "minutes."
 msgstr ""
+"Este campo se utiliza para calcular la duración prevista de una orden de "
+"trabajo en este centro de trabajo. Por ejemplo, si una orden de trabajo "
+"tiene una duración de una hora y el factor de eficiencia es del 100%, la "
+"duración prevista será de una hora. Si el factor de eficiencia es del 200%, "
+"la duración prevista será, sin embargo, de 30 minutos."
 
 #. module: mrp
 #: model:ir.model.fields,help:mrp.field_mrp_production_production_location_id
@@ -3446,7 +3452,7 @@ msgstr "Orden de trabajo"
 #: model:ir.actions.act_window,name:mrp.mrp_message_action_main
 #: model:ir.ui.menu,name:mrp.mrp_message_menu
 msgid "Work Order Messages"
-msgstr ""
+msgstr "Mensajes de orden de trabajo"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_message_action_main
diff --git a/addons/mrp_byproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
index 45647ab2cdd..c87512e7857 100644
--- a/addons/mrp_byproduct/i18n/de.po
+++ b/addons/mrp_byproduct/i18n/de.po
@@ -5,20 +5,21 @@
 # Translators:
 # Tina Rittmüller <tr@ife.de>, 2017
 # Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Anja Funk <anja.funk@afimage.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,7 +91,7 @@ msgstr "Zuletzt aktualisiert am"
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_operation_id
 msgid "Produced at Operation"
-msgstr ""
+msgstr "Während eines Vorganges produziert"
 
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_product_id
@@ -125,7 +126,7 @@ msgstr "Unterprodukt"
 #. module: mrp_byproduct
 #: model:ir.model.fields,help:mrp_byproduct.field_stock_move_subproduct_id
 msgid "Subproduct line that generated the move in a manufacturing order"
-msgstr ""
+msgstr "Unterproduktlinie,"
 
 #. module: mrp_byproduct
 #: code:addons/mrp_byproduct/models/mrp_subproduct.py:32
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 9fa049495e6..1b18983675e 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -4,21 +4,22 @@
 # 
 # Translators:
 # Henry Mineehen <info@mineehen.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Ralf Hilgenstock <rh@dialoge.info>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
+# Ralf Hilgenstock <rh@dialoge.info>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -108,6 +109,8 @@ msgid ""
 "Please enter your Etherpad credentials through the menu 'Settings > General "
 "Settings'."
 msgstr ""
+"Bitte geben Sie Ihre Etherpad-Anmeldeinformationen über das Menü "
+"„Einstellungen > Allgemeine Einstellungen“ ein."
 
 #. module: pad
 #: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
diff --git a/addons/pad/i18n/fr.po b/addons/pad/i18n/fr.po
index a2ef8e60e14..7623dc05f2a 100644
--- a/addons/pad/i18n/fr.po
+++ b/addons/pad/i18n/fr.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2017
 # Xavier Brochard <xavier@alternatif.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Xavier Brochard <xavier@alternatif.org>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -106,6 +107,8 @@ msgid ""
 "Please enter your Etherpad credentials through the menu 'Settings > General "
 "Settings'."
 msgstr ""
+"Entrez vos identifiants Etherpad via le menu Configuration > Paramètres "
+"généraux."
 
 #. module: pad
 #: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 95ee3ab080f..19ce60a4a88 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -3,17 +3,18 @@
 # * pad
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -100,7 +101,7 @@ msgstr "Pad的创建失败了，估你的Pad URL有问题或者你的连接有�
 msgid ""
 "Please enter your Etherpad credentials through the menu 'Settings > General "
 "Settings'."
-msgstr ""
+msgstr "请通过菜单“设置 > 常规设置”输入 Etherpad 凭据。"
 
 #. module: pad
 #: model:ir.ui.view,arch_db:pad.res_config_settings_view_form
diff --git a/addons/pad_project/i18n/de.po b/addons/pad_project/i18n/de.po
index a1c10e16a76..a5f828546f1 100644
--- a/addons/pad_project/i18n/de.po
+++ b/addons/pad_project/i18n/de.po
@@ -3,15 +3,16 @@
 # * pad_project
 # 
 # Translators:
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,15 +38,17 @@ msgstr "Aufgabe"
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad"
-msgstr ""
+msgstr "Verwenden Sie die Plattform für Zusammenarbeit"
 
 #. module: pad_project
 #: model:ir.model.fields,help:pad_project.field_project_project_use_pads
 #: model:ir.model.fields,help:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad for the tasks on this project."
 msgstr ""
+"Verwenden Sie die Plattform für Zusammenarbeit für die Aufgaben dieses "
+"Projekts."
 
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_project_use_pads
 msgid "Use collaborative pads"
-msgstr ""
+msgstr "Verwenden Sie Plattformen für Zusammenarbeit"
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index 50eab0382fe..c0eeaddb92e 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -3,16 +3,17 @@
 # * pad_project
 # 
 # Translators:
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Martin Trigaux, 2016
 # Xavier Belmere <Info@cartmeleon.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -38,15 +39,15 @@ msgstr "Tâche"
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad"
-msgstr ""
+msgstr "Utiliser un pad collaboratif"
 
 #. module: pad_project
 #: model:ir.model.fields,help:pad_project.field_project_project_use_pads
 #: model:ir.model.fields,help:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad for the tasks on this project."
-msgstr ""
+msgstr "Utiliser un pad collaboratif pour les tâches de ce projet."
 
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_project_use_pads
 msgid "Use collaborative pads"
-msgstr ""
+msgstr "Utiliser des pads collaboratifs"
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index 963c7c207df..3a0d935c84a 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/i18n/zh_CN.po
@@ -3,16 +3,16 @@
 # * pad_project
 # 
 # Translators:
-# Gary Wei <Gary.wei@elico-corp.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,15 +38,15 @@ msgstr "任务"
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad"
-msgstr ""
+msgstr "使用协作平台"
 
 #. module: pad_project
 #: model:ir.model.fields,help:pad_project.field_project_project_use_pads
 #: model:ir.model.fields,help:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad for the tasks on this project."
-msgstr ""
+msgstr "使用协作平台处理此项目的任务。"
 
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_project_use_pads
 msgid "Use collaborative pads"
-msgstr ""
+msgstr "使用协作平台"
diff --git a/addons/payment/i18n/de.po b/addons/payment/i18n/de.po
index 23b81921d2c..cbcf6842e94 100644
--- a/addons/payment/i18n/de.po
+++ b/addons/payment/i18n/de.po
@@ -243,12 +243,12 @@ msgstr "Zahlungsanbieter Referenz"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_acquirer_ids
 msgid "Acquirers"
-msgstr ""
+msgstr "Zahlungsanbieter"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Acquirers list"
-msgstr ""
+msgstr "Liste der Zahlungsanbieter"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_kanban
@@ -293,7 +293,7 @@ msgstr "Betrag"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_authorize_implemented
 msgid "Authorize Mechanism Supported"
-msgstr ""
+msgstr "Autorisationsmechanismus unterstützt"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_authorize
@@ -321,22 +321,22 @@ msgstr "Buckaroo"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_res_id
 msgid "Callback Document ID"
-msgstr ""
+msgstr "Rückruf der Dokumenten-ID"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_model_id
 msgid "Callback Document Model"
-msgstr ""
+msgstr "Rückruf des Dokumentenmodells"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_hash
 msgid "Callback Hash"
-msgstr ""
+msgstr "Hash-Rückruf"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_method
 msgid "Callback Method"
-msgstr ""
+msgstr "Rückrufmethode"
 
 #. module: payment
 #. openerp-web
@@ -365,17 +365,17 @@ msgstr "Zahlung konnte nicht eingerichtet werden"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_capture_manually
 msgid "Capture Amount Manually"
-msgstr ""
+msgstr "Anzahl manuell erfassen"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "Capture Transaction"
-msgstr ""
+msgstr "Transaktion erfassen"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_capture_manually
 msgid "Capture the amount from Odoo, when the delivery is completed."
-msgstr ""
+msgstr "Anzahl von Odoo erfassen, sobald die Lieferung abgeschlossen ist."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_city
@@ -391,7 +391,7 @@ msgstr "Klicken um einen Zahlungsanbieter zu erstellen."
 #. module: payment
 #: model:ir.actions.act_window,help:payment.action_payment_icon
 msgid "Click to create a payment icon."
-msgstr ""
+msgstr "Klicken, um ein Zahlungssymbol zu erstellen."
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
@@ -419,7 +419,7 @@ msgstr "Konfigurieren"
 #: code:addons/payment/static/src/js/payment_form.js:322
 #, python-format
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Löschung bestätigen"
 
 #. module: payment
 #: model:ir.model,name:payment.model_res_partner
@@ -562,7 +562,7 @@ msgstr "Fehlermeldung"
 #: code:addons/payment/static/src/js/payment_form.js:372
 #, python-format
 msgid "Error: "
-msgstr ""
+msgstr "Fehler:"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_fees
@@ -572,7 +572,7 @@ msgstr "Gebühren"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_implemented
 msgid "Fees Computation Supported"
-msgstr ""
+msgstr "Gebührenberechnung unterstützt"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_transaction_fees
@@ -639,6 +639,8 @@ msgid ""
 "If you leave it empty, the payment acquirer will be available for all the "
 "countries."
 msgstr ""
+"Wenn Sie hier nichts eintragen, ist der Zahlungsanbieter für alle Länder "
+"verfügbar."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_image
@@ -649,12 +651,12 @@ msgstr "Bild"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_image_payment_form
 msgid "Image displayed on the payment form"
-msgstr ""
+msgstr "Angezeigtes Bild auf dem Zahlungsformular"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_ogone
 msgid "Ingenico"
-msgstr ""
+msgstr "Ingenico"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -709,7 +711,7 @@ msgstr "Lasse den Kunden entscheiden"
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_acquirer_ids
 msgid "List of Acquirers supporting this payment icon."
-msgstr ""
+msgstr "Liste der Zahlungsanbieter, die dieses Zahlungssymbol unterstützen."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_website_published
@@ -810,6 +812,7 @@ msgstr "Nachrichten"
 #, python-format
 msgid "Missing partner reference when trying to create a new payment token"
 msgstr ""
+"Für die Erstellung eines neuen Zahlungs-Tokens fehlt die Partnerreferenz."
 
 #. module: payment
 #. openerp-web
@@ -853,6 +856,9 @@ msgid ""
 "Note that tokens from acquirers set to only authorize transactions (instead "
 "of capturing the amount) are not available."
 msgstr ""
+"Beachten Sie, dass Token von Zahlungsanbietern, die nur für die "
+"Autorisierung von Transaktionen festgelegt wurden (anstatt die Menge zu "
+"erfassen) nicht verfügbar sind."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_payment_flow
@@ -860,6 +866,8 @@ msgid ""
 "Note: Subscriptions does not take this field in account, it uses server to "
 "server by default."
 msgstr ""
+"Hinweis: Abonnements berücksichtigen dieses Feld nicht, sondern es verwendet"
+" den Server"
 
 #. module: payment
 #: selection:payment.acquirer,provider:0
@@ -877,13 +885,15 @@ msgstr "Ok"
 #: code:addons/payment/models/payment_acquirer.py:759
 #, python-format
 msgid "Only transactions in the Authorized status can be captured."
-msgstr ""
+msgstr "Nur Transaktionen im autorisierten Status können erfasst werden."
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:766
 #, python-format
 msgid "Only transactions in the Authorized status can be voided."
 msgstr ""
+"Nur Transaktionen im autorisierten Status können für ungültig erklärt "
+"werden."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_partner_id
@@ -905,7 +915,7 @@ msgstr "Jetzt kaufen"
 #: model:payment.acquirer,name:payment.payment_acquirer_payu
 #: selection:payment.acquirer,provider:0
 msgid "PayUmoney"
-msgstr ""
+msgstr "PayUmoney"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
@@ -930,13 +940,13 @@ msgstr "Zahlungsanbieter"
 #: model:ir.model,name:payment.model_payment_icon
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Payment Icon"
-msgstr ""
+msgstr "Zahlungssymbol"
 
 #. module: payment
 #: model:ir.actions.act_window,name:payment.action_payment_icon
 #: model:ir.ui.menu,name:payment.payment_icon_menu
 msgid "Payment Icons"
-msgstr ""
+msgstr "Zahlungssymbole"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
@@ -981,7 +991,7 @@ msgstr "Zahlungstransaktionen"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_flow
 msgid "Payment flow"
-msgstr ""
+msgstr "Zahlungsfluss"
 
 #. module: payment
 #: code:addons/payment/models/account_payment.py:59
@@ -1007,6 +1017,11 @@ msgid ""
 "                reconcile the bank statement line with this temporary transfer account. Use reconciliation\n"
 "                templates to do it in one-click."
 msgstr ""
+"Zahlungen werden in dieses Journal eingetragen. Wenn Sie Ihr Geld direkt auf Ihr Bankkonto erhalten,\n"
+" wählen Sie Ihr Bankkonto. Wenn Sie nach und nach für mehrere Transaktionen bezahlt werden, erstellen Sie für diesen Zahlungsanbieter ein bestimmtes \n"
+" Zahlungsjournal, um die Bankabstimmung ganz einfach zu verwalten. Sie halten\n"
+" den Betrag auf einem temporären Überleitungskonto Ihrer Bücher (wird automatisch bei der Erstellung\n"
+" des Zahlungsjournals erstellt). Dann wird Ihr Geld von einem Zahlungsanbieter auf einem Bankkonto überwiesen, Sie gleichen die Bankauszugszeile mit diesem temporären Transferkonto aus. Verwenden Sie Ausgleichsvorlagen, um es mit nur einem Klick zu erledigen."
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_paypal
@@ -1033,19 +1048,20 @@ msgstr "Telefon"
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the following transfer details"
-msgstr ""
+msgstr "Bitte verwenden Sie folgende Transferinformationen."
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the order name as communication reference."
 msgstr ""
+"Bitte verwenden Sie den Bestellnamen als Referenz bei Kommunikationen."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
 #: model:ir.ui.view,arch_db:payment.pay
 msgid "Processed by"
-msgstr ""
+msgstr "Verarbeitet von"
 
 #. module: payment
 #: selection:payment.acquirer,environment:0
@@ -1074,12 +1090,12 @@ msgstr "Referenz von TX wie in der Anbieter-Datenbank gespeichert"
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunded"
-msgstr ""
+msgstr "Erstattet"
 
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunding"
-msgstr ""
+msgstr "Erstattung"
 
 #. module: payment
 #: constraint:payment.acquirer:0
@@ -1094,7 +1110,7 @@ msgstr "S2S Formularvorlage"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "Karten speichern"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
@@ -1110,12 +1126,12 @@ msgstr "Gespeicherte Zahlungsdaten"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_account_payment_payment_token_id
 msgid "Saved payment token"
-msgstr ""
+msgstr "Zahlungs-Token gespeichert"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_token_implemented
 msgid "Saving Card Data supported"
-msgstr ""
+msgstr "Das Speichern von Kartendaten wird unterstützt"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_sequence
@@ -1188,12 +1204,12 @@ msgstr "Status"
 #: model:payment.acquirer,name:payment.payment_acquirer_stripe
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr ""
+msgstr "Stripe"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_icon_ids
 msgid "Supported Payment Icons"
-msgstr ""
+msgstr "Unterstützte Zahlungssymbole"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_registration_view_template_id
@@ -1215,16 +1231,18 @@ msgstr "Dank-Mitteilung"
 #, python-format
 msgid "The %s payment acquirers are not allowed to manual capture mode!"
 msgstr ""
+"Die %s Zahlungsanbieter dürfen den Aufzeichnungsmodus nicht manuell "
+"betreiben!"
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer encode his payment details on the website."
-msgstr ""
+msgstr "Der Kunde kodiert seine Zahlungsinformationen auf der Website."
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer is redirected to the website of the acquirer."
-msgstr ""
+msgstr "Der Kunde wird auf die Website des Zahlungsanbieters weitergeleitet."
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:563
@@ -1239,6 +1257,8 @@ msgid ""
 "This feature is not available for payment acquirers set to the \"Authorize\" mode.\n"
 "Please use a token from another provider than %s."
 msgstr ""
+"Diese Funktion ist für Zahlungsanbieter, die auf den „Autorisierungs“-Modus eingestellt sind, nicht verfügbar.\n"
+" Bitte verwenden Sie einen Token eines anderen Anbieters als %s."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_image
@@ -1246,6 +1266,8 @@ msgid ""
 "This field holds the image used for this payment icon, limited to "
 "1024x1024px"
 msgstr ""
+"Dieses Feld enthält das Bild in der Größe 1024x1024px, das für dieses "
+"Zahlungssymbol verwendet wird"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_image
@@ -1263,6 +1285,10 @@ msgid ""
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
 msgstr ""
+"Diese Option ermöglicht es Kunden, Ihre Kreditkarte als Zahlungs-Token zu "
+"speichern und sie für eine spätere Zahlung wiederzuverwenden. Falls Sie "
+"Abonnements verwalten (wiederkehrende Rechnungsstellung), müssen Sie dem "
+"Kunden automatisch etwas berechnen, wenn Sie eine Rechnung ausstellen."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_country_ids
@@ -1270,6 +1296,8 @@ msgid ""
 "This payment gateway is available for selected countries. If none is "
 "selected it is available for all countries."
 msgstr ""
+"Dieses Zahlungsportal ist für ausgewählte Länder verfügbar. Falls keines "
+"ausgewählt wurde, ist es für alle Länder verfügbar."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -1277,12 +1305,16 @@ msgid ""
 "This template renders the acquirer button with all necessary values.\n"
 "                                            It is rendered with qWeb with the following evaluation context:"
 msgstr ""
+"Diese Vorlage erzeugt den Zahlungsanbieter-Button mit allen erforderlichen Werten.\n"
+" Es wird mit qWeb mit dem folgenden Auswertungskontext gerendert:"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
 msgid ""
 "Transfer information will be provided after choosing the payment aquirer."
 msgstr ""
+"Die Überweisungsinformationen werden angezeigt, nachdem der Zahlungsanbieter"
+" ausgewählt wurde."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_type
@@ -1297,7 +1329,7 @@ msgstr "Genehmigungsdatum"
 #. module: payment
 #: selection:payment.transaction,type:0
 msgid "Validation of the bank card"
-msgstr ""
+msgstr "Validierung der Bankkarte"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_dom_var
@@ -1341,6 +1373,7 @@ msgstr "Banküberweisung"
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_stripe
 msgid "You will be prompt with Stripe Payment page for payment information."
 msgstr ""
+"Sie sind schnell mit der Stripe-Zahlungsseite für Zahlungsinformationen."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_adyen
@@ -1348,6 +1381,8 @@ msgid ""
 "You will be redirected to the Adyen website after clicking on the payment "
 "button."
 msgstr ""
+"Sie werden zur Website von Ayden weitergeleitet, wenn Sie auf den Bezahlen-"
+"Button drücken."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_authorize
@@ -1355,6 +1390,8 @@ msgid ""
 "You will be redirected to the Authorize website after clicking on the "
 "payment button."
 msgstr ""
+"Sie werden zur Autorisierungs-Website weitergeleitet, wenn Sie auf den "
+"Bezahlen-Button drücken."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_buckaroo
@@ -1362,6 +1399,8 @@ msgid ""
 "You will be redirected to the Buckaroo website after clicking on the payment"
 " button."
 msgstr ""
+"Sie werden zur Website von Buckaroo weitergeleitet, wenn Sie auf den "
+"Bezahlen-Button drücken."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_ogone
@@ -1369,6 +1408,8 @@ msgid ""
 "You will be redirected to the Ingenico website after clicking on the payment"
 " button."
 msgstr ""
+"Sie werden zur Website von Ingenico weitergeleitet, wenn Sie auf den "
+"Bezahlen-Button drücken."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_payu
@@ -1376,6 +1417,8 @@ msgid ""
 "You will be redirected to the PayUmoney website after clicking on the "
 "payment button."
 msgstr ""
+"Sie werden zur Website von PayUmoney weitergeleitet, wenn Sie auf den "
+"Bezahlen-Button drücken."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_paypal
@@ -1391,6 +1434,8 @@ msgstr ""
 msgid ""
 "You will be redirected to the Sips website after clicking on payment button."
 msgstr ""
+"Sie werden zur Website von Sips weitergeleitet, wenn Sie auf den Bezahlen-"
+"Button drücken."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
@@ -1444,7 +1489,7 @@ msgstr ""
 #. module: payment
 #: model:ir.model,name:payment.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
diff --git a/addons/payment/i18n/es.po b/addons/payment/i18n/es.po
index c8a3fcc81a1..09e5a722796 100644
--- a/addons/payment/i18n/es.po
+++ b/addons/payment/i18n/es.po
@@ -425,7 +425,7 @@ msgstr "Configurar"
 #: code:addons/payment/static/src/js/payment_form.js:322
 #, python-format
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar Eliminación"
 
 #. module: payment
 #: model:ir.model,name:payment.model_res_partner
@@ -568,7 +568,7 @@ msgstr "Mensaje de error"
 #: code:addons/payment/static/src/js/payment_form.js:372
 #, python-format
 msgid "Error: "
-msgstr ""
+msgstr "Error: "
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_fees
@@ -1038,13 +1038,13 @@ msgstr "Teléfono"
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the following transfer details"
-msgstr ""
+msgstr "Use los siguientes detalles de transferencia"
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the order name as communication reference."
-msgstr ""
+msgstr "Use el nombre del pedido como referencia comunicativa."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
@@ -1152,7 +1152,7 @@ msgstr "Servidor a servidor"
 #: code:addons/payment/static/src/js/payment_form.js:266
 #, python-format
 msgid "Server error"
-msgstr ""
+msgstr "Error de servidor"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_short_name
diff --git a/addons/payment/i18n/fr.po b/addons/payment/i18n/fr.po
index 8adcd9519e7..990e492f46f 100644
--- a/addons/payment/i18n/fr.po
+++ b/addons/payment/i18n/fr.po
@@ -245,12 +245,12 @@ msgstr "La référence de l'intermédiaire"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_acquirer_ids
 msgid "Acquirers"
-msgstr ""
+msgstr "Acquéreurs"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Acquirers list"
-msgstr ""
+msgstr "Liste des acquéreurs"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_kanban
@@ -295,7 +295,7 @@ msgstr "Montant"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_authorize_implemented
 msgid "Authorize Mechanism Supported"
-msgstr ""
+msgstr "Mécanisme d'autorisation pris en charge"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_authorize
@@ -306,7 +306,7 @@ msgstr "Authorize.Net"
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Authorized"
-msgstr ""
+msgstr "Autorisé"
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
@@ -323,22 +323,22 @@ msgstr "Buckaroo"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_res_id
 msgid "Callback Document ID"
-msgstr ""
+msgstr "ID du document de rappel"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_model_id
 msgid "Callback Document Model"
-msgstr ""
+msgstr "Modèle du document de rappel"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_hash
 msgid "Callback Hash"
-msgstr ""
+msgstr "Hachage de rappel"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_method
 msgid "Callback Method"
-msgstr ""
+msgstr "Méthode de rappel"
 
 #. module: payment
 #. openerp-web
@@ -362,22 +362,22 @@ msgstr "Annulé"
 #: code:addons/payment/static/src/js/payment_form.js:168
 #, python-format
 msgid "Cannot set-up the payment"
-msgstr ""
+msgstr "Impossible de configurer le paiement"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_capture_manually
 msgid "Capture Amount Manually"
-msgstr ""
+msgstr "Capturer le montant manuellement"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "Capture Transaction"
-msgstr ""
+msgstr "Capturer la transaction"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_capture_manually
 msgid "Capture the amount from Odoo, when the delivery is completed."
-msgstr ""
+msgstr "Capturer le montant depuis Odoo une fois l'acheminement effectué."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_city
@@ -388,12 +388,12 @@ msgstr "Ville"
 #. module: payment
 #: model:ir.actions.act_window,help:payment.action_payment_acquirer
 msgid "Click to create a payment acquirer."
-msgstr ""
+msgstr "Cliquez ici pour créer un acquéreur de paiement."
 
 #. module: payment
 #: model:ir.actions.act_window,help:payment.action_payment_icon
 msgid "Click to create a payment icon."
-msgstr ""
+msgstr "Cliquez ici pour créer une icône de paiement."
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
@@ -421,7 +421,7 @@ msgstr "Configurer"
 #: code:addons/payment/static/src/js/payment_form.js:322
 #, python-format
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmer la suppression"
 
 #. module: payment
 #: model:ir.model,name:payment.model_res_partner
@@ -431,7 +431,7 @@ msgstr "Contact"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_id
 msgid "Corresponding Module"
-msgstr ""
+msgstr "Module correspondant"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_count
@@ -564,7 +564,7 @@ msgstr "Message d'erreur"
 #: code:addons/payment/static/src/js/payment_form.js:372
 #, python-format
 msgid "Error: "
-msgstr ""
+msgstr "Erreur :"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_fees
@@ -574,7 +574,7 @@ msgstr "Frais"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_implemented
 msgid "Fees Computation Supported"
-msgstr ""
+msgstr "Calcul des frais pris en charge"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_transaction_fees
@@ -613,7 +613,7 @@ msgstr "Modèle de bouton de formulaire"
 #. module: payment
 #: selection:payment.transaction,type:0
 msgid "Form with tokenization"
-msgstr ""
+msgstr "Formulaire avec tokenisation"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
@@ -644,6 +644,8 @@ msgid ""
 "If you leave it empty, the payment acquirer will be available for all the "
 "countries."
 msgstr ""
+"Si vous le laissez vide, l'acquéreur de paiement sera disponible dans tous "
+"les pays."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_image
@@ -654,12 +656,12 @@ msgstr "Image"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_image_payment_form
 msgid "Image displayed on the payment form"
-msgstr ""
+msgstr "Image affichée dans le formulaire de paiement"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_ogone
 msgid "Ingenico"
-msgstr ""
+msgstr "Ingenico"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -670,7 +672,7 @@ msgstr "Installer"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_state
 msgid "Installation State"
-msgstr ""
+msgstr "État de l'installation"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_transaction_reference
@@ -714,7 +716,7 @@ msgstr "Laissez le client choisir"
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_acquirer_ids
 msgid "List of Acquirers supporting this payment icon."
-msgstr ""
+msgstr "Liste des acquéreurs prenant en charge cette icône de paiement."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_website_published
@@ -724,7 +726,7 @@ msgstr "Rendre l'intermédiaire de paiement disponible (factures client, etc.)"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.pay_methods
 msgid "Manage your Payment Methods"
-msgstr ""
+msgstr "Gérer vos méthodes de paiements"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.pay_meth_link
@@ -811,6 +813,8 @@ msgstr "Messages"
 #, python-format
 msgid "Missing partner reference when trying to create a new payment token"
 msgstr ""
+"Référence partenaire manquante lors de la tentative de création d'un jeton "
+"de paiement"
 
 #. module: payment
 #. openerp-web
@@ -818,7 +822,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:218
 #, python-format
 msgid "Missing values"
-msgstr ""
+msgstr "Valeurs manquantes"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_name
@@ -833,7 +837,7 @@ msgstr "Nom"
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_token_name
 msgid "Name of the payment token"
-msgstr ""
+msgstr "Nom du jeton de paiement"
 
 #. module: payment
 #: selection:payment.acquirer,save_token:0
@@ -846,7 +850,7 @@ msgstr "Jamais"
 #: code:addons/payment/static/src/js/payment_form.js:273
 #, python-format
 msgid "No payment method selected"
-msgstr ""
+msgstr "Aucune méthode de paiement sélectionnée"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_account_payment_payment_token_id
@@ -854,6 +858,8 @@ msgid ""
 "Note that tokens from acquirers set to only authorize transactions (instead "
 "of capturing the amount) are not available."
 msgstr ""
+"Notez que les jetons issus d'acquéreurs pouvant uniquement autoriser les "
+"transactions (et non capturer le montant) ne sont pas disponibles."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_payment_flow
@@ -861,6 +867,8 @@ msgid ""
 "Note: Subscriptions does not take this field in account, it uses server to "
 "server by default."
 msgstr ""
+"Remarque : la fonction Abonnements ne prend pas ce champ en compte. Par "
+"défaut, elle utilise l'option serveur à serveur."
 
 #. module: payment
 #: selection:payment.acquirer,provider:0
@@ -879,12 +887,16 @@ msgstr "Ok"
 #, python-format
 msgid "Only transactions in the Authorized status can be captured."
 msgstr ""
+"Seules les transactions dont l'état est défini sur Autorisé peuvent être "
+"capturées."
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:766
 #, python-format
 msgid "Only transactions in the Authorized status can be voided."
 msgstr ""
+"Seules les transactions dont l'état est défini sur Autorisé peuvent être "
+"annulées."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_partner_id
@@ -906,7 +918,7 @@ msgstr "Payer maintenant"
 #: model:payment.acquirer,name:payment.payment_acquirer_payu
 #: selection:payment.acquirer,provider:0
 msgid "PayUmoney"
-msgstr ""
+msgstr "PayUmoney"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
@@ -931,13 +943,13 @@ msgstr "Intermédiaires de paiement"
 #: model:ir.model,name:payment.model_payment_icon
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Payment Icon"
-msgstr ""
+msgstr "Icône de paiement"
 
 #. module: payment
 #: model:ir.actions.act_window,name:payment.action_payment_icon
 #: model:ir.ui.menu,name:payment.payment_icon_menu
 msgid "Payment Icons"
-msgstr ""
+msgstr "Icônes de paiement"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
@@ -952,7 +964,7 @@ msgstr "Moyens de paiement"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_payment_token_id
 msgid "Payment Token"
-msgstr ""
+msgstr "Jeton de paiement"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_ids
@@ -982,7 +994,7 @@ msgstr "Transactions de paiement"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_flow
 msgid "Payment flow"
-msgstr ""
+msgstr "Flux de paiement"
 
 #. module: payment
 #: code:addons/payment/models/account_payment.py:59
@@ -1008,6 +1020,13 @@ msgid ""
 "                reconcile the bank statement line with this temporary transfer account. Use reconciliation\n"
 "                templates to do it in one-click."
 msgstr ""
+"Les paiements seront enregistrés dans ce journal. Si vous êtes payé directement sur votre compte bancaire,\n"
+" sélectionnez le compte en question. Si vous êtes payé pour plusieurs transactions à la fois, créez un journal\n"
+" de paiement spécifique à cet acquéreur de paiement afin de faciliter le rapprochement bancaire. Le montant\n"
+" est placé dans un compte de transfert temporaire associé à vos livres (créé automatiquement lorsque vous créez\n"
+" un journal de paiement). Ensuite, lorsque l'acquéreur de paiement vous paie sur votre compte bancaire, vous\n"
+" devez effectuer le rapprochement de la ligne de relevé bancaire avec le compte de transfert temporaire. Utilisez un modèle\n"
+" de rapprochement pour le faire en un seul clic."
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_paypal
@@ -1034,19 +1053,19 @@ msgstr "Téléphone"
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the following transfer details"
-msgstr ""
+msgstr "Utilisez les informations suivantes pour le transfert bancaire."
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the order name as communication reference."
-msgstr ""
+msgstr "Indiquez le numéro de commande dans le champ libellé."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
 #: model:ir.ui.view,arch_db:payment.pay
 msgid "Processed by"
-msgstr ""
+msgstr "Traité par"
 
 #. module: payment
 #: selection:payment.acquirer,environment:0
@@ -1077,12 +1096,12 @@ msgstr ""
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunded"
-msgstr ""
+msgstr "Remboursé"
 
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunding"
-msgstr ""
+msgstr "Remboursement en cours"
 
 #. module: payment
 #: constraint:payment.acquirer:0
@@ -1097,7 +1116,7 @@ msgstr "Modèle de formulaire S2S"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "Enregistrer les cartes"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
@@ -1113,12 +1132,12 @@ msgstr "Sauvez les données de paiement"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_account_payment_payment_token_id
 msgid "Saved payment token"
-msgstr ""
+msgstr "Jeton de paiement enregistré"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_token_implemented
 msgid "Saving Card Data supported"
-msgstr ""
+msgstr "Enregistrement des données de la carte pris en charge"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_sequence
@@ -1153,7 +1172,7 @@ msgstr "Erreur serveur"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_short_name
 msgid "Short name"
-msgstr ""
+msgstr "Nom court"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_sips
@@ -1180,7 +1199,7 @@ msgstr ""
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_specific_countries
 msgid "Specific Countries"
-msgstr ""
+msgstr "Pays spécifiques"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_state
@@ -1191,12 +1210,12 @@ msgstr "Statut"
 #: model:payment.acquirer,name:payment.payment_acquirer_stripe
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr ""
+msgstr "Stripe"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_icon_ids
 msgid "Supported Payment Icons"
-msgstr ""
+msgstr "Icônes de paiement prises en charge"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_registration_view_template_id
@@ -1218,16 +1237,18 @@ msgstr "Message de remerciement"
 #, python-format
 msgid "The %s payment acquirers are not allowed to manual capture mode!"
 msgstr ""
+"Les acquéreurs de paiement %s ne sont pas autorisés à utiliser la capture "
+"manuelle."
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer encode his payment details on the website."
-msgstr ""
+msgstr "Le client saisit ses informations de paiement sur le site Web."
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer is redirected to the website of the acquirer."
-msgstr ""
+msgstr "Le client est redirigé vers le site Web de l'acquéreur."
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:563
@@ -1242,6 +1263,8 @@ msgid ""
 "This feature is not available for payment acquirers set to the \"Authorize\" mode.\n"
 "Please use a token from another provider than %s."
 msgstr ""
+"Cette fonctionnalité n'est pas disponible pour les acquéreurs de paiement en mode « Autoriser ».\n"
+" Utilisez un jeton issu d'un autre fournisseur que %s."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_image
@@ -1249,6 +1272,8 @@ msgid ""
 "This field holds the image used for this payment icon, limited to "
 "1024x1024px"
 msgstr ""
+"Ce champ contient l'image utilisée pour cette icône de paiement, limitée à "
+"1024 x 1024 px."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_image
@@ -1265,6 +1290,10 @@ msgid ""
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
 msgstr ""
+"Cette option permet aux clients d'enregistrer leur carte bancaire en tant "
+"que jeton de paiement et de la réutiliser ultérieurement. Si vous gérez les "
+"abonnements (facturation récurrente), vous devez débiter le client "
+"automatiquement lors de l'émission d'une facture."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_country_ids
@@ -1272,6 +1301,9 @@ msgid ""
 "This payment gateway is available for selected countries. If none is "
 "selected it is available for all countries."
 msgstr ""
+"Cette passerelle de paiement est uniquement disponible dans les pays "
+"sélectionnés. Si aucun pays n'est sélectionné, elle est disponible dans tous"
+" les pays."
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -1279,12 +1311,16 @@ msgid ""
 "This template renders the acquirer button with all necessary values.\n"
 "                                            It is rendered with qWeb with the following evaluation context:"
 msgstr ""
+"Ce modèle permet d'afficher le bouton de l'acquéreur avec toutes les valeurs nécessaires.\n"
+" L'affichage se fait avec qWeb et le contexte d'évaluation suivant :"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
 msgid ""
 "Transfer information will be provided after choosing the payment aquirer."
 msgstr ""
+"Les informations de transfert seront fournies après avoir choisi l'acquéreur"
+" de paiement."
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_type
@@ -1299,7 +1335,7 @@ msgstr "Date de validation"
 #. module: payment
 #: selection:payment.transaction,type:0
 msgid "Validation of the bank card"
-msgstr ""
+msgstr "Validation de la carte bancaire"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_dom_var
@@ -1314,7 +1350,7 @@ msgstr "Frais de port international variables (en pourcentage)"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_verified
 msgid "Verified"
-msgstr ""
+msgstr "Vérifiée"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_website_published
@@ -1324,7 +1360,7 @@ msgstr "Visible sur le site web/portail"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
 msgid "Void Transaction"
-msgstr ""
+msgstr "Annuler la transaction"
 
 #. module: payment
 #. openerp-web
@@ -1343,6 +1379,8 @@ msgstr "Virement bancaire"
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_stripe
 msgid "You will be prompt with Stripe Payment page for payment information."
 msgstr ""
+"Vous allez accéder à la page de paiement Stripe pour saisir vos informations"
+" de paiement."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_adyen
@@ -1377,6 +1415,8 @@ msgid ""
 "You will be redirected to the Ingenico website after clicking on the payment"
 " button."
 msgstr ""
+"Après avoir cliqué sur le bouton de paiement, vous serez redirigé vers le "
+"site d'Ingenico."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_payu
@@ -1384,6 +1424,8 @@ msgid ""
 "You will be redirected to the PayUmoney website after clicking on the "
 "payment button."
 msgstr ""
+"Après avoir cliqué sur le bouton de paiement, vous serez redirigé vers le "
+"site de PayUmoney."
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_paypal
@@ -1425,7 +1467,7 @@ msgstr "montant : le montant de la transaction, un réel"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "and more"
-msgstr ""
+msgstr "et plus"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
diff --git a/addons/payment/i18n/zh_CN.po b/addons/payment/i18n/zh_CN.po
index a574ac94023..2c93c6d1452 100644
--- a/addons/payment/i18n/zh_CN.po
+++ b/addons/payment/i18n/zh_CN.po
@@ -225,12 +225,12 @@ msgstr "收单方参考"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_acquirer_ids
 msgid "Acquirers"
-msgstr ""
+msgstr "收购人"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Acquirers list"
-msgstr ""
+msgstr "收购人列表"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_kanban
@@ -275,7 +275,7 @@ msgstr "金额"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_authorize_implemented
 msgid "Authorize Mechanism Supported"
-msgstr ""
+msgstr "批准支持的机制"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_authorize
@@ -303,7 +303,7 @@ msgstr "Buckaroo"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_res_id
 msgid "Callback Document ID"
-msgstr ""
+msgstr "回调文档 ID"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_model_id
@@ -313,12 +313,12 @@ msgstr "回调单据模型"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_hash
 msgid "Callback Hash"
-msgstr ""
+msgstr "回调哈希函数"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_method
 msgid "Callback Method"
-msgstr ""
+msgstr "回调方法"
 
 #. module: payment
 #. openerp-web
@@ -342,12 +342,12 @@ msgstr "已取消"
 #: code:addons/payment/static/src/js/payment_form.js:168
 #, python-format
 msgid "Cannot set-up the payment"
-msgstr ""
+msgstr "无法设置付款"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_capture_manually
 msgid "Capture Amount Manually"
-msgstr ""
+msgstr "手动获取金额"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.transaction_form
@@ -357,7 +357,7 @@ msgstr "捕捉交易"
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_capture_manually
 msgid "Capture the amount from Odoo, when the delivery is completed."
-msgstr ""
+msgstr "完成交货后，从 Odoo 获取金额。"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_city
@@ -373,7 +373,7 @@ msgstr "点击创建付款托收."
 #. module: payment
 #: model:ir.actions.act_window,help:payment.action_payment_icon
 msgid "Click to create a payment icon."
-msgstr ""
+msgstr "单击以创建付款图标。"
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
@@ -401,7 +401,7 @@ msgstr "设置"
 #: code:addons/payment/static/src/js/payment_form.js:322
 #, python-format
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "确认删除"
 
 #. module: payment
 #: model:ir.model,name:payment.model_res_partner
@@ -411,7 +411,7 @@ msgstr "联系人"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_id
 msgid "Corresponding Module"
-msgstr ""
+msgstr "对应模块"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_count
@@ -544,7 +544,7 @@ msgstr "错误消息"
 #: code:addons/payment/static/src/js/payment_form.js:372
 #, python-format
 msgid "Error: "
-msgstr ""
+msgstr "出错了："
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_fees
@@ -589,7 +589,7 @@ msgstr "Form按钮模板"
 #. module: payment
 #: selection:payment.transaction,type:0
 msgid "Form with tokenization"
-msgstr ""
+msgstr "使用标记化技术的表单"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
@@ -619,7 +619,7 @@ msgstr "ID"
 msgid ""
 "If you leave it empty, the payment acquirer will be available for all the "
 "countries."
-msgstr ""
+msgstr "如果您将其留空，该付款收购方将适用于所有国家/地区。"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_image
@@ -630,7 +630,7 @@ msgstr "图像"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon_image_payment_form
 msgid "Image displayed on the payment form"
-msgstr ""
+msgstr "在付款表单上显示的图像"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_ogone
@@ -690,7 +690,7 @@ msgstr "让客户决定"
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_acquirer_ids
 msgid "List of Acquirers supporting this payment icon."
-msgstr ""
+msgstr "支持此付款图标的收购方列表。"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_website_published
@@ -700,7 +700,7 @@ msgstr "使此付款收单方可用(客户发票等)"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.pay_methods
 msgid "Manage your Payment Methods"
-msgstr ""
+msgstr "管理您的付款方式"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.pay_meth_link
@@ -774,7 +774,7 @@ msgstr "信息"
 #: code:addons/payment/models/payment_acquirer.py:395
 #, python-format
 msgid "Missing partner reference when trying to create a new payment token"
-msgstr ""
+msgstr "尝试创建新的付款标记时缺少合作伙伴参考"
 
 #. module: payment
 #. openerp-web
@@ -782,7 +782,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:218
 #, python-format
 msgid "Missing values"
-msgstr ""
+msgstr "缺少值"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_name
@@ -810,21 +810,21 @@ msgstr "从不"
 #: code:addons/payment/static/src/js/payment_form.js:273
 #, python-format
 msgid "No payment method selected"
-msgstr ""
+msgstr "未选择付款方式"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_account_payment_payment_token_id
 msgid ""
 "Note that tokens from acquirers set to only authorize transactions (instead "
 "of capturing the amount) are not available."
-msgstr ""
+msgstr "请注意，来自设置为仅授权交易（而非获取金额）的收购方的标记不可用。"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_payment_flow
 msgid ""
 "Note: Subscriptions does not take this field in account, it uses server to "
 "server by default."
-msgstr ""
+msgstr "注意：订阅不考虑此字段，"
 
 #. module: payment
 #: selection:payment.acquirer,provider:0
@@ -842,13 +842,13 @@ msgstr "确定"
 #: code:addons/payment/models/payment_acquirer.py:759
 #, python-format
 msgid "Only transactions in the Authorized status can be captured."
-msgstr ""
+msgstr "只能捕获“已授权”状态的交易。"
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:766
 #, python-format
 msgid "Only transactions in the Authorized status can be voided."
-msgstr ""
+msgstr "只能取消“已授权”状态的交易。"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_partner_id
@@ -895,13 +895,13 @@ msgstr "付款收单方"
 #: model:ir.model,name:payment.model_payment_icon
 #: model:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Payment Icon"
-msgstr ""
+msgstr "支付图标"
 
 #. module: payment
 #: model:ir.actions.act_window,name:payment.action_payment_icon
 #: model:ir.ui.menu,name:payment.payment_icon_menu
 msgid "Payment Icons"
-msgstr ""
+msgstr "支付图标"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
@@ -946,7 +946,7 @@ msgstr "付款交易"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_flow
 msgid "Payment flow"
-msgstr ""
+msgstr "支付流"
 
 #. module: payment
 #: code:addons/payment/models/account_payment.py:59
@@ -972,6 +972,10 @@ msgid ""
 "                reconcile the bank statement line with this temporary transfer account. Use reconciliation\n"
 "                templates to do it in one-click."
 msgstr ""
+"支付将被登记到此日记账。如果您在银行账户上直接支付，\n"
+" 请选择您的银行账户。如果您分批支付多笔交易，则为此支付收购方创建特定\n"
+" 支付日记账，以便轻松管理银行对账单。持有账簿的临时转账账户中的金额使用对账\n"
+" 模板一键完成。"
 
 #. module: payment
 #: model:payment.acquirer,name:payment.payment_acquirer_paypal
@@ -998,19 +1002,19 @@ msgstr "电话"
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the following transfer details"
-msgstr ""
+msgstr "请使用以下转账详细信息"
 
 #. module: payment
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the order name as communication reference."
-msgstr ""
+msgstr "请使用订单名称作为通信参考。"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.confirm
 #: model:ir.ui.view,arch_db:payment.pay
 msgid "Processed by"
-msgstr ""
+msgstr "处理人"
 
 #. module: payment
 #: selection:payment.acquirer,environment:0
@@ -1039,12 +1043,12 @@ msgstr "存储在收单方数据库中的TX参考"
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunded"
-msgstr ""
+msgstr "已退款"
 
 #. module: payment
 #: selection:payment.transaction,state:0
 msgid "Refunding"
-msgstr ""
+msgstr "退款中"
 
 #. module: payment
 #: constraint:payment.acquirer:0
@@ -1059,12 +1063,12 @@ msgstr "S2S表单模板"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "保存卡"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "Save my payment data"
-msgstr ""
+msgstr "保存我的支付数据"
 
 #. module: payment
 #: model:ir.actions.act_window,name:payment.payment_token_action
@@ -1139,7 +1143,7 @@ msgstr "这个供应方的小尺寸图像。他会被自动调整为６４＊６
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_specific_countries
 msgid "Specific Countries"
-msgstr ""
+msgstr "特定国家/地区"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_state
@@ -1155,7 +1159,7 @@ msgstr "条带"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_payment_icon_ids
 msgid "Supported Payment Icons"
-msgstr ""
+msgstr "支持的支付图标"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_registration_view_template_id
@@ -1176,17 +1180,17 @@ msgstr "感谢留言"
 #: code:addons/payment/models/payment_acquirer.py:570
 #, python-format
 msgid "The %s payment acquirers are not allowed to manual capture mode!"
-msgstr ""
+msgstr "允许 %s 支付受让人使用手动捕获模式！"
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer encode his payment details on the website."
-msgstr ""
+msgstr "客户在网站上编码其支付详细信息。"
 
 #. module: payment
 #: selection:payment.acquirer,payment_flow:0
 msgid "The customer is redirected to the website of the acquirer."
-msgstr ""
+msgstr "将客户重定向到受让人网站。"
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:563
@@ -1201,13 +1205,15 @@ msgid ""
 "This feature is not available for payment acquirers set to the \"Authorize\" mode.\n"
 "Please use a token from another provider than %s."
 msgstr ""
+"此功能不适用于已设置为“授权”模式的支付受让人。\n"
+" 请使用 %s 之外的其他提供者的标记。"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_icon_image
 msgid ""
 "This field holds the image used for this payment icon, limited to "
 "1024x1024px"
-msgstr ""
+msgstr "此字段可控制用于此支付图标的图像的大小，上限为 1024x1024px"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_image
@@ -1222,14 +1228,14 @@ msgid ""
 "and to reuse it for a later purchase.If you manage subscriptions (recurring "
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
-msgstr ""
+msgstr "此选项允许客户将其信用卡保存为支付标记，并重复使用以便日后采购。如果您管理订阅（周期性开票），则在开具发票时需使用该选项自动向客户收费。"
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer_country_ids
 msgid ""
 "This payment gateway is available for selected countries. If none is "
 "selected it is available for all countries."
-msgstr ""
+msgstr "此支付入口适用于所选国家/地区。如果未选择任何国家/地区，则适用于所有国家/地区。"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -1237,12 +1243,14 @@ msgid ""
 "This template renders the acquirer button with all necessary values.\n"
 "                                            It is rendered with qWeb with the following evaluation context:"
 msgstr ""
+"此模板提供具有所有必要值的受让人按钮。\n"
+" 它使用以下评估上下文与qWeb呈现"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
 msgid ""
 "Transfer information will be provided after choosing the payment aquirer."
-msgstr ""
+msgstr "在选择支付受让人后提供转账信息。"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction_type
@@ -1257,7 +1265,7 @@ msgstr "审核日期"
 #. module: payment
 #: selection:payment.transaction,type:0
 msgid "Validation of the bank card"
-msgstr ""
+msgstr "银行卡验证"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_dom_var
@@ -1272,7 +1280,7 @@ msgstr "可变的交易费用（百分比）"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token_verified
 msgid "Verified"
-msgstr ""
+msgstr "已验证"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_website_published
@@ -1300,7 +1308,7 @@ msgstr "电汇"
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_stripe
 msgid "You will be prompt with Stripe Payment page for payment information."
-msgstr ""
+msgstr "使用 Stripe Payment 页面，您将收到有关支付信息的提示。"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_adyen
@@ -1328,14 +1336,14 @@ msgstr "在点击支付按钮后你将会被重定向到Buckaroo网站"
 msgid ""
 "You will be redirected to the Ingenico website after clicking on the payment"
 " button."
-msgstr ""
+msgstr "点击支付按钮后您将被重定向到 Ingenico 网站。"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_payu
 msgid ""
 "You will be redirected to the PayUmoney website after clicking on the "
 "payment button."
-msgstr ""
+msgstr "点击支付按钮后您将被重定向到 PayUmoney 网站。"
 
 #. module: payment
 #: model:payment.acquirer,pre_msg:payment.payment_acquirer_paypal
@@ -1373,7 +1381,7 @@ msgstr "amount:交易金额,浮点数"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "and more"
-msgstr ""
+msgstr "更多"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -1400,7 +1408,7 @@ msgstr "partner_values: 关于购买的运费需要参考具体的货运方法,�
 #. module: payment
 #: model:ir.model,name:payment.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
diff --git a/addons/payment_adyen/i18n/zh_CN.po b/addons/payment_adyen/i18n/zh_CN.po
index 4314c27a6ae..9391eb40095 100644
--- a/addons/payment_adyen/i18n/zh_CN.po
+++ b/addons/payment_adyen/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * payment_adyen
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -40,7 +41,7 @@ msgstr "Adyen: 反馈出错"
 #: code:addons/payment_adyen/models/payment.py:196
 #, python-format
 msgid "Adyen: invalid merchantSig, received %s, computed %s"
-msgstr ""
+msgstr "Adyen：无效的 merchantSig，已接收 %s，已计算 %s"
 
 #. module: payment_adyen
 #: code:addons/payment_adyen/models/payment.py:182
@@ -54,7 +55,7 @@ msgstr "Adyen: 供参照的接收数据 %s"
 msgid ""
 "Adyen: received data with missing reference (%s) or missing pspReference "
 "(%s)"
-msgstr ""
+msgstr "Adyen：已接收缺少参考 (%s) 或缺少 PSP 参考 (%s) 的数据"
 
 #. module: payment_adyen
 #: model:ir.ui.view,arch_db:payment_adyen.acquirer_form_adyen
diff --git a/addons/payment_authorize/i18n/de.po b/addons/payment_authorize/i18n/de.po
index cd0108ebfb9..bc4de9c2ce0 100644
--- a/addons/payment_authorize/i18n/de.po
+++ b/addons/payment_authorize/i18n/de.po
@@ -3,18 +3,19 @@
 # * payment_authorize
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Niki Waibel <niki.waibel@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +97,7 @@ msgstr "Anbieter"
 #. module: payment_authorize
 #: model:ir.model.fields,field_description:payment_authorize.field_payment_token_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "Karten speichern"
 
 #. module: payment_authorize
 #: code:addons/payment_authorize/models/payment.py:372
@@ -119,8 +120,12 @@ msgid ""
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
 msgstr ""
+"Diese Option ermöglicht es Kunden, Ihre Kreditkarte als Zahlungs-Token zu "
+"speichern und sie für eine spätere Zahlung wiederzuverwenden. Falls Sie "
+"Abonnements verwalten (wiederkehrende Rechnungsstellung), müssen Sie dem "
+"Kunden automatisch etwas berechnen, wenn Sie eine Rechnung ausstellen."
 
 #. module: payment_authorize
 #: model:ir.model,name:payment_authorize.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_authorize/i18n/fr.po b/addons/payment_authorize/i18n/fr.po
index ad16a9d16a1..8e37d0451ca 100644
--- a/addons/payment_authorize/i18n/fr.po
+++ b/addons/payment_authorize/i18n/fr.po
@@ -3,21 +3,22 @@
 # * payment_authorize
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Daniel & Delphine <dd2013@leschoupinous.net>, 2016
+# Martin Trigaux, 2016
 # Melanie Bernard <mbe@odoo.com>, 2017
-# Eloïse Stilmant <est@odoo.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Daniel & Delphine <dd2013@leschoupinous.net>, 2017
+# Eloïse Stilmant <est@odoo.com>, 2017
+# Florian Hatat, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Daniel & Delphine <dd2013@leschoupinous.net>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -57,6 +58,8 @@ msgid ""
 "Authorize: received data with missing reference (%s) or trans_id (%s) or "
 "fingerprint (%s)"
 msgstr ""
+"Authorize : données reçues sans référence (%s), trans_id (%s) ou empreinte "
+"(%s)"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
@@ -71,17 +74,17 @@ msgstr "Numéro de carte"
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "Nom du titulaire de la carte"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "Date d'expiration (MM/AA)"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
 msgid "How to get paid with Authorize.Net"
-msgstr ""
+msgstr "Comment se faire payer avec Authorize.Net"
 
 #. module: payment_authorize
 #: model:ir.model,name:payment_authorize.model_payment_acquirer
@@ -101,13 +104,13 @@ msgstr "Fournisseur"
 #. module: payment_authorize
 #: model:ir.model.fields,field_description:payment_authorize.field_payment_token_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "Enregistrer les cartes"
 
 #. module: payment_authorize
 #: code:addons/payment_authorize/models/payment.py:372
 #, python-format
 msgid "The Customer Profile creation in Authorize.NET failed."
-msgstr ""
+msgstr "La création du profil client dans Authorize.Net a échoué."
 
 #. module: payment_authorize
 #: model:ir.model.fields,help:payment_authorize.field_payment_token_authorize_profile
@@ -115,6 +118,8 @@ msgid ""
 "This contains the unique reference for this partner/payment token "
 "combination in the Authorize.net backend"
 msgstr ""
+"Contient la référence unique pour cette combinaison partenaire/jeton de "
+"paiement dans le backend Authorize.Net"
 
 #. module: payment_authorize
 #: model:ir.model.fields,help:payment_authorize.field_payment_token_save_token
@@ -124,6 +129,10 @@ msgid ""
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
 msgstr ""
+"Cette option permet aux clients d'enregistrer leur carte bancaire en tant "
+"que jeton de paiement et de la réutiliser ultérieurement. Si vous gérez les "
+"abonnements (facturation récurrente), vous devez débiter le client "
+"automatiquement lors de l'émission d'une facture."
 
 #. module: payment_authorize
 #: model:ir.model,name:payment_authorize.model_payment_token
diff --git a/addons/payment_authorize/i18n/zh_CN.po b/addons/payment_authorize/i18n/zh_CN.po
index 9d75da7b1fd..6eb16a6eb07 100644
--- a/addons/payment_authorize/i18n/zh_CN.po
+++ b/addons/payment_authorize/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * payment_authorize
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Eddie Lim <bhweelim@yahoo.com>, 2017
 # niulin lnc. <admin@niulin.net>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: niulin lnc. <admin@niulin.net>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -64,12 +65,12 @@ msgstr "卡号"
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "持卡人姓名"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "到期日 (MM / YY)"
 
 #. module: payment_authorize
 #: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
@@ -94,7 +95,7 @@ msgstr "服务商"
 #. module: payment_authorize
 #: model:ir.model.fields,field_description:payment_authorize.field_payment_token_save_token
 msgid "Save Cards"
-msgstr ""
+msgstr "保存卡"
 
 #. module: payment_authorize
 #: code:addons/payment_authorize/models/payment.py:372
@@ -116,9 +117,9 @@ msgid ""
 "and to reuse it for a later purchase.If you manage subscriptions (recurring "
 "invoicing), you need it to automatically charge the customer when you issue "
 "an invoice."
-msgstr ""
+msgstr "此选项允许客户将其信用卡保存为支付标记，并重复使用以便日后采购。如果您管理订阅（周期性开票），则在开具发票时需使用该选项自动向客户收费。"
 
 #. module: payment_authorize
 #: model:ir.model,name:payment_authorize.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_ogone/i18n/de.po b/addons/payment_ogone/i18n/de.po
index be02fb06264..80e3fe11c78 100644
--- a/addons/payment_ogone/i18n/de.po
+++ b/addons/payment_ogone/i18n/de.po
@@ -3,16 +3,17 @@
 # * payment_ogone
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,4 +128,4 @@ msgstr "SHA Schlüssel OUT"
 #. module: payment_ogone
 #: model:ir.model,name:payment_ogone.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_ogone/i18n/fr.po b/addons/payment_ogone/i18n/fr.po
index dec8b0ef5c5..8fe20e99b0c 100644
--- a/addons/payment_ogone/i18n/fr.po
+++ b/addons/payment_ogone/i18n/fr.po
@@ -3,21 +3,22 @@
 # * payment_ogone
 # 
 # Translators:
-# dekkra <dekkra67@free.fr>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Melanie Bernard <mbe@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
+# dekkra <dekkra67@free.fr>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Melanie Bernard <mbe@odoo.com>, 2016
+# Martin Trigaux, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
+# Clo <clo@odoo.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
-# Cyrille de Lambert <cdelambert@teclib.com>, 2017
-# Clo <clo@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Clo <clo@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -65,12 +66,12 @@ msgstr "Numéro de carte"
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "Nom du titulaire de la carte"
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "Date d'expiration (MM/AA)"
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.acquirer_form_ogone
@@ -83,6 +84,9 @@ msgid ""
 "If you want to use Ogone Aliases, this default Alias Usage will be presented"
 " to the customer as the reason you want to keep his payment data"
 msgstr ""
+"Si vous souhaitez utiliser les alias Ogone, cette utilisation des alias par "
+"défaut sera présentée au client comme la raison pour laquelle vous voulez "
+"garder ses données de paiement"
 
 #. module: payment_ogone
 #: code:addons/payment_ogone/models/payment.py:247
diff --git a/addons/payment_ogone/i18n/zh_CN.po b/addons/payment_ogone/i18n/zh_CN.po
index 5beb397d030..2181afd83b7 100644
--- a/addons/payment_ogone/i18n/zh_CN.po
+++ b/addons/payment_ogone/i18n/zh_CN.po
@@ -3,14 +3,15 @@
 # * payment_ogone
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -58,12 +59,12 @@ msgstr "卡号"
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "持卡人姓名"
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "到期日 (MM / YY)"
 
 #. module: payment_ogone
 #: model:ir.ui.view,arch_db:payment_ogone.acquirer_form_ogone
@@ -75,7 +76,7 @@ msgstr "如何设置您的Ogone账户？"
 msgid ""
 "If you want to use Ogone Aliases, this default Alias Usage will be presented"
 " to the customer as the reason you want to keep his payment data"
-msgstr ""
+msgstr "如果您想要使用 Ogone 别名，则这个默认的别名使用将显示给客户，作为您想要保留此支付数据的原因。"
 
 #. module: payment_ogone
 #: code:addons/payment_ogone/models/payment.py:247
@@ -95,7 +96,7 @@ msgstr "Ogone: 供参照的接收数据 %s"
 msgid ""
 "Ogone: received data with missing reference (%s) or pay_id (%s) or shasign "
 "(%s)"
-msgstr ""
+msgstr "Ogone：已接收缺少参考 (%s)、pay_id (%s) 或 shasign (%s) 的数据"
 
 #. module: payment_ogone
 #: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer_ogone_pspid
@@ -125,4 +126,4 @@ msgstr "SHA Key OUT"
 #. module: payment_ogone
 #: model:ir.model,name:payment_ogone.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_paypal/i18n/fr.po b/addons/payment_paypal/i18n/fr.po
index 2832344bd91..59414ff3631 100644
--- a/addons/payment_paypal/i18n/fr.po
+++ b/addons/payment_paypal/i18n/fr.po
@@ -3,19 +3,20 @@
 # * payment_paypal
 # 
 # Translators:
-# Kévin R. <realrom@hotmail.fr>, 2016
+# Kévin R., 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Florian Hatat <mininet@wanadoo.fr>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -49,6 +50,8 @@ msgid ""
 "Payment Data Transfer allows you to receive notification of successful "
 "payments as they are made."
 msgstr ""
+"Payment Data Transfer vous permet de recevoir une notification lorsqu'un "
+"paiement a abouti."
 
 #. module: payment_paypal
 #: model:ir.model,name:payment_paypal.model_payment_transaction
@@ -73,7 +76,7 @@ msgstr "Identifiant Paypal du vendeur"
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_pdt_token
 msgid "Paypal PDT Token"
-msgstr ""
+msgstr "Jeton PDT Paypal"
 
 #. module: payment_paypal
 #: code:addons/payment_paypal/models/payment.py:138
diff --git a/addons/payment_payumoney/i18n/fr.po b/addons/payment_payumoney/i18n/fr.po
index 283cceba2c4..e0b41d35c6e 100644
--- a/addons/payment_payumoney/i18n/fr.po
+++ b/addons/payment_payumoney/i18n/fr.po
@@ -3,16 +3,17 @@
 # * payment_payumoney
 # 
 # Translators:
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Martin Trigaux, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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,7 +29,7 @@ msgstr "Clé marchand"
 #. module: payment_payumoney
 #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer_payumoney_merchant_salt
 msgid "Merchant Salt"
-msgstr ""
+msgstr "Salage du vendeur"
 
 #. module: payment_payumoney
 #: code:addons/payment_payumoney/models/payment.py:146
@@ -41,18 +42,22 @@ msgstr "PayuMoney : erreur de rétroaction"
 #, python-format
 msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s"
 msgstr ""
+"PayUmoney : shasign incorrect, %s reçu, %s calculé pour les données %s"
 
 #. module: payment_payumoney
 #: code:addons/payment_payumoney/models/payment.py:102
 #, python-format
 msgid "PayUmoney: received data for reference %s; multiple orders found"
 msgstr ""
+"PayUmoney : données reçues pour la référence %s ; plusieurs commandes "
+"trouvées"
 
 #. module: payment_payumoney
 #: code:addons/payment_payumoney/models/payment.py:99
 #, python-format
 msgid "PayUmoney: received data for reference %s; no order found"
 msgstr ""
+"PayUmoney : données reçues pour la référence %s ; aucune commande trouvée"
 
 #. module: payment_payumoney
 #: code:addons/payment_payumoney/models/payment.py:94
@@ -61,6 +66,7 @@ msgid ""
 "PayUmoney: received data with missing reference (%s) or pay_id (%s) or "
 "shashign (%s)"
 msgstr ""
+"PayUmoney : données reçues sans référence (%s), pay_id (%s) ou shashign (%s)"
 
 #. module: payment_payumoney
 #: model:ir.model,name:payment_payumoney.model_payment_acquirer
diff --git a/addons/payment_sips/i18n/fr.po b/addons/payment_sips/i18n/fr.po
index 4cd929cd842..4f5ac35975d 100644
--- a/addons/payment_sips/i18n/fr.po
+++ b/addons/payment_sips/i18n/fr.po
@@ -3,17 +3,18 @@
 # * payment_sips
 # 
 # Translators:
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Melanie Bernard <mbe@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Melanie Bernard <mbe@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -48,7 +49,7 @@ msgstr "Paiement incorrect vendeur fournisseur"
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_version
 msgid "Interface Version"
-msgstr ""
+msgstr "Version de l'interface"
 
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id
@@ -68,12 +69,12 @@ msgstr "Transaction"
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_prod_url
 msgid "Prod's url"
-msgstr ""
+msgstr "URL de production"
 
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_secret
 msgid "Secret Key"
-msgstr ""
+msgstr "Clé secrète"
 
 #. module: payment_sips
 #: code:addons/payment_sips/models/payment.py:149
@@ -84,9 +85,9 @@ msgstr "Sips: a reçu les données avec pour référence %s"
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_test_url
 msgid "Test's url"
-msgstr ""
+msgstr "URL de test"
 
 #. module: payment_sips
 #: model:ir.model.fields,help:payment_sips.field_payment_acquirer_sips_merchant_id
 msgid "Used for production only"
-msgstr ""
+msgstr "Utilisée pour la production uniquement"
diff --git a/addons/payment_stripe/i18n/de.po b/addons/payment_stripe/i18n/de.po
index c31a7f0a056..de7e0de45bc 100644
--- a/addons/payment_stripe/i18n/de.po
+++ b/addons/payment_stripe/i18n/de.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -144,4 +145,4 @@ msgstr ""
 #. module: payment_stripe
 #: model:ir.model,name:payment_stripe.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_stripe/i18n/fr.po b/addons/payment_stripe/i18n/fr.po
index 408b25803e4..bf41456a380 100644
--- a/addons/payment_stripe/i18n/fr.po
+++ b/addons/payment_stripe/i18n/fr.po
@@ -3,19 +3,20 @@
 # * payment_stripe
 # 
 # Translators:
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Melanie Bernard <mbe@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Xavier Belmere <Info@cartmeleon.com>, 2017
-# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Melanie Bernard <mbe@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Richard Mathot <rim@odoo.com>, 2017
+# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# Xavier Belmere <Info@cartmeleon.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -54,12 +55,12 @@ msgstr "Numéro de carte"
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "Nom du titulaire de la carte"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url
 msgid "Checkout Image URL"
-msgstr ""
+msgstr "URL de l'image de paiement"
 
 #. module: payment_stripe
 #. openerp-web
@@ -78,14 +79,14 @@ msgstr "Erreur"
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "Date d'expiration (MM/AA)"
 
 #. module: payment_stripe
 #. openerp-web
 #: code:addons/payment_stripe/static/src/js/stripe.js:32
 #, python-format
 msgid "Just one more second, confirming your payment..."
-msgstr ""
+msgstr "Encore un instant, votre paiement est en cours de confirmation..."
 
 #. module: payment_stripe
 #: model:ir.model,name:payment_stripe.model_payment_acquirer
@@ -102,7 +103,7 @@ msgstr "Transaction"
 #: code:addons/payment_stripe/static/src/js/stripe.js:57
 #, python-format
 msgid "Payment error"
-msgstr ""
+msgstr "Échec du paiement"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:167
@@ -111,40 +112,43 @@ msgid ""
 "Perhaps the problem can be solved by double-checking your credit card "
 "details, or contacting your bank?"
 msgstr ""
+"Vérifiez les informations de votre carte bancaire ou contactez votre banque."
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key
 msgid "Stripe Publishable Key"
-msgstr ""
+msgstr "Clé publique Stripe"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key
 msgid "Stripe Secret Key"
-msgstr ""
+msgstr "Clé secrète Stripe"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:165
 #, python-format
 msgid "Stripe gave us the following info about the problem: '%s'"
 msgstr ""
+"Stripe nous a transmis les informations suivantes concernant le problème : "
+"%s"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:177
 #, python-format
 msgid "Stripe: %s orders found for reference %s"
-msgstr ""
+msgstr "Stripe : %s commandes trouvées pour la référence %s"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:173
 #, python-format
 msgid "Stripe: no order found for reference %s"
-msgstr ""
+msgstr "Stripe : aucune commande trouvée pour la référence %s"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:163
 #, python-format
 msgid "We're sorry to report that the transaction has failed."
-msgstr ""
+msgstr "Nous sommes désolés de vous informer que la transaction a échoué."
 
 #. module: payment_stripe
 #: model:ir.model,name:payment_stripe.model_payment_token
diff --git a/addons/payment_stripe/i18n/zh_CN.po b/addons/payment_stripe/i18n/zh_CN.po
index 1f2be5f7ef0..2efce32784b 100644
--- a/addons/payment_stripe/i18n/zh_CN.po
+++ b/addons/payment_stripe/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * payment_stripe
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # hman tsao <herman.tsao@gmail.com>, 2016
 # niulin lnc. <admin@niulin.net>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: niulin lnc. <admin@niulin.net>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -49,7 +50,7 @@ msgstr "卡号"
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "Cardholder name"
-msgstr ""
+msgstr "持卡人姓名"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url
@@ -73,7 +74,7 @@ msgstr "错误"
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "Expires (MM / YY)"
-msgstr ""
+msgstr "到期日 (MM / YY)"
 
 #. module: payment_stripe
 #. openerp-web
@@ -144,4 +145,4 @@ msgstr ""
 #. module: payment_stripe
 #: model:ir.model,name:payment_stripe.model_payment_token
 msgid "payment.token"
-msgstr ""
+msgstr "payment.token"
diff --git a/addons/payment_stripe/static/src/js/stripe.js b/addons/payment_stripe/static/src/js/stripe.js
index 2c22dcfa0f4..a9395ea7bd6 100644
--- a/addons/payment_stripe/static/src/js/stripe.js
+++ b/addons/payment_stripe/static/src/js/stripe.js
@@ -148,15 +148,12 @@ odoo.define('payment_stripe.stripe', function(require) {
             });
         }
         create_tx.done(function () {
-            if (!_.contains(int_currencies, currency)) {
-                amount = amount*100;
-            }
             getStripeHandler().open({
                 name: $("input[name='merchant']").val(),
                 description: $("input[name='invoice_num']").val(),
                 email: $("input[name='email']").val(),
                 currency: currency,
-                amount: amount,
+                amount: _.contains(int_currencies, currency) ? amount : amount * 100,
             });
         });
     }
diff --git a/addons/phone_validation/i18n/fr.po b/addons/phone_validation/i18n/fr.po
index dcc5af98b19..79e576f0abc 100644
--- a/addons/phone_validation/i18n/fr.po
+++ b/addons/phone_validation/i18n/fr.po
@@ -3,16 +3,18 @@
 # * phone_validation
 # 
 # Translators:
+# Florian Hatat, 2017
+# Bertrand LATOUR <divoir@gmail.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Florian Hatat <mininet@wanadoo.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -23,7 +25,7 @@ msgstr ""
 #. module: phone_validation
 #: selection:res.company,phone_international_format:0
 msgid "Add international prefix"
-msgstr ""
+msgstr "Ajouter un indicatif international"
 
 #. module: phone_validation
 #: model:ir.model.fields,help:phone_validation.field_res_company_phone_international_format
@@ -32,6 +34,10 @@ msgid ""
 "coming from the company's country are nationaly formatted. International "
 "numbers are always using international format."
 msgstr ""
+"Utilisez toujours le format international pour le codage des numéros de "
+"téléphone. Sinon, les numéros provenant du pays de l'entreprise utilisera "
+"toujours le format national. Les numéros internationaux utilisent toujours "
+"le format international."
 
 #. module: phone_validation
 #: model:ir.model,name:phone_validation.model_res_company
@@ -53,12 +59,13 @@ msgstr "ID"
 #, python-format
 msgid "Impossible number %s: probably invalid number of digits"
 msgstr ""
+"Numéro %s non valide : le nombre de chiffres est probablement incorrect."
 
 #. module: phone_validation
 #: code:addons/phone_validation/tools/phone_validation.py:25
 #, python-format
 msgid "Invalid number %s: probably incorrect prefix"
-msgstr ""
+msgstr "Numéro %s non valide : l'indicatif est probablement incorrect."
 
 #. module: phone_validation
 #: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin___last_update
@@ -68,12 +75,12 @@ msgstr "Dernière modification le"
 #. module: phone_validation
 #: model:ir.model.fields,field_description:phone_validation.field_res_company_phone_international_format
 msgid "Local Numbers"
-msgstr ""
+msgstr "Numéros locaux"
 
 #. module: phone_validation
 #: selection:res.company,phone_international_format:0
 msgid "No prefix"
-msgstr ""
+msgstr "Sans indicatif"
 
 #. module: phone_validation
 #: code:addons/phone_validation/tools/phone_validation.py:44
@@ -82,6 +89,8 @@ msgid ""
 "Unable to format %s:\n"
 "%s"
 msgstr ""
+"Impossible de formater %s:\n"
+"%s"
 
 #. module: phone_validation
 #: code:addons/phone_validation/tools/phone_validation.py:20
@@ -90,8 +99,10 @@ msgid ""
 "Unable to parse %s:\n"
 "%s"
 msgstr ""
+"Impossible d'interpréter %s:\n"
+"%s"
 
 #. module: phone_validation
 #: model:ir.model,name:phone_validation.model_phone_validation_mixin
 msgid "phone.validation.mixin"
-msgstr ""
+msgstr "phone.validation.mixin"
diff --git a/addons/phone_validation/i18n/zh_CN.po b/addons/phone_validation/i18n/zh_CN.po
index 8873f9f3020..59ec01c1713 100644
--- a/addons/phone_validation/i18n/zh_CN.po
+++ b/addons/phone_validation/i18n/zh_CN.po
@@ -5,14 +5,15 @@
 # Translators:
 # liAnGjiA <liangjia@qq.com>, 2017
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -31,7 +32,7 @@ msgid ""
 "Always encode phone numbers using international format. Otherwise numbers "
 "coming from the company's country are nationaly formatted. International "
 "numbers are always using international format."
-msgstr ""
+msgstr "始终使用国际化格式编码电话号码。否则，来自公司所属国家的号码将在全国范围内格式化。国际号码总是采用国际化格式。"
 
 #. module: phone_validation
 #: model:ir.model,name:phone_validation.model_res_company
diff --git a/addons/phone_validation/models/phone_validation_mixin.py b/addons/phone_validation/models/phone_validation_mixin.py
index 1003ab929f2..02e4c6aa82a 100644
--- a/addons/phone_validation/models/phone_validation_mixin.py
+++ b/addons/phone_validation/models/phone_validation_mixin.py
@@ -9,22 +9,24 @@ class PhoneValidationMixin(models.AbstractModel):
     _name = 'phone.validation.mixin'
 
     def _phone_get_country(self):
-        if 'country_id' in self:
+        if 'country_id' in self and self.country_id:
             return self.country_id
         return self.env.user.company_id.country_id
 
     def _phone_get_always_international(self):
-        if 'company_id' in self:
+        if 'company_id' in self and self.company_id:
             return self.company_id.phone_international_format == 'prefix'
         return self.env.user.company_id.phone_international_format == 'prefix'
 
     def phone_format(self, number, country=None, company=None):
         country = country or self._phone_get_country()
+        if not country:
+            return number
         always_international = company.phone_international_format == 'prefix' if company else self._phone_get_always_international()
         return phone_validation.phone_format(
             number,
             country.code if country else None,
             country.phone_code if country else None,
             always_international=always_international,
-            raise_exception=True
+            raise_exception=False
         )
diff --git a/addons/phone_validation/tools/phone_validation.py b/addons/phone_validation/tools/phone_validation.py
index 940c4300f26..7ca7bed6ea8 100644
--- a/addons/phone_validation/tools/phone_validation.py
+++ b/addons/phone_validation/tools/phone_validation.py
@@ -41,7 +41,7 @@ try:
             if raise_exception:
                 raise
             else:
-                _logger.warning(_('Unable to format %s:\n%s') % number, e)
+                _logger.warning(_('Unable to format %s:\n%s'), number, e)
                 return number
         if always_international or phone_nbr.country_code != country_phone_code:
             phone_fmt = phonenumbers.PhoneNumberFormat.INTERNATIONAL
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 2dfd04f34fd..aac51377819 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -33,13 +33,14 @@
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Juan José Trujillo <juanjosetrujillo@gmx.de>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Juan José Trujillo <juanjosetrujillo@gmx.de>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,12 +123,12 @@ msgstr "<b>Eigenes Bild wählen...</b>"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
 msgid "<i class=\"fa fa-eye-slash\"/>Hide"
-msgstr ""
+msgstr "<i class=\"fa fa-eye-slash\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>How to manage tax-included prices"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: point_of_sale
 #. openerp-web
@@ -137,7 +138,7 @@ msgid ""
 "<p>Click to start the point of sale interface. It <b>runs on tablets</b>, "
 "laptops, or industrial hardware.</p><p>Once the session launched, the system"
 " continues to run without an internet connection.</p>"
-msgstr ""
+msgstr "<p><b/></p><p/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
@@ -170,19 +171,19 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "<span class=\"oe_inline\"><b>Skip Preview Screen</b></span>"
-msgstr ""
+msgstr "<span class=\"oe_inline\"><b/></span>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_amount\">$ 0.86</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_title\">Change</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_title\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
@@ -194,19 +195,19 @@ msgstr "<span class=\"total-amount-formatting\">GESAMT</span>"
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span id=\"total-amount\" class=\"pos_total-amount\">$ 469.14</span>"
-msgstr ""
+msgstr "<span class=\"pos_total-amount\" id=\"total-amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>$ 470.00</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>Cash (USD):</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -236,27 +237,27 @@ msgstr "<strong>Unternehmen</strong>:<br/>"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "<strong>Ending Balance</strong>:<br/>"
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "<strong>Journal</strong>:<br/>"
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "<strong>Opening Date</strong>:<br/>"
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "<strong>Starting Balance</strong>:<br/>"
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
 msgid "<strong>Statement Name</strong>:<br/>"
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_statement
@@ -2006,7 +2007,7 @@ msgstr "Nicht abgerechnet"
 msgid ""
 "Note that you may use the menu <i>Your Session</i>\n"
 "                to quickly open a new session."
-msgstr ""
+msgstr "<i/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
@@ -2759,7 +2760,7 @@ msgstr "Produktkategorie"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Product Prices"
-msgstr ""
+msgstr "Produktpreise"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_tree_view
@@ -2844,7 +2845,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/js/tour.js:14
 #, python-format
 msgid "Ready to launch your <b>point of sale</b>? <i>Click here</i>."
-msgstr ""
+msgstr "<i/><b/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
@@ -3727,7 +3728,7 @@ msgstr ""
 msgid ""
 "This invoice has been created from the point of sale session: <a href=# "
 "data-oe-model=pos.order data-oe-id=%d>%s</a>"
-msgstr ""
+msgstr "<a href=# data-oe-model=pos.order data-oe-id=%d></a>"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_fiscal_position_ids
@@ -3782,7 +3783,7 @@ msgstr ""
 msgid ""
 "This transfer has been created from the point of sale session: <a href=# "
 "data-oe-model=pos.order data-oe-id=%d>%s</a>"
-msgstr ""
+msgstr "<a href=# data-oe-model=pos.order data-oe-id=%d></a>"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_product_product_pos_categ_id
@@ -3974,7 +3975,7 @@ msgid ""
 "Use this menu to browse previous orders. To record new\n"
 "                orders, you may use the menu <i>Your Session</i> for\n"
 "                the touchscreen interface."
-msgstr ""
+msgstr "<i/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
@@ -4078,7 +4079,7 @@ msgstr "Jahr"
 msgid ""
 "You can define another list of available currencies on the\n"
 "                                <i>Cash Registers</i> tab of the"
-msgstr ""
+msgstr "<i/>"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_order.py:458
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 9dd09fcd4bf..41286b167fc 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # David Perez <david@closemarketing.es>, 2016
@@ -35,14 +35,15 @@
 # Pierre-Antoine Magnet <pma@odoo.com>, 2017
 # Miguel Orueta <mo@landoo.es>, 2017
 # Raquel Iciarte <ric@odoo.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -178,43 +179,43 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "<span class=\"oe_inline\"><b>Skip Preview Screen</b></span>"
-msgstr ""
+msgstr "<span class=\"oe_inline\"><b/></span>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_amount\">$ 0.86</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_title\">Change</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_title\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"total-amount-formatting\">TOTAL</span>"
-msgstr ""
+msgstr "<span class=\"total-amount-formatting\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span id=\"total-amount\" class=\"pos_total-amount\">$ 469.14</span>"
-msgstr ""
+msgstr "<span class=\"pos_total-amount\" id=\"total-amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>$ 470.00</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>Cash (USD):</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index d81c26020f7..a7fcf9945db 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Martin Trigaux, 2016
+# Florian Hatat, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # zoe <yann.hoareau@migs.re>, 2016
@@ -22,14 +22,14 @@
 # Lucas Deliege <lud@odoo.com>, 2016
 # Hubert TETARD <htetard@apik-conseils.com>, 2016
 # Loic <loic.richard2@gmail.com>, 2016
-# Fabrice Henrion <fhe@odoo.com>, 2016
+# Fabrice Henrion, 2016
 # Sylvain LE GAL <sylvain.legal@grap.coop>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # invitu <contact@invitu.com>, 2016
-# Hamid Darabi <hamid.darabi@gmail.com>, 2016
+# Hamid Darabi, 2016
 # Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>, 2016
 # Fabri Yohann <psn@fabri.pw>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Olivier Dony <odo@odoo.com>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
@@ -42,13 +42,14 @@
 # fr rev <e2ffr04@hotmail.com>, 2017
 # Valentin Thirion <valentin@medineo.be>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Sébastien Le Ray <sebastien-github@orniz.org>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -72,25 +73,25 @@ msgstr "Nb. de lignes"
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "$ 3.12"
-msgstr ""
+msgstr "3,12 $"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "$ 4.40"
-msgstr ""
+msgstr "4,40 $"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "$ 4.50"
-msgstr ""
+msgstr "4,50 $"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "$ 8.50"
-msgstr ""
+msgstr "8,50 $"
 
 #. module: point_of_sale
 #. openerp-web
@@ -131,12 +132,12 @@ msgstr "<b>Placer une image personalisée<b>"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
 msgid "<i class=\"fa fa-eye-slash\"/>Hide"
-msgstr ""
+msgstr "<i class=\"fa fa-eye-slash\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>How to manage tax-included prices"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: point_of_sale
 #. openerp-web
@@ -183,19 +184,19 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "<span class=\"oe_inline\"><b>Skip Preview Screen</b></span>"
-msgstr ""
+msgstr "<span class=\"oe_inline\"><b/></span>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_amount\">$ 0.86</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span class=\"pos-change_title\">Change</span>"
-msgstr ""
+msgstr "<span class=\"pos-change_title\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
@@ -207,19 +208,19 @@ msgstr "<span class=\"total-amount-formatting\">TOTAL</span>"
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span id=\"total-amount\" class=\"pos_total-amount\">$ 469.14</span>"
-msgstr ""
+msgstr "<span class=\"pos_total-amount\" id=\"total-amount\"/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>$ 470.00</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "<span>Cash (USD):</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -314,6 +315,8 @@ msgid ""
 "A globally unique identifier for this pos configuration, used to prevent "
 "conflicts in client-generated data."
 msgstr ""
+"Un identificateur global et unique pour la configuration du PdV, utilisé "
+"pour éviter les conflits dans les données générées par les clients."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_session_login_number
@@ -351,11 +354,13 @@ msgstr "Une séquence de nombre pour la commande propre à chaque session"
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_footer
 msgid "A short text that will be inserted as a footer in the printed receipt."
 msgstr ""
+"Un texte court qui sera inséré comme pied de page dans le ticket de reçu."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_receipt_header
 msgid "A short text that will be inserted as a header in the printed receipt."
 msgstr ""
+"Un message court qui sera inséré comme en-tête dans le ticket de reçu."
 
 #. module: point_of_sale
 #. openerp-web
@@ -416,7 +421,7 @@ msgstr "Ajouter une remise globale"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Add a custom message to header and footer"
-msgstr ""
+msgstr "Ajouter un message personnalisé à l'en-tête et au pied de page"
 
 #. module: point_of_sale
 #. openerp-web
@@ -434,6 +439,9 @@ msgid ""
 "the Sales Journal set on this point of sale if you use the Accounting "
 "application."
 msgstr ""
+"Toutes les listes de prix disponibles doivent être dans la même devise que "
+"l'entreprise ou le journal des ventes défini(e) pour ce point de vente si "
+"vous utilisez l'application Comptabilité."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_config.py:255
@@ -442,6 +450,8 @@ msgid ""
 "All payment methods must be in the same currency as the Sales Journal or the"
 " company currency if that is not set."
 msgstr ""
+"Tous les modes de paiement doivent être dans la même devise que le journal "
+"des ventes ou l'entreprise si ces derniers ne sont pas définis."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
@@ -456,7 +466,7 @@ msgstr "Autoriser le caissier à ré-imprimer les tickets "
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Allow global discounts on orders"
-msgstr ""
+msgstr "Autoriser les remises globales sur les commandes"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_sale_pricelist
@@ -486,13 +496,13 @@ msgstr "Montant total"
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_name
 msgid "An internal identification of the point of sale."
-msgstr ""
+msgstr "Un identifiant interne du point de vente."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_session.py:160
 #, python-format
 msgid "Another session is already opened for this point of sale."
-msgstr ""
+msgstr "Une autre session est déjà ouverte pour ce point de vente."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -532,7 +542,7 @@ msgstr "Impression automatique du reçu"
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_cashdrawer
 msgid "Automatically open the cashdrawer."
-msgstr ""
+msgstr "Ouvrir automatiquement le tiroir-caisse."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_journal_ids
@@ -544,12 +554,12 @@ msgstr "Moyens de paiement disponibles"
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_available_pricelist_ids
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Available Pricelists"
-msgstr ""
+msgstr "Listes de prix disponibles"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_search_inherit_point_of_sale
 msgid "Available for Point of Sale"
-msgstr ""
+msgstr "Disponible pour le point de vente"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
@@ -560,7 +570,7 @@ msgstr "Disponible dans le PdV"
 #: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos
 #: model:ir.model.fields,field_description:point_of_sale.field_product_template_available_in_pos
 msgid "Available in Point of Sale"
-msgstr ""
+msgstr "Disponible dans le pointe de vente"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_average_price
@@ -617,7 +627,7 @@ msgstr "Montant de base"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Bills &amp; Receipts"
-msgstr ""
+msgstr "Factures et reçus"
 
 #. module: point_of_sale
 #. openerp-web
@@ -630,6 +640,8 @@ msgstr "Bouton"
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_via_proxy
 msgid "Bypass browser printing and prints via the hardware proxy."
 msgstr ""
+"Contourner l'impression via le navigateur pour imprimer via le proxy "
+"matériel."
 
 #. module: point_of_sale
 #. openerp-web
@@ -700,7 +712,7 @@ msgstr "Ligne de caisse"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.account_cashbox_line_view_tree
 msgid "Cashbox balance"
-msgstr ""
+msgstr "Solde de la caisse"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_cashdrawer
@@ -736,7 +748,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Category Pictures"
-msgstr ""
+msgstr "Photos des catégories"
 
 #. module: point_of_sale
 #. openerp-web
@@ -795,6 +807,8 @@ msgstr ""
 msgid ""
 "Check if you want to group products of this category in point of sale orders"
 msgstr ""
+"Cochez cette case si vous souhaitez regrouper les produits de cette "
+"catégorie dans les bons de commande du point de vente"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_cash_control
@@ -816,6 +830,8 @@ msgid ""
 "Check this if you want to group the Journal Items by Product while closing a"
 " Session."
 msgstr ""
+"Cochez cette case si vous souhaitez regrouper les pièces comptables par "
+"produit lors de la fermeture d'une session."
 
 #. module: point_of_sale
 #. openerp-web
@@ -832,7 +848,7 @@ msgstr "Catégories enfants"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Choose a pricelist for the Point Of Sale"
-msgstr ""
+msgstr "Choisir une liste de prix pour le point de vente"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
@@ -840,11 +856,14 @@ msgid ""
 "Choose a specific tax regime at the order depending on the kind of customer "
 "(tax exempt, onsite vs. takeaway, etc.)."
 msgstr ""
+"Choisir un régime fiscal spécifique à la réception de la commande en "
+"fonction du client (taxes exonérées, sur place ou à emporter, etc.)."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Choose among several tax regimes when processing an order"
 msgstr ""
+"Choisir parmi plusieurs régimes fiscaux lors du traitement d'une commande"
 
 #. module: point_of_sale
 #. openerp-web
@@ -895,7 +914,7 @@ msgstr "Client"
 #: code:addons/point_of_sale/static/src/js/chrome.js:462
 #, python-format
 msgid "Client Screen Unsupported. Please upgrade the PosBox"
-msgstr ""
+msgstr "Écran client non pris en charge. Mettez à jour la PosBox"
 
 #. module: point_of_sale
 #. openerp-web
@@ -945,7 +964,7 @@ msgstr "Configuration"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Configuration for journal entries of PoS orders"
-msgstr ""
+msgstr "Configuration des pièces comptables des commandes en PdV"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.action_pos_config_kanban
@@ -969,7 +988,7 @@ msgstr "Confirmer"
 #: code:addons/point_of_sale/static/src/js/chrome.js:455
 #, python-format
 msgid "Connected, Not Owned"
-msgstr ""
+msgstr "Connecté, sans propriétaire"
 
 #. module: point_of_sale
 #. openerp-web
@@ -991,7 +1010,7 @@ msgstr "Continuer la vente"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Control cash box at opening and closing"
-msgstr ""
+msgstr "Contrôler la caisse à l'ouverture et à la fermeture"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1053,7 +1072,7 @@ msgstr "Session en cours"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_current_session_state
 msgid "Current Session State"
-msgstr ""
+msgstr "Etat de la session"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1070,12 +1089,12 @@ msgstr "Client"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Customer Display"
-msgstr ""
+msgstr "Affichage client"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_customer_facing_display
 msgid "Customer Facing Display"
-msgstr ""
+msgstr "Affichage côté client"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_order.py:486
@@ -1087,7 +1106,7 @@ msgstr "Facture client"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_customer_facing_display_html
 msgid "Customer facing display content"
-msgstr ""
+msgstr "Contenu de l'affichage côté client"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
@@ -1124,7 +1143,7 @@ msgstr "Régime de taxe"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Default Opening"
-msgstr ""
+msgstr "Ouverture par défaut"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pricelist_id
@@ -1135,7 +1154,7 @@ msgstr "Liste de prix par défaut"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
 msgid "Default company logo"
-msgstr ""
+msgstr "Logo d'entreprise par défaut"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_barcode_nomenclature_id
@@ -1143,6 +1162,8 @@ msgid ""
 "Defines what kind of barcodes are available and how they are assigned to "
 "products, customers and cashiers."
 msgstr ""
+"Permet de définir les types de code-barres disponibles et la façon dont ils "
+"sont attribués aux produits, clients et caissiers."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_delay_validation
@@ -1220,7 +1241,7 @@ msgstr "Remise:"
 #: code:addons/point_of_sale/static/src/js/chrome.js:460
 #, python-format
 msgid "Disconnected"
-msgstr ""
+msgstr "Déconnecté"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_discount
@@ -1280,7 +1301,7 @@ msgstr "Nom affiché"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Display pictures of product categories"
-msgstr ""
+msgstr "Afficher les images des catégories de produits"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_product_action
@@ -1310,6 +1331,8 @@ msgid ""
 "Don’t turn this option on if you take orders on smartphones or tablets. \n"
 " Such devices already benefit from a native keyboard."
 msgstr ""
+"N'activez pas cette option si vous acceptez les commandes depuis un smartphone ou une tablette. \n"
+" Ces appareils disposent déjà d'un clavier natif."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
@@ -1323,14 +1346,14 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:1355
 #, python-format
 msgid "Download Paid Orders"
-msgstr ""
+msgstr "Télécharger les commandes payées"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:1357
 #, python-format
 msgid "Download Unpaid Orders"
-msgstr ""
+msgstr "Télécharger les commandes non payées"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1374,21 +1397,23 @@ msgstr "Remettre à blanc le n° série/lot"
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_scan_via_proxy
 msgid "Enable barcode scanning with a remotely connected barcode scanner."
 msgstr ""
+"Permet d'activer la lecture des code-barres depuis un lecteur connecté à "
+"distance."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_electronic_scale
 msgid "Enables Electronic Scale integration."
-msgstr ""
+msgstr "Permet d'activer l'intégration d'une balance électronique."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_payment_terminal
 msgid "Enables Payment Terminal integration."
-msgstr ""
+msgstr "Permet l'intégration d'un terminal de paiement."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_invoicing
 msgid "Enables invoice generation from the Point of Sale."
-msgstr ""
+msgstr "Permet l'émission d'une facture depuis le point de vente."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_end_date
@@ -1474,7 +1499,7 @@ msgstr "Position fiscale"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Fiscal Position per Order"
-msgstr ""
+msgstr "Position fiscale par commande"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_fiscal_position_ids
@@ -1490,7 +1515,7 @@ msgstr "Bas de page"
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_big_scrollbars
 msgid "For imprecise industrial touchscreens."
-msgstr ""
+msgstr "Pour les écrans tactiles industriels peu précis."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
@@ -1500,7 +1525,7 @@ msgstr "Information Générale"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Generation of your order references"
-msgstr ""
+msgstr "Émission de vos références commandes"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
@@ -1511,11 +1536,16 @@ msgid ""
 "recommended for an easy review of your journal entries when managing lots of"
 " orders."
 msgstr ""
+"Générer une pièce comptable par produit plutôt qu'une pièce comptable par "
+"ligne de reçu. Fonctionne pour toutes les commandes anonymes. Si le client "
+"est défini lors de la commande, une pièce comptable est créée pour chaque "
+"ligne de reçu. Cette option est recommandée lorsque vous devez gérer de "
+"nombreuses commandes car elle facilite l'examen des pièces comptables."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Give customer rewards, free samples, etc."
-msgstr ""
+msgstr "Offrir aux clients des récompenses, des échantillons gratuits, etc."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_category_sequence
@@ -1525,7 +1555,7 @@ msgstr "Donne l'ordre d'affichage d'une liste de catégories d'articles."
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_discount
 msgid "Global Discounts"
-msgstr ""
+msgstr "Remises globales"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
@@ -1550,7 +1580,7 @@ msgstr "Regrouper les éléments du journal"
 #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_categ_is_pos_groupable
 #: model:ir.model.fields,field_description:point_of_sale.field_product_uom_is_pos_groupable
 msgid "Group Products in POS"
-msgstr ""
+msgstr "Regrouper les produits dans le PdV"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1579,7 +1609,7 @@ msgstr "Entête"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_header_or_footer
 msgid "Header & Footer"
-msgstr ""
+msgstr "En-tête et pied de page"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id
@@ -1650,6 +1680,7 @@ msgstr "Importer les commandes"
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Improve navigation for imprecise industrial touchscreens"
 msgstr ""
+"Améliorer la navigation pour les écrans tactiles industriels peu précis"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -1680,17 +1711,17 @@ msgstr "Mot de passe incorrect"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id
 msgid "Initial Category"
-msgstr ""
+msgstr "Catégorie initiale"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_mercury
 msgid "Integrated Card Payments"
-msgstr ""
+msgstr "Paiements par carte intégrés"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Integrated Card Reader"
-msgstr ""
+msgstr "Lecteur de carte intégré"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_category_action
@@ -1739,12 +1770,12 @@ msgstr "Facturation"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_installed_account_accountant
 msgid "Is Installed Account Accountant"
-msgstr ""
+msgstr "Est un comptable installé"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_module_pos_restaurant
 msgid "Is a Bar/Restaurant"
-msgstr ""
+msgstr "Est un bar/restaurant"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id
@@ -1792,12 +1823,12 @@ msgstr "Dernière Modification le"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_cash
 msgid "Last Session Closing Cash"
-msgstr ""
+msgstr "Fond de caisse à la fermeture de la dernière session"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_date
 msgid "Last Session Closing Date"
-msgstr ""
+msgstr "Date de fermeture de la dernière session"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_uid
@@ -1835,7 +1866,7 @@ msgstr "N° de ligne"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale Orders"
-msgstr ""
+msgstr "Lignes des commandes en point de vente"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:33
@@ -1894,7 +1925,7 @@ msgstr "Programme de fidelité"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Loyalty program to use for this point of sale."
-msgstr ""
+msgstr "Programme de fidélité à utiliser pour ce point de vente."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment
@@ -1909,12 +1940,17 @@ msgid ""
 "be valid, this pricelist must be listed here as an available pricelist. "
 "Otherwise the default pricelist will apply."
 msgstr ""
+"Mettre plusieurs listes de prix à disposition du point de vente. Vous pouvez"
+" également une liste de prix à un client spécifique à partir de leur "
+"formulaire de contact (onglet Ventes). Pour être valide, cette liste de prix"
+" doit être répertoriée ici en tant que liste de prix disponible. Autrement, "
+"la liste de prix par défaut sera appliquée."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "Malibu Drink"
-msgstr ""
+msgstr "Boisson Malibu"
 
 #. module: point_of_sale
 #: model:res.groups,name:point_of_sale.group_pos_manager
@@ -2065,7 +2101,7 @@ msgstr "Nombre d'Impression"
 #: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
 #: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
 msgid "Odoo Logo"
-msgstr ""
+msgstr "Logo Odoo"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2110,6 +2146,8 @@ msgid ""
 "Only users with Manager access rights for PoS app can modify the product "
 "prices on orders."
 msgstr ""
+"Seuls les utilisateurs disposant des droits d'accès de responsable dans "
+"l'application PdV peuvent modifier le prix d'un produit sur une commande."
 
 #. module: point_of_sale
 #. openerp-web
@@ -2151,7 +2189,7 @@ msgstr "Ouvrir les caisses"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details_wizard
 msgid "Open Sales Details Report"
-msgstr ""
+msgstr "Ouvrir le rapport des détails de vente"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -2186,7 +2224,7 @@ msgstr "Date d'ouverture"
 #: model:ir.actions.act_window,name:point_of_sale.account_cashbox_line_action
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Opening/Closing Values"
-msgstr ""
+msgstr "Valeurs d'ouverture et de fermeture"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_picking_type_id
@@ -2199,11 +2237,14 @@ msgstr "Type d'opération"
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Operation type used to record product pickings"
 msgstr ""
+"Type d'opération utilisé pour enregistrer les préparations de commandes"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Operation types show up in the Inventory dashboard."
 msgstr ""
+"Les types d'opération s'affichent sur le tableau de bord du module "
+"Inventaire."
 
 #. module: point_of_sale
 #. openerp-web
@@ -2234,12 +2275,12 @@ msgstr "Séquence des id. commandes"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Order Interface"
-msgstr ""
+msgstr "Interface de commande"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_sequence_line_id
 msgid "Order Line IDs Sequence"
-msgstr ""
+msgstr "Séquence des ID de ligne de commande"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_lines
@@ -2304,7 +2345,7 @@ msgstr "Analyse des ventes"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.account_journal_action_point_of_sale
 msgid "POS Journals"
-msgstr ""
+msgstr "Journaux du PdV"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_config.py:347
@@ -2346,7 +2387,7 @@ msgstr "Commande du PdV ligne %s"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
 msgid "POS orders created during the current year"
-msgstr ""
+msgstr "Commandes créées durant l'année en cours pour ce PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_line_pos_statement_id
@@ -2435,7 +2476,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Payment methods available"
-msgstr ""
+msgstr "Modes de paiement disponibles"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_statement_ids
@@ -2490,7 +2531,7 @@ msgstr "Opération de manutention"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_picking_count
 msgid "Picking Count"
-msgstr ""
+msgstr "Nombre des préparations"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
@@ -2541,7 +2582,7 @@ msgstr "Catégories PdV"
 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_pos_categ_id
 #: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
 msgid "PoS Category"
-msgstr ""
+msgstr "Catégorie du PdV"
 
 #. module: point_of_sale
 #: model:stock.picking.type,name:point_of_sale.picking_type_posout
@@ -2636,18 +2677,18 @@ msgstr "Catégories PdV"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard_pos_config_ids
 msgid "Pos Config"
-msgstr ""
+msgstr "Configuration du PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_res_partner_pos_order_count
 #: model:ir.model.fields,field_description:point_of_sale.field_res_users_pos_order_count
 msgid "Pos Order Count"
-msgstr ""
+msgstr "Décompte des commandes du PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_pos_order_line_id
 msgid "Pos Order Line"
-msgstr ""
+msgstr "Ligne de commande en PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_duration
@@ -2657,23 +2698,23 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_state
 msgid "Pos Session State"
-msgstr ""
+msgstr "État de la session du PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
 msgid "Pos Session Username"
-msgstr ""
+msgstr "Nom d'utilisateur de la session du PdV"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_is_posbox
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "PosBox"
-msgstr ""
+msgstr "PosBox"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "PosBox / Hardware Proxy"
-msgstr ""
+msgstr "PosBox/Proxy matériel"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2696,7 +2737,7 @@ msgstr "Pré-remplir le paiement en espèce"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Prefill amount paid with the exact due amount"
-msgstr ""
+msgstr "Pré-remplir le montant payé avec le montant dû exact"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2710,7 +2751,7 @@ msgstr "Prix"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Price Control"
-msgstr ""
+msgstr "Contrôle des prix"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
@@ -2762,12 +2803,12 @@ msgstr "Imprimer le ticket"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Print invoices on customer request"
-msgstr ""
+msgstr "Imprimer la facture si le client le demande"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Print receipts automatically once the payment registered"
-msgstr ""
+msgstr "Imprimer automatiquement le reçu une fois le paiement enregistré"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_via_proxy
@@ -2843,12 +2884,12 @@ msgstr "Variantes d'article"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Product prices on receipts"
-msgstr ""
+msgstr "Prix des produits sur les reçus"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_tipproduct
 msgid "Product tips"
-msgstr ""
+msgstr "Conseils d'utilisation"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_template_action_pos_product
@@ -2921,14 +2962,14 @@ msgstr "Réf reçu"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_rescue
 msgid "Recovery Session"
-msgstr ""
+msgstr "Session de récupération"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:1367
 #, python-format
 msgid "Refresh Display"
-msgstr ""
+msgstr "Actualiser l'affichage"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -2955,12 +2996,12 @@ msgstr "Responsable"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_restrict_price_control
 msgid "Restrict Price Modifications to Managers"
-msgstr ""
+msgstr "Limiter les modifications de prix aux responsables"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Restrict price modification to managers"
-msgstr ""
+msgstr "Limiter les modifications de prix aux responsables"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -3028,6 +3069,8 @@ msgstr "Sauvegarder"
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Save this configuration to see and edit the customer display"
 msgstr ""
+"Enregistrer cette configuration pour consulter et modifier l'affichage "
+"client"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3111,7 +3154,7 @@ msgstr "Sélectionnez un utilisateur"
 #: code:addons/point_of_sale/static/src/js/screens.js:2160
 #, python-format
 msgid "Select pricelist"
-msgstr ""
+msgstr "Choisir une liste de prix"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3205,7 +3248,7 @@ msgstr "Définir le client"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_start_category
 msgid "Set Start Category"
-msgstr ""
+msgstr "Choisir la catégorie de départ"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3217,19 +3260,20 @@ msgstr "Définir le poids"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Set barcodes to scan products, customer cards, etc."
-msgstr ""
+msgstr "Définir des codes-barres pour scanner les produits,"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Set shop-specific prices, seasonal discounts, etc."
 msgstr ""
+"Définir des prix, des remises saisonnières, etc. propres à un commerce."
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/js/pos.web_editor.js:33
 #, python-format
 msgid "Set your customized advertisement here"
-msgstr ""
+msgstr "Ajoutez votre publicité personnalisée ici"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
@@ -3240,6 +3284,8 @@ msgstr "Configuration"
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display
 msgid "Show checkout to customers with a remotely-connected screen."
 msgstr ""
+"Afficher l'étape de paiement aux clients munis d'un écran connecté à "
+"distance."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_pricelist_item
@@ -3256,7 +3302,7 @@ msgstr "Ignorer"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_skip_screen
 msgid "Skip Preview Screen"
-msgstr ""
+msgstr "Passer l'écran Aperçu"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_image_small
@@ -3295,7 +3341,7 @@ msgstr "Date de début"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Start selling from a default product category"
-msgstr ""
+msgstr "Commencer la vente à partir d'une catégorie de produits par défaut"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_cash_register_balance_start
@@ -3334,7 +3380,7 @@ msgstr "Emplacement de stock"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Stock location used for the inventory"
-msgstr ""
+msgstr "Emplacement du stock utilisé pour l'inventaire"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3439,12 +3485,12 @@ msgstr "Numéro de TVA"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime
 msgid "Tax Regime"
-msgstr ""
+msgstr "Régime fiscal"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_tax_regime_selection
 msgid "Tax Regime Selection value"
-msgstr ""
+msgstr "Valeur de sélection du régime fiscal"
 
 #. module: point_of_sale
 #: selection:pos.config,iface_tax_included:0
@@ -3520,6 +3566,7 @@ msgstr ""
 msgid ""
 "The company of the sales journal is different than the one of point of sale"
 msgstr ""
+"L'entreprise du journal des ventes est différente de celle du point de vente"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_config.py:227
@@ -3535,6 +3582,8 @@ msgstr ""
 #, python-format
 msgid "The default pricelist must be included in the available pricelists."
 msgstr ""
+"La liste de prix par défaut doit faire partie des listes de prix "
+"disponibles."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_proxy_ip
@@ -3542,6 +3591,8 @@ msgid ""
 "The hostname or ip address of the hardware proxy, Will be autodetected if "
 "left empty."
 msgstr ""
+"Nom d'hôte ou adresse IP du proxy matériel. Laisser vide pour utiliser "
+"l'autodétection."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_config.py:237
@@ -3559,6 +3610,8 @@ msgid ""
 "The invoice journal must be in the same currency as the Sales Journal or the"
 " company currency if that is not set."
 msgstr ""
+"Le journal de facturation doit être dans la même devise que le journal des "
+"ventes, ou que l'entreprise si le journal des ventes n'est pas défini."
 
 #. module: point_of_sale
 #: sql_constraint:pos.session:0
@@ -3569,7 +3622,7 @@ msgstr "Le nom de cette session du point de vente doit être unique !"
 #: model:ir.model.fields,help:point_of_sale.field_res_partner_pos_order_count
 #: model:ir.model.fields,help:point_of_sale.field_res_users_pos_order_count
 msgid "The number of point of sales orders related to this customer"
-msgstr ""
+msgstr "Le nombre de commandes en point de vente associées à ce client"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3593,6 +3646,8 @@ msgid ""
 "The payment input will behave similarily to bank payment input, and will be "
 "prefilled with the exact due amount."
 msgstr ""
+"Ce paiement sera traité de la même façon qu'un paiement bancaire. Il sera "
+"pré-rempli avec le montant dû exact."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_order_config_id
@@ -3606,6 +3661,9 @@ msgid ""
 "The point of sale will display this product category by default. If no "
 "category is specified, all available products will be shown."
 msgstr ""
+"Le point de vente affichera cette catégorie de produits par défaut. Si "
+"aucune catégorie n'est spécifiée, tous les produits disponibles seront "
+"affichés."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_pricelist_id
@@ -3613,6 +3671,8 @@ msgid ""
 "The pricelist used if no customer is selected or if the customer has no Sale"
 " Pricelist configured."
 msgstr ""
+"La liste de prix utilisée si aucun client n'est sélectionné ou si aucune "
+"liste de prix de vente n'est configurée pour le client."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_display_categ_images
@@ -3637,7 +3697,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_auto
 msgid "The receipt will automatically be printed at the end of each order."
-msgstr ""
+msgstr "Le reçu sera automatiquement imprimé à la fin de chaque commande."
 
 #. module: point_of_sale
 #. openerp-web
@@ -3773,6 +3833,8 @@ msgid ""
 "This field is there to pass the id of the pos manager group to the point of "
 "sale client."
 msgstr ""
+"Ce champ sert à transmettre l'ID du groupe de responsables du PdV au client "
+"du point de vente."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_group_pos_user_id
@@ -3780,6 +3842,8 @@ msgid ""
 "This field is there to pass the id of the pos user group to the point of "
 "sale client."
 msgstr ""
+"Ce champ sert à transmettre l'ID du groupe d'utilisateurs du PdV au client "
+"du point de vente."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_order.py:522
@@ -3797,6 +3861,8 @@ msgid ""
 "This is useful for restaurants with onsite and take-away services that imply"
 " specific tax rates."
 msgstr ""
+"Ceci est utile pour les restaurants qui proposent des services sur place et "
+"à emporter, auquel cas le taux de la TVA peut différer."
 
 #. module: point_of_sale
 #. openerp-web
@@ -3807,6 +3873,9 @@ msgid ""
 "all the unsaved data and exit the point of sale. This operation cannot be "
 "undone."
 msgstr ""
+"Cette opération détruira toutes les commandes non payées dans le navigateur."
+" Vous perdrez toutes les données non enregistrées et quitterez le point de "
+"vente. Cette opération ne peut pas être annulé."
 
 #. module: point_of_sale
 #. openerp-web
@@ -3822,7 +3891,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_tip_product_id
 msgid "This product is used as reference on customer receipts."
-msgstr ""
+msgstr "Ce produit est utilisé comme référence sur les reçus client."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_line_id
@@ -3830,6 +3899,8 @@ msgid ""
 "This sequence is automatically created by Odoo but you can change it to "
 "customize the reference numbers of your orders lines."
 msgstr ""
+"Cette séquence est créée automatiquement par Odoo, mais vous pouvez la "
+"modifier pour personnaliser les numéros de référence de vos commandes."
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_id
@@ -3933,7 +4004,7 @@ msgstr "Total des taxes"
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_session_cash_register_total_entry_encoding
 msgid "Total of all paid sales orders"
-msgstr ""
+msgstr "Total de tous les bons de commande payés"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_session_cash_register_balance_end_real
@@ -3973,6 +4044,8 @@ msgid ""
 "Unable to open the session. You have to assign a sales journal to your point"
 " of sale."
 msgstr ""
+"Impossible d'ouvrir la session. Vous devez associer un journal des ventes à "
+"votre point de vente."
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_price_unit
@@ -4003,32 +4076,32 @@ msgstr "Format de fichier non supporté"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_use_existing_lots
 msgid "Use Existing Lots/Serial Numbers"
-msgstr ""
+msgstr "Utiliser les numéros de lot/série existants"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Use a default specific tax regime"
-msgstr ""
+msgstr "Utiliser un régime fiscal spécifique par défaut"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_use_pricelist
 msgid "Use a pricelist."
-msgstr ""
+msgstr "Utiliser une liste de prix"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Use a virtual keyboard for touchscreens"
-msgstr ""
+msgstr "Utiliser un clavier virtuel pour les écrans tactiles"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "Use an integrated hardware setup like"
-msgstr ""
+msgstr "Utiliser une solution matérielle intégrée telle que"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_account_journal_journal_user
 msgid "Use in Point of Sale"
-msgstr ""
+msgstr "Utiliser dans le point de vente"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_group_sale_pricelist
@@ -4129,6 +4202,9 @@ msgid ""
 "accounting journal for all the orders not invoiced. Invoices are recorded in"
 " accounting separately."
 msgstr ""
+"À chaque fermeture de session, une entrée comprenant toutes les commandes "
+"non facturées est générée dans le journal comptable suivant. Les factures "
+"sont enregistrées séparément dans le journal comptable."
 
 #. module: point_of_sale
 #. openerp-web
@@ -4169,6 +4245,8 @@ msgid ""
 "You cannot confirm all orders of this session, because they have not the 'paid' status.\n"
 "{reference} is in state {state}, total amount: {total}, paid: {paid}"
 msgstr ""
+"Vous ne pouvez pas confirmer l'ensemble des commandes de cette session, car elles ne présentent pas l'état « payé ».\n"
+"État de {reference} : {state}, montant total : {total}, montant payé : {paid}"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_session.py:151
@@ -4205,6 +4283,9 @@ msgid ""
 "You cannot use the session of another user. This session is owned by %s. "
 "Please first close this one to use this point of sale."
 msgstr ""
+"Vous ne pouvez pas utiliser la session d'un autre utilisateur. Cette session"
+" est attribuée à %s. Fermez la session actuelle pour utiliser ce point de "
+"vente."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:18
@@ -4251,7 +4332,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_session.py:26
 #, python-format
 msgid "You have to set a Sale Journal for the POS:%s"
-msgstr ""
+msgstr "Vous devez définir un journal des ventes pour le PdV %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_details.py:48
@@ -4391,12 +4472,12 @@ msgstr "remise"
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "e.g. Company Address, Website"
-msgstr ""
+msgstr "exemples : adresse de l'entreprise, site Web"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
 msgid "e.g. Return Policy, Thanks for shopping with us!"
-msgstr ""
+msgstr "exemples : Politique de retour, Merci pour votre commande !"
 
 #. module: point_of_sale
 #. openerp-web
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index b496597bba5..2143fed7825 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -16,13 +16,14 @@
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
 # liulixia <liu.lixia@elico-corp.com>, 2017
 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -2818,7 +2819,7 @@ msgstr "读取称重电子秤"
 #: code:addons/point_of_sale/static/src/js/tour.js:14
 #, python-format
 msgid "Ready to launch your <b>point of sale</b>? <i>Click here</i>."
-msgstr ""
+msgstr "<i/><b/>"
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
@@ -3677,7 +3678,7 @@ msgstr ""
 msgid ""
 "This invoice has been created from the point of sale session: <a href=# "
 "data-oe-model=pos.order data-oe-id=%d>%s</a>"
-msgstr ""
+msgstr "<a href=# data-oe-model=pos.order data-oe-id=%d></a>"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_pos_config_fiscal_position_ids
@@ -3730,7 +3731,7 @@ msgstr "这个序列号是由Odoo自动产生的，不过你可以自己定义�
 msgid ""
 "This transfer has been created from the point of sale session: <a href=# "
 "data-oe-model=pos.order data-oe-id=%d>%s</a>"
-msgstr ""
+msgstr "<a href=# data-oe-model=pos.order data-oe-id=%d></a>"
 
 #. module: point_of_sale
 #: model:ir.model.fields,help:point_of_sale.field_product_product_pos_categ_id
@@ -4023,7 +4024,7 @@ msgstr "年"
 msgid ""
 "You can define another list of available currencies on the\n"
 "                                <i>Cash Registers</i> tab of the"
-msgstr ""
+msgstr "<i/>"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_order.py:458
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 46bea35c1f3..5ef49361c51 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -227,6 +227,12 @@ class PosOrder(models.Model):
         return InvoiceLine.sudo().create(inv_line)
 
     def _create_account_move_line(self, session=None, move=None):
+        def _flatten_tax_and_children(taxes):
+            children = self.env['account.tax']
+            for tax in taxes:
+                children |= _flatten_tax_and_children(tax.children_tax_ids)
+            return taxes + children
+
         # Tricky, via the workflow, we only have one id in the ids variable
         """Create a account move line of order grouped by products or not."""
         IrProperty = self.env['ir.property']
@@ -303,6 +309,9 @@ class PosOrder(models.Model):
                     name = name + ' (' + line.notice + ')'
 
                 # Create a move for the line for the order line
+                # Just like for invoices, a group of taxes must be present on this base line
+                # As well as its children
+                base_line_tax_ids = _flatten_tax_and_children(line.tax_ids_after_fiscal_position).filtered(lambda tax: tax.type_tax_use in ['sale', 'none'])
                 insert_data('product', {
                     'name': name,
                     'quantity': line.qty,
@@ -311,7 +320,7 @@ class PosOrder(models.Model):
                     'analytic_account_id': self._prepare_analytic_account(line),
                     'credit': ((amount > 0) and amount) or 0.0,
                     'debit': ((amount < 0) and -amount) or 0.0,
-                    'tax_ids': [(6, 0, line.tax_ids_after_fiscal_position.ids)],
+                    'tax_ids': [(6, 0, base_line_tax_ids.ids)],
                     'partner_id': partner_id
                 })
 
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index bf11db31bf2..f06abc15c66 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -93,8 +93,9 @@ var JobQueue = function(){
 
 var ProxyDevice  = core.Class.extend(mixins.PropertiesMixin,{
     init: function(parent,options){
-        mixins.PropertiesMixin.init.call(this,parent);
+        mixins.PropertiesMixin.init.call(this);
         var self = this;
+        this.setParent(parent);
         options = options || {};
 
         this.pos = parent;
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 61e72258997..4e53d259248 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -2038,6 +2038,7 @@ var PaymentScreenWidget = ScreenWidget.extend({
 
             invoiced.fail(function(error){
                 self.invoicing = false;
+                order.finalized = false;
                 if (error.message === 'Missing Customer') {
                     self.gui.show_popup('confirm',{
                         'title': _t('Please select the Customer'),
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index a44ddcd06b9..a0e4e1ce9ed 100644
--- a/addons/portal/i18n/de.po
+++ b/addons/portal/i18n/de.po
@@ -3,27 +3,28 @@
 # * portal
 # 
 # Translators:
+# darenkster <inactive+darenkster@transifex.com>, 2017
+# Niki Waibel, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Philipp Hug <philipp@hug.cx>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin K <martinkuenz@gmail.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Markus Menner <markus.menner@axxelia.com>, 2017
 # Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
+# Philipp Hug <philipp@hug.cx>, 2017
+# Martin K <martinkuenz@gmail.com>, 2017
+# Renzo Meister, 2017
+# Markus Menner <markus.menner@axxelia.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,6 +59,10 @@ msgid ""
 "<p>\n"
 "${object.wizard_id.welcome_message or ''}"
 msgstr ""
+"<p></p><p></p><p></p><ul></ul><p></p><ul><li><a "
+"href=\"${object.user_id.signup_url}\"></a></li></ul><p><li></li><li><a "
+"href=\"${&apos;portal_url&apos; in ctx and ctx[&apos;portal_url&apos;] or "
+"&apos;&apos;}\"></a></li><li/>"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_show_sign_in
@@ -67,7 +72,7 @@ msgstr "<b>Anmelden</b>"
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_searchbar
 msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>"
-msgstr ""
+msgstr "<span id=\"search_label\"/><span class=\"caret\"/>"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.wizard_view
@@ -118,7 +123,7 @@ msgstr "Unternehmensname"
 msgid ""
 "Confirm\n"
 "                                <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_wizard_user_partner_id
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index f874356e2f8..ca3233c78d5 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Kévin R. <realrom@hotmail.fr>, 2016
+# Kévin R., 2016
 # Richard Mathot <rim@odoo.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
 # Jean-Marc Dupont <jmd@6it.fr>, 2017
@@ -23,13 +23,15 @@
 # Micky Jault <micky037@hotmail.fr>, 2017
 # Frédéric LIETART <stuff@tifred.fr>, 2017
 # Fabri Yohann <psn@fabri.pw>, 2017
+# e2f <projects@e2f.com>, 2018
+# fr trans <e2ffr05@hotmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Fabri Yohann <psn@fabri.pw>, 2017\n"
+"Last-Translator: fr trans <e2ffr05@hotmail.com>, 2018\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"
@@ -64,6 +66,10 @@ msgid ""
 "<p>\n"
 "${object.wizard_id.welcome_message or ''}"
 msgstr ""
+"<p></p><p></p><p></p><ul></ul><p></p><ul><li><a "
+"href=\"${object.user_id.signup_url}\"></a></li></ul><p><li></li><li><a "
+"href=\"${&apos;portal_url&apos; in ctx and ctx[&apos;portal_url&apos;] or "
+"&apos;&apos;}\"></a></li><li/>"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_show_sign_in
@@ -112,7 +118,7 @@ msgstr "Effacer"
 #: code:addons/portal/static/src/xml/portal_signature.xml:27
 #, python-format
 msgid "Click here to see your document."
-msgstr ""
+msgstr "Cliquez ici pour consulter votre document."
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_my_details
@@ -124,7 +130,7 @@ msgstr "Nom de la société"
 msgid ""
 "Confirm\n"
 "                                <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_wizard_user_partner_id
@@ -165,7 +171,7 @@ msgstr "Créé le"
 #: model:ir.model.fields,help:portal.field_project_task_portal_url
 #: model:ir.model.fields,help:portal.field_sale_order_portal_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "URl du portail client"
 
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_mixin_display_name
@@ -196,7 +202,7 @@ msgstr "Discussion par email"
 #: code:addons/portal/wizard/portal_wizard.py:130
 #, python-format
 msgid "Group %s is not a portal"
-msgstr ""
+msgstr "Le groupe %s n'est pas un portail"
 
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_mixin_id
@@ -278,6 +284,8 @@ msgstr "Suivante"
 #, python-format
 msgid "Oops! Something went wrong. Try to reload the page and log in."
 msgstr ""
+"Oups ! Un problème est survenu. Essayez de recharger la page et de vous "
+"identifier."
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_my_details
@@ -303,7 +311,7 @@ msgstr "Gestion de l'accès au portail"
 #: model:ir.model.fields,field_description:portal.field_project_task_portal_url
 #: model:ir.model.fields,field_description:portal.field_sale_order_portal_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "URl d'accès au portail"
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_wizard_user
@@ -320,7 +328,7 @@ msgstr "Préc."
 #: code:addons/portal/static/src/js/portal_chatter.js:101
 #, python-format
 msgid "Published on %s"
-msgstr ""
+msgstr "Publié sur %s"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.wizard_view
@@ -393,7 +401,7 @@ msgstr "Le portail auquel les utilisateurs peuvent être ajoutés ou enlevés."
 #: code:addons/portal/static/src/xml/portal_chatter.xml:11
 #, python-format
 msgid "There are no comments for now."
-msgstr ""
+msgstr "Il n'y a aucun commentaire pour le moment."
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.wizard_view
@@ -586,7 +594,7 @@ msgstr ""
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_my_details
 msgid "Your Contact Details"
-msgstr ""
+msgstr "Vos coordonnées"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_layout
@@ -597,7 +605,7 @@ msgstr "Vos détails"
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_my_home
 msgid "Your Documents"
-msgstr ""
+msgstr "Vos documents"
 
 #. module: portal
 #. openerp-web
@@ -622,7 +630,7 @@ msgstr "Code postal"
 #: code:addons/portal/static/src/xml/portal_chatter.xml:56
 #, python-format
 msgid "avatar"
-msgstr ""
+msgstr "Avatar"
 
 #. module: portal
 #. openerp-web
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index bdbd987e9f2..34ce930ee59 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.po
@@ -15,13 +15,14 @@
 # SHOM <shanmuxin@yeah.net>, 2017
 # mrshelly <mrshelly@hotmail.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -56,6 +57,10 @@ msgid ""
 "<p>\n"
 "${object.wizard_id.welcome_message or ''}"
 msgstr ""
+"<p></p><p></p><p></p><ul></ul><p></p><ul><li><a "
+"href=\"${object.user_id.signup_url}\"></a></li></ul><p><li></li><li><a "
+"href=\"${&apos;portal_url&apos; in ctx and ctx[&apos;portal_url&apos;] or "
+"&apos;&apos;}\"></a></li><li/>"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_show_sign_in
@@ -65,7 +70,7 @@ msgstr "<b>登录</b>"
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.portal_searchbar
 msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>"
-msgstr ""
+msgstr "<span id=\"search_label\"/><span class=\"caret\"/>"
 
 #. module: portal
 #: model:ir.ui.view,arch_db:portal.wizard_view
diff --git a/addons/pos_mercury/i18n/de.po b/addons/pos_mercury/i18n/de.po
index aadbb3221b2..2a26c90adc8 100644
--- a/addons/pos_mercury/i18n/de.po
+++ b/addons/pos_mercury/i18n/de.po
@@ -4,26 +4,27 @@
 # 
 # Translators:
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Jan Brodersen <4rmitxes@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Jan Brodersen <4rmitxes@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +49,7 @@ msgstr "128 bit CryptoAPI fehlgeschlagen"
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Buy a card reader"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
diff --git a/addons/pos_mercury/i18n/es.po b/addons/pos_mercury/i18n/es.po
index dfcfec9ce4c..1ff4471a5d4 100644
--- a/addons/pos_mercury/i18n/es.po
+++ b/addons/pos_mercury/i18n/es.po
@@ -20,14 +20,15 @@
 # Martin Mendoza del Solar <martin@mendozadelsolar.com>, 2016
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -52,7 +53,7 @@ msgstr "128 bit CryptoAPI ha fallado"
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Buy a card reader"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
diff --git a/addons/pos_mercury/i18n/fr.po b/addons/pos_mercury/i18n/fr.po
index 3535720e218..edacfd810a3 100644
--- a/addons/pos_mercury/i18n/fr.po
+++ b/addons/pos_mercury/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
@@ -17,13 +17,14 @@
 # François Dhommeaux <contact@sd360.fr>, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Lucas Deliege <lud@odoo.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -48,7 +49,7 @@ msgstr "128 bit CryptoAPI a échoué"
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Buy a card reader"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
@@ -173,7 +174,7 @@ msgstr "N'a pas pu crypter la réponse - Appellez le fournisseur"
 #: code:addons/pos_mercury/static/src/js/pos_mercury.js:351
 #, python-format
 msgid "Could not read card"
-msgstr ""
+msgstr "Impossible de lire la carte"
 
 #. module: pos_mercury
 #: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration_create_uid
@@ -614,7 +615,7 @@ msgstr "Configurations de Mercury"
 #. module: pos_mercury
 #: model:ir.model.fields,field_description:pos_mercury.field_account_journal_pos_mercury_config_id
 msgid "Mercury Credentials"
-msgstr ""
+msgstr "Identifiants Mercury"
 
 #. module: pos_mercury
 #: model:ir.model.fields,field_description:pos_mercury.field_account_bank_statement_line_mercury_invoice_no
@@ -645,13 +646,15 @@ msgstr "Nom de cette configuration Mercury"
 #: code:addons/pos_mercury/models/pos_mercury_transaction.py:33
 #, python-format
 msgid "No Mercury configuration associated with the journal."
-msgstr ""
+msgstr "Aucune configuration Mercury n'est associée à ce journal."
 
 #. module: pos_mercury
 #: code:addons/pos_mercury/models/pos_mercury_transaction.py:21
 #, python-format
 msgid "No opened point of sale session for user %s found"
 msgstr ""
+"Aucune session de pointe de vente ouverte n'a été trouvée pour l'utilisateur"
+" %s."
 
 #. module: pos_mercury
 #. openerp-web
@@ -969,7 +972,7 @@ msgstr ""
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
 msgid "Vantiv Accounts"
-msgstr ""
+msgstr "Comptes Vantiv"
 
 #. module: pos_mercury
 #. openerp-web
diff --git a/addons/pos_mercury/i18n/zh_CN.po b/addons/pos_mercury/i18n/zh_CN.po
index f91b0206800..69b7a89622f 100644
--- a/addons/pos_mercury/i18n/zh_CN.po
+++ b/addons/pos_mercury/i18n/zh_CN.po
@@ -3,15 +3,16 @@
 # * pos_mercury
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Joray <13637815@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Joray <13637815@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -36,7 +37,7 @@ msgstr "128位的CryptoAPI失败"
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.pos_config_view_form_inherit_pos_mercury
 msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Buy a card reader"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-right\"/>"
 
 #. module: pos_mercury
 #: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
diff --git a/addons/pos_restaurant/i18n/de.po b/addons/pos_restaurant/i18n/de.po
index 22ce47c696a..1f2374c1583 100644
--- a/addons/pos_restaurant/i18n/de.po
+++ b/addons/pos_restaurant/i18n/de.po
@@ -3,27 +3,28 @@
 # * pos_restaurant
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Niki Waibel, 2017
+# Dejan Dinic, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Charly Chimpo <charlychimpo@gmail.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Ermin Trevisan <trevi@twanda.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,12 +35,12 @@ msgstr ""
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Floor Name: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Point of Sale: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor_background_image
diff --git a/addons/pos_restaurant/i18n/es.po b/addons/pos_restaurant/i18n/es.po
index 90e677508ca..ef0e82d6150 100644
--- a/addons/pos_restaurant/i18n/es.po
+++ b/addons/pos_restaurant/i18n/es.po
@@ -3,27 +3,28 @@
 # * pos_restaurant
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Pablo Fuentes <pablo@studio73.es>, 2017
 # Daniel Santibáñez Polanco <dansanti@gmail.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -34,12 +35,12 @@ msgstr ""
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Floor Name: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Point of Sale: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor_background_image
diff --git a/addons/pos_restaurant/i18n/fr.po b/addons/pos_restaurant/i18n/fr.po
index 7d628efc94f..529e02065c0 100644
--- a/addons/pos_restaurant/i18n/fr.po
+++ b/addons/pos_restaurant/i18n/fr.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Martin Trigaux, 2016
+# Florian Hatat, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Hubert TETARD <htetard@apik-conseils.com>, 2016
@@ -23,13 +23,14 @@
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
 # Lucas Deliege <lud@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+0000\n"
-"Last-Translator: Lucas Deliege <lud@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -40,12 +41,12 @@ msgstr ""
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Floor Name: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_kanban
 msgid "<strong>Point of Sale: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor_background_image
@@ -69,6 +70,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Accept customer tips or convert their change to a tip"
 msgstr ""
+"Accepter les pourboires des clients ou convertir leur monnaie en pourboire"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_active
@@ -85,22 +87,22 @@ msgstr "Ajoutez une note"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Add notes to orderlines"
-msgstr ""
+msgstr "Ajouter une note sur une ligne de commande"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_orderline_notes
 msgid "Allow custom notes on Orderlines."
-msgstr ""
+msgstr "Autoriser les notes personnalisées sur les lignes de commande"
 
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Allow to print bill before payment"
-msgstr ""
+msgstr "Autoriser l'impression de la facture avant le paiement"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_printbill
 msgid "Allows to print the Bill before payment."
-msgstr ""
+msgstr "Permet d'imprimer la facture avant le paiement."
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_restaurant_table_name
@@ -244,11 +246,15 @@ msgid ""
 "                An Order Printer will only print updates for products belonging to one of\n"
 "                its categories."
 msgstr ""
+"Chaque imprimante de commande possède une adresse IP qui indique la PosBox/le proxy\n"
+" matériel où se situe l'imprimante, ainsi qu'une liste de catégories de produits.\n"
+" Les imprimantes peuvent uniquement imprimer les mises à jour des produits appartenant à l'une de\n"
+" ces catégories."
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_iface_splitbill
 msgid "Enables Bill Splitting in the Point of Sale."
-msgstr ""
+msgstr "Autoriser le partage d'une addition au point de vente."
 
 #. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_floor_id
@@ -269,7 +275,7 @@ msgstr "Plans de l'étage"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Floors"
-msgstr ""
+msgstr "Étages"
 
 #. module: pos_restaurant
 #. openerp-web
@@ -344,7 +350,7 @@ msgstr "Dernière mise à jour le"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Manage table orders"
-msgstr ""
+msgstr "Gérer les commandes des tables"
 
 #. module: pos_restaurant
 #. openerp-web
@@ -444,7 +450,7 @@ msgstr "Imprimer"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Print orders at the kitchen, at the bar, etc."
-msgstr ""
+msgstr "Imprimer les commandes en cuisine, au bar, etc."
 
 #. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_printer_product_categories_ids
@@ -531,7 +537,7 @@ msgstr "Diviser"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "Split total or order lines"
-msgstr ""
+msgstr "Diviser le total ou les lignes de commande"
 
 #. module: pos_restaurant
 #: selection:restaurant.table,shape:0
@@ -560,7 +566,7 @@ msgstr "Table"
 #. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_pos_config_is_table_management
 msgid "Table Management"
-msgstr ""
+msgstr "Gestion des tables"
 
 #. module: pos_restaurant
 #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_name
@@ -619,7 +625,7 @@ msgstr "La liste de tables sur cet étage"
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_config_floor_ids
 msgid "The restaurant floors served by this point of sale."
-msgstr ""
+msgstr "Les étages du restaurant servis par ce point de vente."
 
 #. module: pos_restaurant
 #: model:ir.model.fields,help:pos_restaurant.field_pos_order_table_id
@@ -669,7 +675,7 @@ msgstr "Cet étage n'a pas encore de tables, utilisez le"
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
 msgid "This product is used as reference on customer receipts."
-msgstr ""
+msgstr "Ce produit est utilisé comme référence sur les reçus client."
 
 #. module: pos_restaurant
 #: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index dac0a906850..1a135bdfe03 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -11,7 +11,8 @@ var QWeb = core.qweb;
 
 var Printer = core.Class.extend(mixins.PropertiesMixin,{
     init: function(parent,options){
-        mixins.PropertiesMixin.init.call(this,parent);
+        mixins.PropertiesMixin.init.call(this);
+        this.setParent(parent);
         options = options || {};
         var url = options.url || 'http://localhost:8069';
         this.connection = new Session(undefined,url, { use_cors: true});
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 111d00393aa..5ac6ff6f74f 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -5,34 +5,35 @@
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # key six <mobile.umts@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # intero_chz <c.zoellner@intero-technologies.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Renzo Meister, 2017
+# Dejan Dinic, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Tiberius Kuczera <nero.t@gmx.net>, 2017
 # Mark Lorenz <bandworm@gmail.com>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # aNj <anj2j@yahoo.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: aNj <anj2j@yahoo.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -151,6 +152,9 @@ msgid ""
 " This description will be copied to every Sales Order, Delivery Order and "
 "Customer Invoice/Credit Note"
 msgstr ""
+"Eine Beschreibung des Produkts, die Sie Ihren Kunden mitteilen möchten. "
+"Diese Beschreibung wird in jeden Verkaufsauftrag, Lieferauftrag und jede "
+"Kundenrechnung/Kreditanmerkung kopiert."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_description_purchase
@@ -1972,7 +1976,7 @@ msgid ""
 "            converted between each others. For example, in the category\n"
 "            <i>'Time'</i>, you will have the following units of measure:\n"
 "            Hours, Days."
-msgstr ""
+msgstr "<i/>"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_res_config_settings_group_sale_pricelist
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index c414529f405..3b8d11f9956 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -4,9 +4,9 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Hamid Darabi <hamid.darabi@gmail.com>, 2016
+# Hamid Darabi, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Clo <clo@odoo.com>, 2016
@@ -15,7 +15,7 @@
 # Simon CARRIER <carrier.sim@gmail.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # zoe <yann.hoareau@migs.re>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
@@ -34,13 +34,14 @@
 # Simon Maillard <simon@ogesta.fr>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
 # nthnnl <nathan070@me.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: nthnnl <nathan070@me.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -96,6 +97,9 @@ msgid ""
 "                            <span attrs=\"{'invisible':[('base', '!=', 'standard_price')]}\">Cost  -  </span>\n"
 "                            <span attrs=\"{'invisible':[('base', '!=', 'pricelist')]}\">Other Pricelist  -  </span>"
 msgstr ""
+"<span attrs=\"{'invisible':[('base', '!=', 'list_price')]}\"/><span "
+"attrs=\"{'invisible':[('base', '!=', 'standard_price')]}\"/><span "
+"attrs=\"{'invisible':[('base', '!=', 'pricelist')]}\"/>"
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_category_form_view
@@ -138,7 +142,7 @@ msgid ""
 "<strong>Warning</strong>: adding or deleting attributes\n"
 "                        will delete and recreate existing variants and lead\n"
 "                        to the loss of their possible customizations."
-msgstr ""
+msgstr "<strong/>"
 
 #. module: product
 #: sql_constraint:product.product:0
@@ -153,6 +157,9 @@ msgid ""
 " This description will be copied to every Sales Order, Delivery Order and "
 "Customer Invoice/Credit Note"
 msgstr ""
+"Une description du produit que vous souhaitez communiquer à vos clients. "
+"Cette description sera copiée sur chaque bon de commande, bon de livraison "
+"et note de crédit/facture client"
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_description_purchase
@@ -162,6 +169,9 @@ msgid ""
 "This description will be copied to every Purchase Order, Receipt and Vendor "
 "Bill/Credit Note."
 msgstr ""
+"Une description du produit que vous souhaitez communiquer à vos "
+"fournisseurs. Cette description sera copiée sur chaque bon de commande, "
+"facture et note de crédit/facture fournisseur."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_description
@@ -177,6 +187,8 @@ msgid ""
 "A price list contains rules to be evaluated in order to compute\n"
 "                the sale price of the products."
 msgstr ""
+"Une liste de prix contient les règles à évaluer afin de calculer\n"
+" le prix de vente des produits."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_type
@@ -259,7 +271,7 @@ msgstr "Attribut"
 #: model:ir.ui.view,arch_db:product.product_attribute_line_form
 #: model:ir.ui.view,arch_db:product.product_attribute_view_form
 msgid "Attribute Name"
-msgstr ""
+msgstr "Nom de l'attribut"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_attribute_value_price_extra
@@ -302,7 +314,7 @@ msgstr "Code Barre"
 #. module: product
 #: model:ir.model.fields,help:product.field_product_packaging_barcode
 msgid "Barcode used for packaging identification."
-msgstr ""
+msgstr "Code-barres utilisé pour identifier l'emballage."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_pricelist_item_base
@@ -312,6 +324,10 @@ msgid ""
 "Cost Price : The base price will be the cost price.\n"
 "Other Pricelist : Computation of the base price based on another Pricelist."
 msgstr ""
+"Prix de base pour le calcul.\n"
+"Prix public : le prix de base sera le prix de vente/prix public.\n"
+"Prix de revient : le prix de base sera le prix de revient.\n"
+"Autre liste de prix : calcul du prix de base, basé sur une autre liste de prix."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_list_price
@@ -439,7 +455,7 @@ msgstr "Couleur"
 #. module: product
 #: model:ir.ui.view,arch_db:product.res_config_settings_view_form
 msgid "Common Product Catalog"
-msgstr ""
+msgstr "Catalogue"
 
 #. module: product
 #: model:ir.model,name:product.model_res_company
@@ -520,6 +536,8 @@ msgid ""
 "in average/fifo. Also used as a base price for pricelists. Expressed in the "
 "default unit of measure of the product."
 msgstr ""
+"Également utilisé comme prix de base pour les listes. Exprimé dans l'unité "
+"de mesure par défaut du produit."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_template_standard_price
@@ -528,6 +546,8 @@ msgid ""
 "in average/fifo. Also used as a base price for pricelists. Expressed in the "
 "default unit of measure of the product. "
 msgstr ""
+"Également utilisé comme prix de base pour les listes. Exprimé dans l'unité "
+"de mesure par défaut du produit."
 
 #. module: product
 #: model:ir.model,name:product.model_res_country_group
@@ -542,7 +562,7 @@ msgstr "Groupes de pays"
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_attribute_create_variant
 msgid "Create Variant"
-msgstr ""
+msgstr "Créer une variante"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_attribute_create_uid
@@ -610,7 +630,7 @@ msgstr "Jour(s)"
 #: code:addons/product/models/res_company.py:59
 #, python-format
 msgid "Default %(currency)s pricelist for %(company)s"
-msgstr ""
+msgstr "Liste de prix par défaut en %(currency) pour %(company)s"
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_uom_id
@@ -643,7 +663,7 @@ msgstr "Description"
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_template_form_view
 msgid "Description for Customers"
-msgstr ""
+msgstr "Description pour les clients"
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_attribute_sequence
@@ -722,7 +742,7 @@ msgstr ""
 msgid ""
 "Error! It is not allowed to choose more than one value for a given "
 "attribute."
-msgstr ""
+msgstr "Erreur ! "
 
 #. module: product
 #: code:addons/product/models/product_pricelist.py:427
@@ -789,7 +809,7 @@ msgstr "Information Générale"
 #: model:ir.model.fields,help:product.field_product_product_packaging_ids
 #: model:ir.model.fields,help:product.field_product_template_packaging_ids
 msgid "Gives the different ways to package the same product."
-msgstr ""
+msgstr "Donne les différentes façons d'emballer le même produit."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_product_sequence
@@ -806,7 +826,7 @@ msgstr "Global"
 #: code:addons/product/models/product_template.py:30
 #, python-format
 msgid "Go to Internal Categories"
-msgstr ""
+msgstr "Accéder aux catégories internes"
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
@@ -824,6 +844,9 @@ msgid ""
 "How many times this Unit of Measure is bigger than the reference Unit of "
 "Measure in this category: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Combien de fois cette unité de mesure est plus grande que l'unité de mesure "
+"de référence de cette catégorie : 1 x (cette unité) = ratio x (unité de "
+"référence)"
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_uom_factor
@@ -831,6 +854,9 @@ msgid ""
 "How much bigger or smaller this unit is compared to the reference Unit of "
 "Measure for this category: 1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Combien de fois cette unité est plus petite ou plus grande que l'unité de "
+"mesure de référence de cette catégorie : 1 x (unité de référence) = ratio x "
+"(cette unité)"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_attribute_id
@@ -857,6 +883,8 @@ msgstr "ID"
 msgid ""
 "If not set, the vendor price will apply to all variants of this products."
 msgstr ""
+"Si cela n'est pas défini, le prix fournisseur s'appliquera à toutes les "
+"variantes de ce produit."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_pricelist_active
@@ -1227,7 +1255,7 @@ msgstr "Liste de prix"
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_pricelist_item_ids
 msgid "Pricelist Item"
-msgstr ""
+msgstr "Élément de la liste de prix"
 
 #. module: product
 #: model:ir.model.fields,help:product.field_product_pricelist_item_applied_on
@@ -1315,7 +1343,7 @@ msgstr "Valeur de caractéristique d'article"
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_attribute_line_form
 msgid "Product Attribute and Values"
-msgstr ""
+msgstr "Valeurs et attributs des produits"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_product_attribute_line_ids
@@ -1349,12 +1377,12 @@ msgstr "Nom de l'article"
 #: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
 #: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
 msgid "Product Packages"
-msgstr ""
+msgstr "Emballages des produits"
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_packaging_form_view
 msgid "Product Packaging"
-msgstr ""
+msgstr "Emballage des produits"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_packaging_view
@@ -1927,6 +1955,7 @@ msgstr "Type"
 msgid ""
 "Uncheck the active field to disable a unit of measure without deleting it."
 msgstr ""
+"Décochez le champ actif de désactiver une unité de mesure sans la supprimer."
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_unit
@@ -1970,7 +1999,7 @@ msgid ""
 "            converted between each others. For example, in the category\n"
 "            <i>'Time'</i>, you will have the following units of measure:\n"
 "            Hours, Days."
-msgstr ""
+msgstr "<i/>"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_res_config_settings_group_sale_pricelist
@@ -2165,6 +2194,8 @@ msgid ""
 "You must define at least one product category in order to be able to create "
 "products."
 msgstr ""
+"Vous devez définir au moins une catégorie de produits pour pouvoir créer des"
+" produits."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -2189,7 +2220,7 @@ msgstr "ex. Lampes"
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
 msgid "e.g. Odoo Enterprise Subscription"
-msgstr ""
+msgstr "p. ex. Abonnement à Odoo Entreprise"
 
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_pricelist_view
diff --git a/addons/product_email_template/i18n/de.po b/addons/product_email_template/i18n/de.po
index fabe19982c4..4b0110ae418 100644
--- a/addons/product_email_template/i18n/de.po
+++ b/addons/product_email_template/i18n/de.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Tina Rittmüller <tr@ife.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -618,6 +619,157 @@ msgid ""
 "            \n"
 "            "
 msgstr ""
+"<div style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div style=\"height:auto;text-"
+"left: center;font-size : 16px;color: #646464;margin-top:30px;margin-"
+"left:15px;margin-right:5px;\"></div><div style=\"height: auto;margin-"
+"top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-"
+"size:16px;\"><strong></strong><ul></ul></div><hr color=\"DCDCFB\"/><div "
+"style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div><table><tr><td><img "
+"src=\"/product_email_template/static/img/online_training.png\"/></td><td "
+"style=\"height: auto;margin-top:10px;margin-bottom:10px;font-"
+"size:18px;color: "
+"#646464;\"><strong></strong><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: left;font-size : 14px;color: #646464;margin-"
+"top:10px;margin-"
+"left:15px;\"><b></b><br/><br/><b></b><ul></ul><br/><b></b><b></b><b></b><br/><ul"
+" style=\"color: #6d57e0\"><li><strong></strong></li></ul></div><hr "
+"color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"40px;color: #333333;margin-top:40px;font-weight: 300;\"></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"height:auto;text-"
+"align: center;font-size : 24px;color: #646464;margin-top:30px;\"><hr "
+"style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: "
+"25px;\" /><hr style=\"display: inline-block; width: 15%; margin-bottom: 4px"
+";margin-left: 25px;\" /><br/><br/><div style=\"text-align: left;font-size : "
+"24px;color: #646464;margin-top:30px;\"></div><table cellspacing=\"5\"><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul><li><li></li></li></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul><strong></strong><ul></ul></td></tr><tr style"
+"=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;\" ><table cellspacing=\"5\" "
+"align=\"center\" cellpadding=\"5\"><tr style=\"font-size : 20px;color: "
+"#333333;margin-top:30px;\"><td></td><td></td><td></td></tr><tr style=\"font-"
+"size : 10px;color: #646464;\"><td></td><td></td><td></td></tr><tr style"
+"=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\"><td><a "
+"href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td></tr></table></div><hr"
+" color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"30px;color: #333333;margin-top:10px;\"></div><div style=\"height:auto;text-"
+"align: left;font-size : 16px;color: #646464;margin-"
+"top:30px;\"><ul><li></li></ul></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;font-"
+"size:20px;color:#4e66e7\"><table "
+"cellspacing=\"5\"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></div></div><li></li><li/><li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li/><li><li/><li/><li/><li/><li/></li><li><li><strong/></li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li><strong/><li/><li/><li/><li/></li><strong/><li><strong/></li><li/><li><li/><li/><li/></li><li><li/><li/><li/><li/><li/></li><li/><li></li>"
 
 #. module: product_email_template
 #: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
diff --git a/addons/product_email_template/i18n/es.po b/addons/product_email_template/i18n/es.po
index 73152522a11..da00a2c5c99 100644
--- a/addons/product_email_template/i18n/es.po
+++ b/addons/product_email_template/i18n/es.po
@@ -3,19 +3,19 @@
 # * product_email_template
 # 
 # Translators:
-# Luis M. Triana <luis.triana@jarsa.com.mx>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# José Vicente <txusev@gmail.com>, 2017
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
-# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
+# Martin Trigaux, 2016
+# José Vicente <txusev@gmail.com>, 2016
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -618,6 +618,157 @@ msgid ""
 "            \n"
 "            "
 msgstr ""
+"<div style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div style=\"height:auto;text-"
+"left: center;font-size : 16px;color: #646464;margin-top:30px;margin-"
+"left:15px;margin-right:5px;\"></div><div style=\"height: auto;margin-"
+"top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-"
+"size:16px;\"><strong></strong><ul></ul></div><hr color=\"DCDCFB\"/><div "
+"style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div><table><tr><td><img "
+"src=\"/product_email_template/static/img/online_training.png\"/></td><td "
+"style=\"height: auto;margin-top:10px;margin-bottom:10px;font-"
+"size:18px;color: "
+"#646464;\"><strong></strong><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: left;font-size : 14px;color: #646464;margin-"
+"top:10px;margin-"
+"left:15px;\"><b></b><br/><br/><b></b><ul></ul><br/><b></b><b></b><b></b><br/><ul"
+" style=\"color: #6d57e0\"><li><strong></strong></li></ul></div><hr "
+"color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"40px;color: #333333;margin-top:40px;font-weight: 300;\"></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"height:auto;text-"
+"align: center;font-size : 24px;color: #646464;margin-top:30px;\"><hr "
+"style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: "
+"25px;\" /><hr style=\"display: inline-block; width: 15%; margin-bottom: 4px"
+";margin-left: 25px;\" /><br/><br/><div style=\"text-align: left;font-size : "
+"24px;color: #646464;margin-top:30px;\"></div><table cellspacing=\"5\"><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul><li><li></li></li></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul><strong></strong><ul></ul></td></tr><tr style"
+"=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;\" ><table cellspacing=\"5\" "
+"align=\"center\" cellpadding=\"5\"><tr style=\"font-size : 20px;color: "
+"#333333;margin-top:30px;\"><td></td><td></td><td></td></tr><tr style=\"font-"
+"size : 10px;color: #646464;\"><td></td><td></td><td></td></tr><tr style"
+"=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\"><td><a "
+"href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td></tr></table></div><hr"
+" color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"30px;color: #333333;margin-top:10px;\"></div><div style=\"height:auto;text-"
+"align: left;font-size : 16px;color: #646464;margin-"
+"top:30px;\"><ul><li></li></ul></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;font-"
+"size:20px;color:#4e66e7\"><table "
+"cellspacing=\"5\"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></div></div><li></li><li/><li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li/><li><li/><li/><li/><li/><li/></li><li><li><strong/></li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li><strong/><li/><li/><li/><li/></li><strong/><li><strong/></li><li/><li><li/><li/><li/></li><li><li/><li/><li/><li/><li/></li><li/><li></li>"
 
 #. module: product_email_template
 #: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
diff --git a/addons/product_email_template/i18n/fr.po b/addons/product_email_template/i18n/fr.po
index 2aa4ca02a01..f31e2f3465e 100644
--- a/addons/product_email_template/i18n/fr.po
+++ b/addons/product_email_template/i18n/fr.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -618,6 +619,157 @@ msgid ""
 "            \n"
 "            "
 msgstr ""
+"<div style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div style=\"height:auto;text-"
+"left: center;font-size : 16px;color: #646464;margin-top:30px;margin-"
+"left:15px;margin-right:5px;\"></div><div style=\"height: auto;margin-"
+"top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-"
+"size:16px;\"><strong></strong><ul></ul></div><hr color=\"DCDCFB\"/><div "
+"style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div><table><tr><td><img "
+"src=\"/product_email_template/static/img/online_training.png\"/></td><td "
+"style=\"height: auto;margin-top:10px;margin-bottom:10px;font-"
+"size:18px;color: "
+"#646464;\"><strong></strong><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: left;font-size : 14px;color: #646464;margin-"
+"top:10px;margin-"
+"left:15px;\"><b></b><br/><br/><b></b><ul></ul><br/><b></b><b></b><b></b><br/><ul"
+" style=\"color: #6d57e0\"><li><strong></strong></li></ul></div><hr "
+"color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"40px;color: #333333;margin-top:40px;font-weight: 300;\"></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"height:auto;text-"
+"align: center;font-size : 24px;color: #646464;margin-top:30px;\"><hr "
+"style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: "
+"25px;\" /><hr style=\"display: inline-block; width: 15%; margin-bottom: 4px"
+";margin-left: 25px;\" /><br/><br/><div style=\"text-align: left;font-size : "
+"24px;color: #646464;margin-top:30px;\"></div><table cellspacing=\"5\"><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul><li><li></li></li></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul><strong></strong><ul></ul></td></tr><tr style"
+"=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;\" ><table cellspacing=\"5\" "
+"align=\"center\" cellpadding=\"5\"><tr style=\"font-size : 20px;color: "
+"#333333;margin-top:30px;\"><td></td><td></td><td></td></tr><tr style=\"font-"
+"size : 10px;color: #646464;\"><td></td><td></td><td></td></tr><tr style"
+"=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\"><td><a "
+"href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td></tr></table></div><hr"
+" color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"30px;color: #333333;margin-top:10px;\"></div><div style=\"height:auto;text-"
+"align: left;font-size : 16px;color: #646464;margin-"
+"top:30px;\"><ul><li></li></ul></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;font-"
+"size:20px;color:#4e66e7\"><table "
+"cellspacing=\"5\"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></div></div><li></li><li/><li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li/><li><li/><li/><li/><li/><li/></li><li><li><strong/></li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li><strong/><li/><li/><li/><li/></li><strong/><li><strong/></li><li/><li><li/><li/><li/></li><li><li/><li/><li/><li/><li/></li><li/><li></li>"
 
 #. module: product_email_template
 #: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
diff --git a/addons/product_email_template/i18n/zh_CN.po b/addons/product_email_template/i18n/zh_CN.po
index 689ac880dcb..a5c3467d93b 100644
--- a/addons/product_email_template/i18n/zh_CN.po
+++ b/addons/product_email_template/i18n/zh_CN.po
@@ -3,19 +3,18 @@
 # * product_email_template
 # 
 # Translators:
-# Gary Wei <Gary.wei@elico-corp.com>, 2017
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2017
 # Talway <9010446@qq.com>, 2017
-# waveyeung <waveyeung@qq.com>, 2017
-# Jeff Yu <jeff.yu@elico-corp.com>, 2017
+# Jeff Yu - Elico Corp <jeff.yu@elico-corp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Jeff Yu <jeff.yu@elico-corp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -618,6 +617,157 @@ msgid ""
 "            \n"
 "            "
 msgstr ""
+"<div style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div style=\"height:auto;text-"
+"left: center;font-size : 16px;color: #646464;margin-top:30px;margin-"
+"left:15px;margin-right:5px;\"></div><div style=\"height: auto;margin-"
+"top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-"
+"size:16px;\"><strong></strong><ul></ul></div><hr color=\"DCDCFB\"/><div "
+"style=\"height:auto;text-align: center;font-size : 40px;color: #333333"
+";margin-top:30px;font-weight: 300;\"></div><div><table><tr><td><img "
+"src=\"/product_email_template/static/img/online_training.png\"/></td><td "
+"style=\"height: auto;margin-top:10px;margin-bottom:10px;font-"
+"size:18px;color: "
+"#646464;\"><strong></strong><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: left;font-size : 14px;color: #646464;margin-"
+"top:10px;margin-"
+"left:15px;\"><b></b><br/><br/><b></b><ul></ul><br/><b></b><b></b><b></b><br/><ul"
+" style=\"color: #6d57e0\"><li><strong></strong></li></ul></div><hr "
+"color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"40px;color: #333333;margin-top:40px;font-weight: 300;\"></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"height:auto;text-"
+"align: center;font-size : 24px;color: #646464;margin-top:30px;\"><hr "
+"style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: "
+"25px;\" /><hr style=\"display: inline-block; width: 15%; margin-bottom: 4px"
+";margin-left: 25px;\" /><br/><br/><div style=\"text-align: left;font-size : "
+"24px;color: #646464;margin-top:30px;\"></div><table cellspacing=\"5\"><tr "
+"style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul><li><li></li></li></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul><strong></strong><ul></ul></td></tr><tr style"
+"=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><strong></strong><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table><div style=\"text-align: left;font-"
+"size : 24px;color: #646464;margin-top:30px;\"></div><table><tr style=\"text-"
+"align: center;font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table></div><div "
+"style=\"height:auto;text-align: center;font-size : 24px;color: #646464"
+";margin-top:30px;\"><hr style=\"display: inline-block; width: 15%; margin-"
+"bottom: 4px;margin-right: 25px;\" /><hr style=\"display: inline-block; "
+"width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/><div style"
+"=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table cellspacing=\"5\"><tr style=\"text-align: center"
+";font-size : 20px;color: #FFFFFF;background-"
+"color:#969696;\"><th></th><th></th></tr><tr style=\"text-align: left;font-"
+"size : 16px;color: #646464;\"><td style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><ul></ul></td></tr></table><div style=\"text-align: "
+"left;font-size : 24px;color: #646464;margin-top:30px;\"></div><table "
+"cellspacing=\"5\"><tr style=\"text-align: center;font-size : 20px;color: "
+"#FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr style=\"text-"
+"align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"><br/><br/><strong></strong><ul></ul><strong></strong><ul></ul></td></tr></table><div"
+" style=\"text-align: left;font-size : 24px;color: #646464;margin-"
+"top:30px;\"></div><table><tr style=\"text-align: center;font-size : "
+"20px;color: #FFFFFF;background-color:#969696;\"><th></th><th></th></tr><tr "
+"style=\"text-align: left;font-size : 16px;color: #646464;\"><td "
+"style=\"width:50%;\"><ul></ul></td><td "
+"style=\"width:50%;\"></td></tr></table></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;\" ><table cellspacing=\"5\" "
+"align=\"center\" cellpadding=\"5\"><tr style=\"font-size : 20px;color: "
+"#333333;margin-top:30px;\"><td></td><td></td><td></td></tr><tr style=\"font-"
+"size : 10px;color: #646464;\"><td></td><td></td><td></td></tr><tr style"
+"=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\"><td><a "
+"href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td><td><a "
+"href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-"
+"decoration:none;color:#FFFFFF;\" target=_new></a></td></tr></table></div><hr"
+" color=\"DCDCFB\"/><div style=\"height:auto;text-align: center;font-size : "
+"30px;color: #333333;margin-top:10px;\"></div><div style=\"height:auto;text-"
+"align: left;font-size : 16px;color: #646464;margin-"
+"top:30px;\"><ul><li></li></ul></div><div style=\"text-align: center"
+";background-color:#FFFFFF;margin-top:30px;font-"
+"size:20px;color:#4e66e7\"><table "
+"cellspacing=\"5\"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></div></div><li></li><li/><li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li/><li><li/><li/><li/><li/><li/></li><li><li><strong/></li><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/><li/></li><li><strong/><li/><li/><li/><li/></li><strong/><li><strong/></li><li/><li><li/><li/><li/></li><li><li/><li/><li/><li/><li/></li><li/><li></li>"
 
 #. module: product_email_template
 #: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index 97a027c8143..0e55c50be45 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -3,15 +3,16 @@
 # * product_expiry
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,16 +26,18 @@ msgid ""
 "<span class=\"label label-danger\" attrs=\"{'invisible': "
 "[('product_expiry_alert', '=', False)]}\">Expiration Alert</span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('product_expiry_alert', '=', False)]}\" "
+"class=\"label label-danger\"/>"
 
 #. module: product_expiry
 #: model:ir.ui.view,arch_db:product_expiry.report_delivery_document_inherit_product_expiry
 msgid "<span class=\"pull-right\">Expiry Date</span>"
-msgstr ""
+msgstr "<span class=\"pull-right\"/>"
 
 #. module: product_expiry
 #: model:ir.ui.view,arch_db:product_expiry.view_product_form_expiry
 msgid "<span>days</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: product_expiry
 #: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot_alert_date
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index 2955e817608..8d9c8e46b1f 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -3,16 +3,17 @@
 # * product_expiry
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # David Arnold <blaggacao@users.noreply.github.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: David Arnold <blaggacao@users.noreply.github.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,6 +27,8 @@ msgid ""
 "<span class=\"label label-danger\" attrs=\"{'invisible': "
 "[('product_expiry_alert', '=', False)]}\">Expiration Alert</span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('product_expiry_alert', '=', False)]}\" "
+"class=\"label label-danger\"/>"
 
 #. module: product_expiry
 #: model:ir.ui.view,arch_db:product_expiry.report_delivery_document_inherit_product_expiry
@@ -35,7 +38,7 @@ msgstr "Fecha de expiración"
 #. module: product_expiry
 #: model:ir.ui.view,arch_db:product_expiry.view_product_form_expiry
 msgid "<span>days</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: product_expiry
 #: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot_alert_date
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 0fa571b54a8..1cb18146249 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -437,7 +437,7 @@ msgstr ""
 msgid ""
 "<span class=\"text-muted\">NB: This will archive the selected tasks (Except "
 "the destination task)</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\"/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -457,7 +457,7 @@ msgstr "<strong>Datum:</strong>"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
 msgid "<strong>Deadline:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -473,12 +473,12 @@ msgstr "<strong>Nachrichten- und Kommunikationsverlauf</strong>"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_project
 msgid "<strong>Project Manager</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
 msgid "<strong>Project:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_project_rating_popover
@@ -910,7 +910,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,help:project.project_task_action_activity
 msgid "Currently there are not any activity scheduled."
-msgstr ""
+msgstr "Derzeit sind keine Aktivitäten geplant."
 
 #. module: project
 #: code:addons/project/models/project.py:897
@@ -1182,7 +1182,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,kanban_state:0
 msgid "Grey"
-msgstr ""
+msgstr "Grau"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_type_legend_normal
@@ -1542,7 +1542,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_action_activity
 msgid "My Next Activities"
-msgstr ""
+msgstr "Meine nächsten Aktivitäten"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -1819,7 +1819,7 @@ msgstr "Projekt"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_project
 msgid "Project -"
-msgstr ""
+msgstr "Projekt -"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_account_analytic_account_project_count
@@ -1849,7 +1849,7 @@ msgstr "Projektbezeichnung"
 #. module: project
 #: model:ir.ui.view,arch_db:project.rating_index
 msgid "Project Satisfaction"
-msgstr ""
+msgstr "Zufriedenheit bei Projekt"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_task_graph
@@ -2034,19 +2034,19 @@ msgstr "Projekt suchen"
 #: code:addons/project/controllers/portal.py:96
 #, python-format
 msgid "Search in All"
-msgstr ""
+msgstr "Alle durchsuchen"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:94
 #, python-format
 msgid "Search in Customer"
-msgstr ""
+msgstr "Kunden durchsuchen"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:93
 #, python-format
 msgid "Search in Messages"
-msgstr ""
+msgstr "Nachrichten durchsuchen"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:95
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index b9b157c60c2..546d96e3cdb 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -3,9 +3,9 @@
 # * project
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Roberto Lizana <robertolizana@trey.es>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -37,13 +37,14 @@
 # Miquel Torner <miq@odoo.com>, 2017
 # Sergio Flores <vitavitae1@gmail.com>, 2017
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -226,6 +227,79 @@ msgid ""
 "    </table>\n"
 "</div>\n"
 msgstr ""
+"\n"
+"<div style=\"background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+" % set access_token = object.rating_get_access_token()\n"
+" <table style=\"width:600px;margin:5px auto;\">\n"
+" <tbody>\n"
+" <tr><td>\n"
+" <a href=\"/\"><img src=\"/web/binary/company_logo\" style=\"vertical-align:baseline;max-width:100px;\"/></a>\n"
+"</td> <td style=\"text-align:right;vertical-align:middle;\">\n"
+" Encuesta de satisfacción\n"
+"</td></tr> \n"
+"</tbody> \n"
+"</table> <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
+" <tbody>\n"
+" <tr><td style=\"padding:15px 20px 10px 20px;\">\n"
+" \n"
+" <p>Hola</p>:\n"
+" <p>Dedique unos instantes a valorar nuestros servicios en relación a la tarea \"<strong>${object.name}</strong>\"\n"
+" asignada a <strong>${object.rating_get_rated_partner_id().name}</strong>.</p>\n"
+" <p>Agradecemos su participación. Sus observaciones nos ayudan a mejorar en todo momento.</p>\n"
+"</td></tr><tr><td style=\"padding:10px 20px\"> <table style=\"width:100%;border-top:1px solid #e1e1e1;\" summary=\"o_mail_notification\">\n"
+" <tr>\n"
+" <td style=\"text-align:center;\">\n"
+" <h2 style=\"font-weight:300;font-size:18px;\">\n"
+" \n"
+" \n"
+" Háganos saber qué opinión le ha merecido nuestro servicio:\n"
+"</h2> \n"
+" <div style=\"text-color: #888888\">(haga clic en cualquiera de los emoticonos)</div>\n"
+"</td></tr><tr> <td style=\"padding:10px 10px;\">\n"
+" <table style=\"width:100%;text-align:center;\">\n"
+" <tr>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/10\">\n"
+" <img alt=\"Satisfied\" src=\"/rating/static/src/img/rating_10.png\" title=\"Satisfied\"/>\n"
+" \n"
+"</a> \n"
+"</td> <td>\n"
+" <a href=\"/rating/${access_token}/5\">\n"
+" <img alt=\"Not satisfied\" src=\"/rating/static/src/img/rating_5.png\" title=\"Not satisfied\"/>\n"
+" \n"
+"</a> \n"
+"</td> <td>\n"
+" <a href=\"/rating/${access_token}/1\">\n"
+" <img alt=\"Highly Dissatisfied\" src=\"/rating/static/src/img/rating_1.png\" title=\"Highly Dissatisfied\"/>\n"
+" \n"
+"</a> \n"
+"</td> \n"
+"</tr> \n"
+"</table> \n"
+"</td> \n"
+"</tr> \n"
+"</table> \n"
+"</td></tr> \n"
+" \n"
+"<tr><td style=\"padding:15px 20px 10px 20px;\"/></tr></tbody> \n"
+" ${(object.user_id.signature or '')| safe}</table><table style=\"width:600px;margin:auto;text-align:center;font-size:12px;\">\n"
+" <tbody lilt=\"split=0\">\n"
+" <tr lilt=\"split=0\"><td style=\"padding-top:10px;color:#afafaf;\">\n"
+" \n"
+" \n"
+" \n"
+" % if object.project_id.rating_status == 'stage':\n"
+" <p>Ha recibido esta encuesta para clientes porque su tarea ha sido trasladada a la fase <b>${object.stage_id.name}</b></p>\n"
+" % endif\n"
+" % if object.project_id.rating_status == 'periodic':\n"
+" <p>Esta encuesta para clientes se envía <b>${object.project_id.rating_status_period}</b> siempre y cuando la tarea permanezca en la fase <b>${object.stage_id.name}</b>.</p>\n"
+" % endif\n"
+" <p>Correo electrónico enviado automáticamente por <a href=\"https://www.odoo.com/page/project-management\" style=\"color:#875A7B;text-decoration:none;\" target=\"_blank\">Odoo Project</a> a <a href=\"${object.project_id.company_id.website}\" style=\"color:#875A7B;text-decoration:none;\">${object.project_id.company_id.name}</a></p>\n"
+"</td> \n"
+" \n"
+" \n"
+"\n"
+"</tr></tbody><tbody lilt=\"split=1\"><tr lilt=\"split=1\"/></tbody></table></div>"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_delay_endings_days
@@ -241,12 +315,12 @@ msgstr "Nº tareas"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_open
 msgid "# Working Days to Assign"
-msgstr ""
+msgstr "Nº de días laborables a Asignar"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_working_days_close
 msgid "# Working Days to Close"
-msgstr ""
+msgstr "Nº de días laborables a Cerrar"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_nbr
@@ -257,6 +331,7 @@ msgstr "Nº de tareas"
 #: model:mail.template,subject:project.rating_project_request_email_template
 msgid "${object.project_id.company_id.name}: Service Rating Request"
 msgstr ""
+"${object.project_id.company_id.name}: Solicitud de valoración del servicio"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.edit_project
@@ -332,7 +407,7 @@ msgstr "<i class=\"fa fa-envelope\"/> Email :"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_kanban
 msgid "<i class=\"fa fa-smile-o\"/> No rating yet"
-msgstr ""
+msgstr "<i class=\"fa fa-smile-o\"/>Sin valoración aun"
 
 #. module: project
 #: code:addons/project/models/project.py:126
@@ -370,6 +445,8 @@ msgid ""
 "<span class=\"text-muted\">NB: This will archive the selected tasks (Except "
 "the destination task)</span>"
 msgstr ""
+"<span class=\"text-muted\">NB: Esto archivará las tareas seleccionadas "
+"(salvo la tarea de destino)</span>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -520,7 +597,7 @@ msgstr "Archivado"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_form2
 msgid "Assign to Me"
-msgstr ""
+msgstr "Asignarme a mí"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_date_start
@@ -573,7 +650,7 @@ msgstr "Adjunto"
 #. module: project
 #: model:ir.model.fields,help:project.field_project_task_attachment_ids
 msgid "Attachment that don't come from message."
-msgstr ""
+msgstr "Adjunto que no procede de un mensaje."
 
 #. module: project
 #: code:addons/project/models/project.py:119
@@ -765,7 +842,7 @@ msgstr "Contrato/Analítica"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_displayed_image_id
 msgid "Cover Image"
-msgstr ""
+msgstr "Imagen de portada"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
@@ -790,7 +867,7 @@ msgstr "Crear un proyecto nuevo."
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_create_new_task
 msgid "Create a new task"
-msgstr ""
+msgstr "Crear una tarea"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_create_uid
@@ -1034,6 +1111,8 @@ msgid ""
 "Explanation text to help users using the star on tasks or issues in this "
 "stage."
 msgstr ""
+"Texto explicativo para ayudar a los usuarios a utilizar la estrella en las "
+"tareas o incidencias en esta etapa."
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1110,17 +1189,17 @@ msgstr "Verde"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_type_legend_done
 msgid "Green Kanban Label"
-msgstr ""
+msgstr "Etiqueta Kanban verde"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 msgid "Grey"
-msgstr ""
+msgstr "Gris"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_type_legend_normal
 msgid "Grey Kanban Label"
-msgstr ""
+msgstr "Etiqueta Kanban gris"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
@@ -1183,6 +1262,11 @@ msgid ""
 "\n"
 "Don't forget to set up the mail templates on the stages for which you want to get the customer's feedbacks."
 msgstr ""
+"¿Cómo se obtienen las valoraciones del cliente? \n"
+" - Valoración al cambiar de estado: Se enviará un correo electrónico cada vez que una tarea o problema cambie de fase\n"
+"- Valoración periódica: Envío periódico de correos electrónicos\n"
+"\n"
+"No olvide configurar las plantillas de envío de las fases de las que quiere recibir retroalimentación por parte del cliente."
 
 #. module: project
 #: code:addons/project/models/project.py:809
@@ -1225,6 +1309,9 @@ msgid ""
 "stage', then an email will be sent to the customer when the task reaches "
 "this step."
 msgstr ""
+"Si está fijado y si la configuración de valoración del proyecto es "
+"\"Valoración al cambiar de estado\", se enviará entonces un correo "
+"electrónico al cliente cuando la tarea alcance dicho paso."
 
 #. module: project
 #: model:ir.model.fields,help:project.field_project_project_active
@@ -1361,17 +1448,17 @@ msgstr "Actividades tardías"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Latest Rating: Higly Dissatisfied"
-msgstr ""
+msgstr "Última valoración: Altamente insatisfecho"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Latest Rating: Not Satisfied"
-msgstr ""
+msgstr "Última valoración: No satisfecho"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Latest Rating: Satisfied"
-msgstr ""
+msgstr "Última valoración: Satisfecho"
 
 #. module: project
 #. openerp-web
@@ -1393,6 +1480,8 @@ msgid ""
 "Lets the company customize which Pad installation should be used to link to "
 "new pads (for example: http://etherpad.com/)."
 msgstr ""
+"Permite a la empresa personalizar qué instalación de Pad debería utilizarse "
+"para vincular pads nuevos (p.ej., http://etherpad.com/)."
 
 #. module: project
 #: model:ir.model.fields,help:project.field_project_project_analytic_account_id
@@ -1415,7 +1504,7 @@ msgstr "Baja"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
 msgid "Main Attachments"
-msgstr ""
+msgstr "Principales datos adjuntos"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.res_config_settings_view_form
@@ -1436,17 +1525,17 @@ msgstr "Socios"
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_actions_act_window_merge_tasks
 msgid "Merge Selected Tasks"
-msgstr ""
+msgstr "Combinar tareas seleccionadas"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form
 msgid "Merge Tasks"
-msgstr ""
+msgstr "Combinar tareas"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_task_id
 msgid "Merge into an existing task"
-msgstr ""
+msgstr "Combinar en una tarea existente"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -1461,7 +1550,7 @@ msgstr "Mis favoritos"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 msgid "My Followed Tasks"
-msgstr ""
+msgstr "Mis tareas seguidas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.project_task_action_activity
@@ -1484,7 +1573,7 @@ msgstr "Nombre"
 #. module: project
 #: model:ir.ui.view,arch_db:project.edit_project
 msgid "Name of the tasks :"
-msgstr ""
+msgstr "Nombre de las tareas:"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1495,7 +1584,7 @@ msgstr "Nuevo"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_task_name
 msgid "New task name"
-msgstr ""
+msgstr "Nuevo nombre de la tarea"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:30
@@ -1547,12 +1636,12 @@ msgstr "Ahora el proyecto esta configurado <b>cree unas cuantas tareas</b>"
 #. module: project
 #: model:ir.model.fields,help:project.field_report_project_task_user_working_days_open
 msgid "Number of Working Days to Open the task"
-msgstr ""
+msgstr "Nº de días laborables para abrir la tarea"
 
 #. module: project
 #: model:ir.model.fields,help:project.field_report_project_task_user_working_days_close
 msgid "Number of Working Days to close the task"
-msgstr ""
+msgstr "Nº de días laborables para cerrar la tarea"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_doc_count
@@ -1682,6 +1771,8 @@ msgid ""
 "Percentage of happy ratings over the past 30 days. Get rating details from "
 "the More menu."
 msgstr ""
+"Porcentaje de valoraciones positivas en los últimos 30 días. Puede obtener "
+"detalles de las valoraciones en el menú Más."
 
 #. module: project
 #: selection:project.project,rating_status:0
@@ -1791,14 +1882,14 @@ msgstr "Tareas del proyecto"
 #. module: project
 #: model:ir.actions.server,name:project.ir_actions_server_project_sample
 msgid "Project: Activate Sample Project"
-msgstr ""
+msgstr "Proyecto: activar proyecto de ejemplo"
 
 #. module: project
 #: model:ir.actions.server,name:project.ir_cron_rating_project_ir_actions_server
 #: model:ir.cron,cron_name:project.ir_cron_rating_project
 #: model:ir.cron,name:project.ir_cron_rating_project
 msgid "Project: Send rating"
-msgstr ""
+msgstr "Proyecto: Enviar valoración"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -1824,7 +1915,7 @@ msgstr "Trimestralmente"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_search_form
 msgid "Rated tasks"
-msgstr ""
+msgstr "Tareas valoradas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.rating_rating_action_view_project_rating
@@ -1840,12 +1931,12 @@ msgstr "Plantilla de email de calificación"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_rating_status_period
 msgid "Rating Frequency"
-msgstr ""
+msgstr "Frecuencia de valoración"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_rating_request_deadline
 msgid "Rating Request Deadline"
-msgstr ""
+msgstr "Fecha límite de solicitud de valoración"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_portal_show_rating
@@ -1855,7 +1946,7 @@ msgstr ""
 #. module: project
 #: selection:project.project,rating_status:0
 msgid "Rating when changing stage"
-msgstr ""
+msgstr "Valoración al cambiar de estado"
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_rating
@@ -1866,7 +1957,7 @@ msgstr "Valoraciones"
 #: code:addons/project/models/project.py:418
 #, python-format
 msgid "Ratings of %s"
-msgstr ""
+msgstr "Valoraciones de %s"
 
 #. module: project
 #: model:project.task,legend_done:project.project_task_data_0
@@ -1885,7 +1976,7 @@ msgstr ""
 #: model:project.task.type,legend_done:project.project_stage_data_1
 #: model:project.task.type,legend_done:project.project_stage_data_2
 msgid "Ready for Next Stage"
-msgstr ""
+msgstr "Lista para la siguiente etapa"
 
 #. module: project
 #: selection:report.project.task.user,state:0
@@ -1900,7 +1991,7 @@ msgstr "Id. del hijo de registro"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Record's Colour"
-msgstr ""
+msgstr "Color del registro"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1910,7 +2001,7 @@ msgstr "Rojo"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_type_legend_blocked
 msgid "Red Kanban Label"
-msgstr ""
+msgstr "Etiqueta Kanban roja"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_code
@@ -1972,7 +2063,7 @@ msgstr "Buscar en mensajes"
 #: code:addons/project/controllers/portal.py:95
 #, python-format
 msgid "Search in Stages"
-msgstr ""
+msgstr "Buscar en etapas"
 
 #. module: project
 #. openerp-web
@@ -2074,7 +2165,7 @@ msgstr "Destacado"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_type_legend_priority
 msgid "Starred Explanation"
-msgstr ""
+msgstr "Explicación destacada"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_date_start
@@ -2122,7 +2213,7 @@ msgstr "Etiquetas"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_target_project_id
 msgid "Target Project"
-msgstr ""
+msgstr "Proyecto meta"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -2164,7 +2255,7 @@ msgstr "Tubería de tareas"
 #: model:mail.message.subtype,name:project.mt_project_task_rating
 #: model:mail.message.subtype,name:project.mt_task_rating
 msgid "Task Rating"
-msgstr ""
+msgstr "Valoración de tarea"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_ready
@@ -2267,17 +2358,17 @@ msgstr "Tareas por usuario y proyecto"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_merge_wizard_task_ids
 msgid "Tasks to Merge"
-msgstr ""
+msgstr "Tareas que combinar"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.mail_template_task_merge
 msgid "The following task has been merged into this one:"
-msgstr ""
+msgstr "La siguiente tarea se ha combinado con esta:"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.mail_template_task_merge
 msgid "The following tasks have been merged into this one:"
-msgstr ""
+msgstr "Las siguientes tareas se han combinado con esta:"
 
 #. module: project
 #: model:ir.model.fields,help:project.field_project_project_alias_model_id
@@ -2376,7 +2467,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.view,arch_db:project.mail_template_task_merge
 msgid "This task has been merged into the following task:"
-msgstr ""
+msgstr "Esta tarea se ha fusionado con la siguiente:"
 
 #. module: project
 #. openerp-web
@@ -2461,7 +2552,7 @@ msgstr "Haga seguimiento del tiempo empleado en proyectos y tareas"
 #. module: project
 #: selection:project.project,rating_status_period:0
 msgid "Twice a Month"
-msgstr ""
+msgstr "Dos veces al mes"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -2501,7 +2592,7 @@ msgstr "Usar tareas como"
 #. module: project
 #: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Use collaborative rich text pads on tasks"
-msgstr ""
+msgstr "Usar pads de texto enriquecido colaborativo en las tareas"
 
 #. module: project
 #. openerp-web
@@ -2569,32 +2660,32 @@ msgstr "Horario de trabajo"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_form2
 msgid "Working Time to Assign"
-msgstr ""
+msgstr "Tiempo de trabajo que asignar"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_form2
 msgid "Working Time to Close"
-msgstr ""
+msgstr "Tiempo de trabajo para cierre"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_working_days_open
 msgid "Working days to assign"
-msgstr ""
+msgstr "Días laborables que asignar"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_working_days_close
 msgid "Working days to close"
-msgstr ""
+msgstr "Días laborables para cierre"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_working_hours_open
 msgid "Working hours to assign"
-msgstr ""
+msgstr "Horas laborables que asignar"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_working_hours_close
 msgid "Working hours to close"
-msgstr ""
+msgstr "Horas laborables para cierre"
 
 #. module: project
 #: model:ir.filters,name:project.filter_task_report_workload
@@ -2604,7 +2695,7 @@ msgstr "Carga de trabajo"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_write_date
 msgid "Write Date"
-msgstr ""
+msgstr "Escribir la fecha"
 
 #. module: project
 #: selection:project.project,rating_status_period:0
@@ -2646,6 +2737,9 @@ msgid ""
 "The sub-task's project of the parent task's project should be this task's "
 "project"
 msgstr ""
+"No se puede definir una tarea principal si el proyecto no está correctamente"
+" configurado. El proyecto con las tareas secundarias que pertenece al "
+"proyecto de la tarea principal debería ser proyecto de esta tarea"
 
 #. module: project
 #: code:addons/project/models/project.py:77
@@ -2687,7 +2781,7 @@ msgstr "oe_kanban_text_red"
 #. module: project
 #: model:ir.model,name:project.model_project_task_merge_wizard
 msgid "project.task.merge.wizard"
-msgstr ""
+msgstr "project.task.merge.wizard"
 
 #. module: project
 #: model:ir.model,name:project.model_res_config_settings
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 313fc136160..d7bd70f825d 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Clo <clo@odoo.com>, 2016
 # Simon CARRIER <carrier.sim@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -32,13 +32,14 @@
 # fr rev <e2ffr04@hotmail.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
 # Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -439,7 +440,7 @@ msgstr ""
 msgid ""
 "<span class=\"text-muted\">NB: This will archive the selected tasks (Except "
 "the destination task)</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\"/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -2041,13 +2042,13 @@ msgstr "Chercher dans Tout"
 #: code:addons/project/controllers/portal.py:94
 #, python-format
 msgid "Search in Customer"
-msgstr ""
+msgstr "Rechercher dans Client"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:93
 #, python-format
 msgid "Search in Messages"
-msgstr ""
+msgstr "Rechercher dans Messages"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:95
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 5e0e3a0fb85..f8a1aabcc47 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -207,6 +207,37 @@ msgid ""
 "    </table>\n"
 "</div>\n"
 msgstr ""
+"<div style=\"background:#F0F0F0;color:#515166;padding:10px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/web/binary/company_logo\" style=\"vertical-align:baseline;max-"
+"width:100px;\"/></a></td><td style=\"text-align:right;vertical-"
+"align:middle;\"/></tr></tbody></table><table style=\"width:600px;margin:0px "
+"auto;background:white;border:1px solid #e1e1e1;\"><tbody><tr><td "
+"style=\"padding:15px 20px 10px "
+"20px;\"/></tr><p/><p><strong/><strong/></p></tbody><td style=\"padding:10px "
+"10px;\"><table style=\"width:100%;text-align:center;\"><tr><td><a "
+"href=\"/rating/${access_token}/10\"><img alt=\"Satisfied\" "
+"src=\"/rating/static/src/img/rating_10.png\" "
+"title=\"Satisfied\"/></a></td><td><a href=\"/rating/${access_token}/5\"><img"
+" alt=\"Not satisfied\" src=\"/rating/static/src/img/rating_5.png\" "
+"title=\"Not satisfied\"/></a></td><td><a "
+"href=\"/rating/${access_token}/1\"><img alt=\"Highly Dissatisfied\" "
+"src=\"/rating/static/src/img/rating_1.png\" title=\"Highly "
+"Dissatisfied\"/></a></td></tr></table></td><td style=\"text-"
+"align:center;\"><h2 style=\"font-weight:300;font-size:18px;\"/><div style"
+"=\"text-color: #888888\"/></td><tr><td style=\"padding:10px 20px\"><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\" "
+"summary=\"o_mail_notification\"><tr/><tr/></table></td></tr><tr><td "
+"style=\"padding:15px 20px 10px 20px;\"/></tr></table><p/><table "
+"style=\"width:600px;margin:auto;text-align:center;font-size:12px;\"><tbody "
+"lilt=\"split=0\"><b><p><b/></p><tr lilt=\"split=0\"><td style=\"padding-"
+"top:10px;color:#afafaf;\"><p><b/></p><p><a href=\"https://www.odoo.com/page"
+"/project-management\" style=\"color:#875A7B;text-decoration:none;\" "
+"target=\"_blank\"/><a href=\"${object.project_id.company_id.website}\" "
+"style=\"color:#875A7B;text-"
+"decoration:none;\"/></p></td></tr></b></tbody><tbody lilt=\"split=1\"><tr "
+"lilt=\"split=1\"/></tbody></table></div>"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_report_project_task_user_delay_endings_days
@@ -265,7 +296,7 @@ msgstr "(Un)通过完成相关的任务和解决议题来达成项目的目标�
 msgid ""
 "<b>Assign the task</b> to someone. <i>You can create and invite a new user "
 "on the fly.</i>"
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: project
 #. openerp-web
@@ -287,7 +318,7 @@ msgstr "<b>通过电子邮件</b>邀请同事。<br/> <i>每行发送一个电�
 #: code:addons/project/static/src/js/tour.js:69
 #, python-format
 msgid "<b>Star tasks</b> to mark team priorities."
-msgstr ""
+msgstr "<b/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.rating_index
@@ -307,7 +338,7 @@ msgstr "<i class=\"fa fa-envelope\"/> 邮件:"
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_kanban
 msgid "<i class=\"fa fa-smile-o\"/> No rating yet"
-msgstr ""
+msgstr "<i class=\"fa fa-smile-o\"/>"
 
 #. module: project
 #: code:addons/project/models/project.py:126
@@ -342,7 +373,7 @@ msgstr ""
 msgid ""
 "<span class=\"text-muted\">NB: This will archive the selected tasks (Except "
 "the destination task)</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\"/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -431,7 +462,7 @@ msgstr "添加描述"
 msgid ""
 "Add columns to configure <b>stages for your tasks</b>.<br/><i>e.g. "
 "Specification &gt; Development &gt; Done</i>"
-msgstr ""
+msgstr "<b/><br/><i/>"
 
 #. module: project
 #: model:project.task.type,name:project.project_stage_data_2
@@ -619,7 +650,7 @@ msgstr "取消"
 msgid ""
 "Choose a <b>project name</b>. (e.g. Website Launch, Product Development, "
 "Office Party, etc.)"
-msgstr ""
+msgstr "<b/>"
 
 #. module: project
 #. openerp-web
@@ -1474,7 +1505,7 @@ msgstr "便签"
 #: code:addons/project/static/src/js/tour.js:42
 #, python-format
 msgid "Now that the project is set up, <b>create a few tasks</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: project
 #: model:ir.model.fields,help:project.field_report_project_task_user_working_days_open
@@ -1869,19 +1900,19 @@ msgstr "搜索项目"
 #: code:addons/project/controllers/portal.py:96
 #, python-format
 msgid "Search in All"
-msgstr ""
+msgstr "在全部范围内搜索"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:94
 #, python-format
 msgid "Search in Customer"
-msgstr ""
+msgstr "在客户中搜索"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:93
 #, python-format
 msgid "Search in Messages"
-msgstr ""
+msgstr "在消息中搜索"
 
 #. module: project
 #: code:addons/project/controllers/portal.py:95
@@ -2398,7 +2429,7 @@ msgstr ""
 #: code:addons/project/static/src/js/tour.js:100
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to your tasks pipeline</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
@@ -2430,7 +2461,7 @@ msgstr "关注中客户可见"
 #, python-format
 msgid ""
 "Want a better way to <b>manage your projects</b>? <i>It starts here.</i>"
-msgstr ""
+msgstr "<i/><b/>"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task_email_cc
diff --git a/addons/project_timesheet_holidays/i18n/es.po b/addons/project_timesheet_holidays/i18n/es.po
index 9f32a37d002..94069cdddbf 100644
--- a/addons/project_timesheet_holidays/i18n/es.po
+++ b/addons/project_timesheet_holidays/i18n/es.po
@@ -3,16 +3,17 @@
 # * project_timesheet_holidays
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # Gelo Joga Landoo <gj@landoo.es>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -40,6 +41,8 @@ msgstr "Compañías"
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
 msgid "Default project value for timesheet generated from leave type."
 msgstr ""
+"Valor de proyecto predeterminado para parte de horas generado a partir de "
+"tipo de permiso."
 
 #. module: project_timesheet_holidays
 #: code:addons/project_timesheet_holidays/models/hr_holidays.py:30
@@ -48,11 +51,13 @@ msgid ""
 "For the leaves to generate timesheet, the internal project and task are "
 "requried."
 msgstr ""
+"Las licencias requieren tareas y proyectos internos para poder generar "
+"partes de horas."
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
 msgid "Generate Timesheet"
-msgstr ""
+msgstr "Generar parte de horas"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
@@ -60,6 +65,8 @@ msgid ""
 "If checked, when validating a leave, timesheet will be generated in the "
 "Vacation Project of the company."
 msgstr ""
+"Si se encuentra marcado, al validar un permiso, el parte de horas se "
+"generará en el Proyecto de vacaciones de la empresa."
 
 #. module: project_timesheet_holidays
 #: code:addons/project_timesheet_holidays/models/res_company.py:30
@@ -68,12 +75,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_project_id
 #, python-format
 msgid "Internal Project"
-msgstr ""
+msgstr "Proyecto interno"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_task_id
 msgid "Internal Task for timesheet"
-msgstr ""
+msgstr "Tarea interna para parte de horas"
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_holidays
@@ -89,7 +96,7 @@ msgstr "Petición de ausencia"
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id
 #: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_config_settings_leave_timesheet_task_id
 msgid "Leave Task"
-msgstr ""
+msgstr "Tarea de permiso"
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_hr_holidays_status
@@ -117,6 +124,7 @@ msgstr "Tarea"
 msgid ""
 "The project will contain the timesheet generated when a leave is validated."
 msgstr ""
+"El proyecto contendrá el parte de horas generado al validarse un permiso."
 
 #. module: project_timesheet_holidays
 #: model:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
@@ -130,6 +138,8 @@ msgid ""
 "You cannot delete timesheet lines attached to a leaves. Please cancel the "
 "leaves instead."
 msgstr ""
+"No puede eliminar líneas de los partes de horas adjuntos a los permisos. "
+"Cancele los permisos en su lugar."
 
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index a3186daac89..0bd06a2033b 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -3,14 +3,14 @@
 # * purchase
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
 # Glen Sojo <inactive+glen.sojo@transifex.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
@@ -31,13 +31,14 @@
 # Fernando San Martín Woerner <fsnmartin@gmail.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Eric Antones <eantones@users.noreply.github.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Eric Antones <eantones@users.noreply.github.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -458,6 +459,8 @@ msgid ""
 "A sale order that generated this purchase order has been deleted. Check if "
 "an action is needed."
 msgstr ""
+"Se ha eliminado una orden de venta que generó esta orden de compra. "
+"Verifique si es necesario realizar alguna acción."
 
 #. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_order_line_product_type
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 2703757f2e8..d345852e5dc 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -963,22 +963,8 @@ class ProcurementRule(models.Model):
         for line in po.order_line:
             if line.product_id == product_id and line.product_uom == product_id.uom_po_id:
                 if line._merge_in_existing_line(product_id, product_qty, product_uom, location_id, name, origin, values):
-                    procurement_uom_po_qty = product_uom._compute_quantity(product_qty, product_id.uom_po_id)
-                    seller = product_id._select_seller(
-                        partner_id=partner,
-                        quantity=line.product_qty + procurement_uom_po_qty,
-                        date=po.date_order and po.date_order[:10],
-                        uom_id=product_id.uom_po_id)
-
-                    price_unit = self.env['account.tax']._fix_tax_included_price_company(seller.price, line.product_id.supplier_taxes_id, line.taxes_id, values['company_id']) if seller else 0.0
-                    if price_unit and seller and po.currency_id and seller.currency_id != po.currency_id:
-                        price_unit = seller.currency_id.compute(price_unit, po.currency_id)
-
-                    po_line = line.write({
-                        'product_qty': line.product_qty + procurement_uom_po_qty,
-                        'price_unit': price_unit,
-                        'move_dest_ids': [(4, x.id) for x in values.get('move_dest_ids', [])]
-                    })
+                    vals = self._update_purchase_order_line(product_id, product_qty, product_uom, values, line, partner)
+                    po_line = line.write(vals)
                     break
         if not po_line:
             vals = self._prepare_purchase_order_line(product_id, product_qty, product_uom, values, po, partner)
@@ -1002,6 +988,24 @@ class ProcurementRule(models.Model):
 
         return schedule_date - relativedelta(days=int(seller.delay))
 
+    def _update_purchase_order_line(self, product_id, product_qty, product_uom, values, line, partner):
+        procurement_uom_po_qty = product_uom._compute_quantity(product_qty, product_id.uom_po_id)
+        seller = product_id._select_seller(
+            partner_id=partner,
+            quantity=line.product_qty + procurement_uom_po_qty,
+            date=line.order_id.date_order and line.order_id.date_order[:10],
+            uom_id=product_id.uom_po_id)
+
+        price_unit = self.env['account.tax']._fix_tax_included_price_company(seller.price, line.product_id.supplier_taxes_id, line.taxes_id, values['company_id']) if seller else 0.0
+        if price_unit and seller and line.order_id.currency_id and seller.currency_id != line.order_id.currency_id:
+            price_unit = seller.currency_id.compute(price_unit, line.order_id.currency_id)
+
+        return {
+            'product_qty': line.product_qty + procurement_uom_po_qty,
+            'price_unit': price_unit,
+            'move_dest_ids': [(4, x.id) for x in values.get('move_dest_ids', [])]
+        }
+
     @api.multi
     def _prepare_purchase_order_line(self, product_id, product_qty, product_uom, values, po, partner):
         procurement_uom_po_qty = product_uom._compute_quantity(product_qty, product_id.uom_po_id)
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index c28b616ec5f..d482a710a98 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/i18n/es.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # oihane <oihanecruce@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -14,7 +14,7 @@
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # David Perez <david@closemarketing.es>, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
@@ -22,13 +22,14 @@
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Miguel Orueta <mo@landoo.es>, 2016
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -234,7 +235,7 @@ msgstr "Hecho"
 #. module: purchase_requisition
 #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_move_dest_id
 msgid "Downstream Move"
-msgstr ""
+msgstr "Movimiento de salida"
 
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py
index 859c0c340ea..722facea3f7 100644
--- a/addons/purchase_requisition/models/purchase_requisition.py
+++ b/addons/purchase_requisition/models/purchase_requisition.py
@@ -83,16 +83,6 @@ class PurchaseRequisition(models.Model):
     def _set_state(self):
         self.state_blanket_order = self.state
 
-    @api.model
-    def create(self, vals):
-        rec = super(PurchaseRequisition, self).create(vals)
-        if rec.name == 'New':
-            if rec.is_quantity_copy != 'none':
-                rec.name = self.env['ir.sequence'].next_by_code('purchase.requisition.purchase.tender')
-            else:
-                rec.name = self.env['ir.sequence'].next_by_code('purchase.requisition.blanket.order')
-        return rec
-
     @api.onchange('vendor_id')
     def _onchange_vendor(self):
         requisitions = self.env['purchase.requisition'].search([
@@ -102,7 +92,7 @@ class PurchaseRequisition(models.Model):
         ])
         if any(requisitions):
             title = _("Warning for %s") % self.vendor_id.name
-            message = _("%s has already an ongoing blanket order") % self.vendor_id.name
+            message = _("There is already an open blanket order for this supplier. We suggest you to use to complete this open blanket order instead of creating a new one.")
             warning = {
                 'title': title,
                 'message': message
@@ -128,26 +118,33 @@ class PurchaseRequisition(models.Model):
 
     @api.multi
     def action_in_progress(self):
+        self.ensure_one()
         if not all(obj.line_ids for obj in self):
             raise UserError(_('You cannot confirm agreement because there is no product line.'))
-        for requisition in self:
-            if requisition.type_id.quantity_copy == 'none' and requisition.vendor_id:
-                for requisition_line in requisition.line_ids:
-                    if requisition_line.price_unit <= 0.0:
-                        raise UserError(_('You cannot confirm the blanket order without price.'))
-                    if requisition_line.product_qty <= 0.0:
-                        raise UserError(_('You cannot confirm the blanket order without quantity.'))
-                    requisition_line.create_supplier_info()
-                self.write({'state': 'ongoing'})
+        if self.type_id.quantity_copy == 'none' and self.vendor_id:
+            for requisition_line in self.line_ids:
+                if requisition_line.price_unit <= 0.0:
+                    raise UserError(_('You cannot confirm the blanket order without price.'))
+                if requisition_line.product_qty <= 0.0:
+                    raise UserError(_('You cannot confirm the blanket order without quantity.'))
+                requisition_line.create_supplier_info()
+            self.write({'state': 'ongoing'})
+        else:
+            self.write({'state': 'in_progress'})
+        # Set the sequence number regarding the requisition type
+        if self.name == 'New':
+            if self.is_quantity_copy != 'none':
+                self.name = self.env['ir.sequence'].next_by_code('purchase.requisition.purchase.tender')
             else:
-                self.write({'state': 'in_progress'})
+                self.name = self.env['ir.sequence'].next_by_code('purchase.requisition.blanket.order')
 
     @api.multi
     def action_open(self):
         self.write({'state': 'open'})
 
-    @api.multi
     def action_draft(self):
+        self.ensure_one()
+        self.name = 'New'
         self.write({'state': 'draft'})
 
     @api.multi
@@ -180,7 +177,7 @@ class PurchaseRequisition(models.Model):
         if any(requisition.state not in ('draft', 'cancel') for requisition in self):
             raise UserError(_('You can only delete draft requisitions.'))
         # Draft requisitions could have some requisition lines.
-        self.mapped('requisition_line_ids').unlink()
+        self.mapped('line_ids').unlink()
         return super(PurchaseRequisition, self).unlink()
 
 class SupplierInfo(models.Model):
@@ -218,12 +215,16 @@ class PurchaseRequisitionLine(models.Model):
             ])
             if not [s.requisition_id for s in supplier_infos]:
                 res.create_supplier_info()
+            if vals['price_unit'] <= 0.0:
+                raise UserError(_('You cannot confirm the blanket order without price.'))
         return res
 
     @api.multi
     def write(self, vals):
         res = super(PurchaseRequisitionLine, self).write(vals)
         if 'price_unit' in vals:
+            if vals['price_unit'] <= 0.0:
+                raise UserError(_('You cannot confirm the blanket order without price.'))
             # If the price is updated, we have to update the related SupplierInfo
             self.supplier_info_ids.write({'price': vals['price_unit']})
         return res
diff --git a/addons/rating/i18n/es.po b/addons/rating/i18n/es.po
index 8ac54e937ca..d10dc69ff5d 100644
--- a/addons/rating/i18n/es.po
+++ b/addons/rating/i18n/es.po
@@ -7,7 +7,7 @@
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
@@ -19,13 +19,14 @@
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2017
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: RGB Consulting <odoo@rgbconsulting.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,11 +40,13 @@ msgid ""
 "<br/>\n"
 "                            on our services on \""
 msgstr ""
+"<br/>\n"
+" en nuestros servicios en \""
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_form
 msgid "<span class=\"o_stat_text\">Resource</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Recurso</span>"
 
 #. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_access_token
@@ -113,17 +116,17 @@ msgstr "Hilo de mensajes"
 #. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_consumed
 msgid "Enabled if the rating has been filled."
-msgstr ""
+msgstr "Habilitado si la valoración ha sido introducida."
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_consumed
 msgid "Filled Rating"
-msgstr ""
+msgstr "Valoración introducida"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_view
 msgid "Go to our website"
-msgstr ""
+msgstr "Ir a nuestro sitio web"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
@@ -134,7 +137,7 @@ msgstr "Agrupar por"
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 #: selection:rating.rating,rating_text:0
 msgid "Highly dissatisfied"
-msgstr ""
+msgstr "Altamente insatisfecho"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_id
@@ -196,48 +199,48 @@ msgstr "Mis calificaciones"
 #. module: rating
 #: selection:rating.rating,rating_text:0
 msgid "No Rating yet"
-msgstr ""
+msgstr "Sin valoración aun"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 #: selection:rating.rating,rating_text:0
 msgid "Not satisfied"
-msgstr ""
+msgstr "No Satisfecho"
 
 #. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_rated_partner_id
 msgid "Owner of the rated resource"
-msgstr ""
+msgstr "Propietario del recurso valorado"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_id
 msgid "Parent Document"
-msgstr ""
+msgstr "Documento matriz"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_model
 msgid "Parent Document Model"
-msgstr ""
+msgstr "Modelo de documento matriz"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_name
 msgid "Parent Document Name"
-msgstr ""
+msgstr "Nombre de documento matriz"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_parent_res_model_id
 msgid "Parent Related Document Model"
-msgstr ""
+msgstr "Modelo de documento matriz relacionado"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 msgid "Rated User"
-msgstr ""
+msgstr "Usuario valorado"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_rated_partner_id
 msgid "Rated person"
-msgstr ""
+msgstr "Persona valorada"
 
 #. module: rating
 #: model:ir.actions.act_window,name:rating.action_view_rating
@@ -266,7 +269,7 @@ msgstr "Calificación media"
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_last_feedback
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_feedback
 msgid "Rating Last Feedback"
-msgstr ""
+msgstr "Valoración del último comentario"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_image
@@ -274,7 +277,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rating.field_project_task_rating_last_image
 #: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_image
 msgid "Rating Last Image"
-msgstr ""
+msgstr "Valoración de la última imagen"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_value
@@ -295,7 +298,7 @@ msgstr "Calificación Mixin"
 #: model:ir.model.fields,field_description:rating.field_mail_message_rating_value
 #: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message_rating_value
 msgid "Rating Value"
-msgstr ""
+msgstr "Valoración del valor"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_count
@@ -308,7 +311,7 @@ msgstr "Clasificar conteo"
 #. module: rating
 #: sql_constraint:rating.rating:0
 msgid "Rating should be between 0 to 10"
-msgstr ""
+msgstr "La valoración ha de comprender entre 0 y 10"
 
 #. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_rating
@@ -340,7 +343,7 @@ msgstr "Modelo de documento relacionado"
 #: model:ir.model.fields,field_description:rating.field_mail_message_rating_ids
 #: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message_rating_ids
 msgid "Related ratings"
-msgstr ""
+msgstr "Valoraciones relacionadas"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
@@ -350,13 +353,13 @@ msgstr "Recurso"
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_res_name
 msgid "Resource name"
-msgstr ""
+msgstr "Nombre del recurso"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
 #: selection:rating.rating,rating_text:0
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfecho"
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating_access_token
@@ -366,23 +369,23 @@ msgstr "Token de seguridad"
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
 msgid "Send Feedback"
-msgstr ""
+msgstr "Enviar comentarios"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_form
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_tree
 msgid "Submitted on"
-msgstr ""
+msgstr "Enviados a fecha de"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
 msgid "Thanks! We appreciate your feedback."
-msgstr ""
+msgstr "¡Gracias! Agradecemos sus comentarios."
 
 #. module: rating
 #: model:ir.model.fields,help:rating.field_rating_rating_res_name
 msgid "The name of the rated resource."
-msgstr ""
+msgstr "El nombre del recurso valorado."
 
 #. module: rating
 #: model:ir.actions.act_window,help:rating.action_view_rating
@@ -392,12 +395,12 @@ msgstr "No hay calificación de momento para este objeto"
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_view
 msgid "We appreciate your feedback!"
-msgstr ""
+msgstr "¡Agradecemos sus comentarios!"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
 msgid "Would be great if you can provide more information:"
-msgstr ""
+msgstr "Sería fantástico si pudiera proporcionar más información:"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_search
@@ -407,7 +410,7 @@ msgstr "Año"
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
 msgid "Your rating has been submitted."
-msgstr ""
+msgstr "Su valoración ha sido enviada."
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
@@ -424,13 +427,13 @@ msgstr "para"
 #: code:addons/rating/controllers/main.py:21
 #, python-format
 msgid "highly dissatisfied"
-msgstr ""
+msgstr "altamente insatisfecho"
 
 #. module: rating
 #: code:addons/rating/controllers/main.py:20
 #, python-format
 msgid "not satisfied"
-msgstr ""
+msgstr "no satisfecho"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban
@@ -441,9 +444,9 @@ msgstr "de"
 #: code:addons/rating/controllers/main.py:22
 #, python-format
 msgid "satisfied"
-msgstr ""
+msgstr "satisfecho"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_external_page_submit
 msgid "you are"
-msgstr ""
+msgstr "Vd. está"
diff --git a/addons/rating/i18n/zh_CN.po b/addons/rating/i18n/zh_CN.po
index b3cfbcede0c..5a14360e635 100644
--- a/addons/rating/i18n/zh_CN.po
+++ b/addons/rating/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # Eddie Lim <bhweelim@yahoo.com>, 2017
 # Martin Trigaux, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -27,7 +28,7 @@ msgstr ""
 msgid ""
 "<br/>\n"
 "                            on our services on \""
-msgstr ""
+msgstr "<br/>"
 
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_form
@@ -405,7 +406,7 @@ msgstr "by"
 #. module: rating
 #: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban
 msgid "for"
-msgstr ""
+msgstr "由于"
 
 #. module: rating
 #: code:addons/rating/controllers/main.py:21
diff --git a/addons/repair/i18n/de.po b/addons/repair/i18n/de.po
index 0f4879453a7..c0d5b20ad53 100644
--- a/addons/repair/i18n/de.po
+++ b/addons/repair/i18n/de.po
@@ -49,6 +49,7 @@ msgstr "${(object.name or '').replace('/','_')}"
 #: model:mail.template,subject:mrp_repair.mail_template_mrp_repair_quotation
 msgid "${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.partner_id.name} Reparaturaufträge (Ref ${object.name or 'n/a' })"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -70,6 +71,12 @@ msgid ""
 "* The 'Done' status is set when repairing is completed.\n"
 "* The 'Cancelled' status is used when user cancel repair order."
 msgstr ""
+"* Der Status „Entwurf“ wird verwendet, wenn ein Benutzer einen neuen und unbestätigten Reparaturauftrag kodiert.\n"
+"* Der Status „Bestätigt“ wird verwendet, wenn ein Benutzer den Reparaturauftrag bestätigt.\n"
+"* Der Status „Bereit zur Reparatur“ wird verwendet, um mit der Reparatur zu beginnen, der Benutzer kann erst reparieren, wenn der Reparaturauftrag bestätigt wurde.\n"
+"* Der Status „Abrechenbar“ wird verwendet, um vor oder nach der Reparatur die Rechnung zu erstellen.\n"
+"* Der Status „Erledigt“ wird eingestellt, wenn die Reparatur abgeschlossen ist.\n"
+"* Der Status „Storniert“ wird verwendet, wenn Reparaturaufträge von Benutzern storniert werden."
 
 #. module: mrp_repair
 #: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
@@ -286,7 +293,7 @@ msgstr "Kunde"
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
 msgid "Default Address"
-msgstr ""
+msgstr "Standard-Adresse"
 
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_address_id
@@ -397,6 +404,9 @@ msgid ""
 "                add or replace and record the time you spent on the different\n"
 "                operations."
 msgstr ""
+"In einem Reparaturauftrag können Sie die Komponenten, die Sie entfernen, \n"
+" hinzufügen oder ersetzen, einzeln aufführen und die Zeit, die Sie für die verschiedenen\n"
+" Vorgänge gebraucht haben, aufzeichnen."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:215
@@ -584,7 +594,7 @@ msgstr "Partner"
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Parts"
-msgstr ""
+msgstr "Teile"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -604,7 +614,7 @@ msgstr "Preisliste des ausgewählten Partners"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Print Quotation"
-msgstr ""
+msgstr "Angebot drucken"
 
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_product_id
@@ -746,6 +756,8 @@ msgstr "Reparaturen müssen vor Beginn der Reparatur bestätigt werden."
 #, python-format
 msgid "Repair must be repaired in order to make the product moves."
 msgstr ""
+"Die Reparaturen müssen repariert werden, um die Produktschritte zu "
+"vollziehen."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:419
@@ -802,7 +814,7 @@ msgstr ""
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Send Quotation"
-msgstr ""
+msgstr "Angebot senden"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:540
@@ -884,6 +896,9 @@ msgid ""
 "                order to know if whether the repair should be invoiced to the\n"
 "                customer or not."
 msgstr ""
+"Der Reparaturauftrag verwendet das Garantiedatum auf der Seriennummer,\n"
+" um festzustellen, ob die Reparatur dem Kunden\n"
+" in Rechnung gestellt werden soll oder nicht."
 
 #. module: mrp_repair
 #: model:ir.model.fields,help:mrp_repair.field_mrp_repair_line_state
@@ -891,6 +906,8 @@ msgid ""
 "The status of a repair line is set automatically to the one of the linked "
 "repair order."
 msgstr ""
+"Der Status einer Reparaturposition wird automatisch auf die mit dem "
+"Reparaturauftrag verbundene Position festgelegt."
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair
@@ -989,6 +1006,8 @@ msgid ""
 "You have to select a pricelist in the Repair form !\n"
 " Please set one before choosing a product."
 msgstr ""
+"Sie müssen eine Preisliste im Reparaturformular auswählen! \n"
+" Bitte wählen Sie eine Preisliste bei der Reparatur aus.Bitte tragen Sie einen Wert vor Ihrer Auswahl ein."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_stock_traceability_report
@@ -998,4 +1017,4 @@ msgstr "stock.traceability.report"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_stock_warn_insufficient_qty_repair
 msgid "stock.warn.insufficient.qty.repair"
-msgstr ""
+msgstr "stock.warn.insufficient.qty.repair"
diff --git a/addons/repair/i18n/fr.po b/addons/repair/i18n/fr.po
index 94b4330c7e5..15343288c26 100644
--- a/addons/repair/i18n/fr.po
+++ b/addons/repair/i18n/fr.po
@@ -48,6 +48,7 @@ msgstr "${(object.name or '').replace('/','_')}"
 #: model:mail.template,subject:mrp_repair.mail_template_mrp_repair_quotation
 msgid "${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -69,6 +70,12 @@ msgid ""
 "* The 'Done' status is set when repairing is completed.\n"
 "* The 'Cancelled' status is used when user cancel repair order."
 msgstr ""
+"* L'état « Brouillon » est utilisé lorsqu'un utilisateur saisit un nouvel ordre de réparation qui n'a pas encore été confirmé.\n"
+"* L'état « Confirmé » est utilisé lorsqu'un utilisateur confirme l'ordre de réparation.\n"
+"* L'état « Prêt à réparer » est utilisé pour démarrer la réparation. Un utilisateur peut uniquement démarrer la réparation si l'ordre a été confirmé.\n"
+"* L'état « À facturer » est utilisé pour générer la facture avant ou après la réparation.\n"
+"* L'état « Terminé » est défini une fois la réparation terminée.\n"
+"* L'état « Annulé » est utilisé lorsqu'un utilisateur annule un ordre de réparation."
 
 #. module: mrp_repair
 #: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
@@ -170,7 +177,7 @@ msgstr "Avant la réparation"
 #: code:addons/mrp_repair/models/mrp_repair.py:237
 #, python-format
 msgid "Can only confirm draft repairs."
-msgstr ""
+msgstr "Seules les réparations à l'état de brouillon peuvent être confirmées."
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair
@@ -199,7 +206,7 @@ msgstr "Annulé"
 #: code:addons/mrp_repair/models/mrp_repair.py:249
 #, python-format
 msgid "Cannot cancel completed repairs."
-msgstr ""
+msgstr "Impossible d'annuler une réparation terminée."
 
 #. module: mrp_repair
 #: model:ir.model.fields,help:mrp_repair.field_mrp_repair_partner_id
@@ -285,7 +292,7 @@ msgstr "Client"
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
 msgid "Default Address"
-msgstr ""
+msgstr "Adresse par défaut"
 
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_address_id
@@ -586,7 +593,7 @@ msgstr "Partenaire"
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Parts"
-msgstr ""
+msgstr "Pièces"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -606,7 +613,7 @@ msgstr "Liste de prix du partenaire sélectionné."
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Print Quotation"
-msgstr ""
+msgstr "Imprimer le devis"
 
 #. module: mrp_repair
 #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_product_id
@@ -735,24 +742,25 @@ msgstr "Référence de la réparation"
 #, python-format
 msgid "Repair must be canceled in order to reset it to draft."
 msgstr ""
+"La réparation doit être annulée pour la rétablir à l'état de brouillon."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:408
 #, python-format
 msgid "Repair must be confirmed before starting reparation."
-msgstr ""
+msgstr "La réparation doit être confirmée avant de démarrer la réparation."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:436
 #, python-format
 msgid "Repair must be repaired in order to make the product moves."
-msgstr ""
+msgstr "La réparation doit être terminée pour déplacer le produit."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:419
 #, python-format
 msgid "Repair must be under repair in order to end reparation."
-msgstr ""
+msgstr "La réparation doit être en cours pour pouvoir y mettre fin."
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:251
@@ -786,7 +794,7 @@ msgstr "Commande de réparation"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
 msgid "Search Repair Orders"
-msgstr ""
+msgstr "Rechercher un ordre de réparation"
 
 #. module: mrp_repair
 #: model:ir.model.fields,help:mrp_repair.field_mrp_repair_invoice_method
@@ -803,7 +811,7 @@ msgstr ""
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
 msgid "Send Quotation"
-msgstr ""
+msgstr "Envoyer le devis"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/models/mrp_repair.py:540
@@ -897,6 +905,8 @@ msgid ""
 "The status of a repair line is set automatically to the one of the linked "
 "repair order."
 msgstr ""
+"L'état d'une ligne de réparation est automatiquement défini sur l'état de "
+"l'ordre de réparation associé."
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair
@@ -996,6 +1006,8 @@ msgid ""
 "You have to select a pricelist in the Repair form !\n"
 " Please set one before choosing a product."
 msgstr ""
+"Vous devez sélectionnez une liste de prix dans le formulaire de réparation.\n"
+" Sélectionnez-en une avant de choisir un produit."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_stock_traceability_report
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index 29c6debd79b..0555bceaae6 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -3,24 +3,25 @@
 # * report_intrastat
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
+# Renzo Meister, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
+# Dejan Dinic, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Gab_Odoo <gab@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -320,7 +321,7 @@ msgstr "Lieferantenrechnung"
 #. module: report_intrastat
 #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
 msgid "Vendor Credit Note"
-msgstr ""
+msgstr "Lieferanten-Gutschrift"
 
 #. module: report_intrastat
 #: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_weight
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index c439a79707e..f3064538919 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -5,7 +5,7 @@
 # Translators:
 # oihane <oihanecruce@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
@@ -16,15 +16,16 @@
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -93,7 +94,7 @@ msgstr "Día de la semana"
 #: model:ir.model.fields,field_description:resource.field_res_company_resource_calendar_id
 #: model:ir.model.fields,field_description:resource.field_res_users_resource_calendar_id
 msgid "Default Working Hours"
-msgstr ""
+msgstr "Jornada predeterminada"
 
 #. module: resource
 #: model:ir.model.fields,help:resource.field_hr_employee_resource_calendar_id
@@ -152,19 +153,19 @@ msgstr "Viernes"
 #: code:addons/resource/models/resource.py:74
 #, python-format
 msgid "Friday Evening"
-msgstr ""
+msgstr "Viernes por la noche"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:73
 #, python-format
 msgid "Friday Morning"
-msgstr ""
+msgstr "Viernes por la mañana"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_global_leave_ids
 #: model:ir.ui.view,arch_db:resource.resource_calendar_form
 msgid "Global Leaves"
-msgstr ""
+msgstr "Permisos globales"
 
 #. module: resource
 #: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search
@@ -275,13 +276,13 @@ msgstr "Lunes"
 #: code:addons/resource/models/resource.py:66
 #, python-format
 msgid "Monday Evening"
-msgstr ""
+msgstr "Lunes por la noche"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:65
 #, python-format
 msgid "Monday Morning"
-msgstr ""
+msgstr "Lunes por la mañana"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_name
@@ -337,7 +338,7 @@ msgstr "Ausencias de recursos"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_mixin
 msgid "Resource Mixin"
-msgstr ""
+msgstr "Mixin de recursos"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_resource_resource_type
@@ -400,7 +401,7 @@ msgstr "Buscar horario de trabajo"
 #: code:addons/resource/models/res_company.py:23
 #, python-format
 msgid "Standard 40 hours/week"
-msgstr ""
+msgstr "Estándar de 40 horas a la semana"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_date_from
@@ -430,7 +431,7 @@ msgstr "Domingo"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_test
 msgid "Test Resource Model"
-msgstr ""
+msgstr "Modelo de recursos de prueba"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:689
@@ -447,6 +448,11 @@ msgid ""
 "the efficiency factor is 200%, however the expected duration will be 30 "
 "minutes."
 msgstr ""
+"Este campo se utiliza para calcular la duración prevista de una orden de "
+"trabajo en este centro de trabajo. Por ejemplo, si una orden de trabajo "
+"tiene una duración de una hora y el factor de eficiencia es del 100%, la "
+"duración prevista será de una hora. Si el factor de eficiencia es del 200%, "
+"la duración prevista será, sin embargo, de 30 minutos."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -457,18 +463,18 @@ msgstr "Jueves"
 #: code:addons/resource/models/resource.py:72
 #, python-format
 msgid "Thursday Evening"
-msgstr ""
+msgstr "Jueves por la noche"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:71
 #, python-format
 msgid "Thursday Morning"
-msgstr ""
+msgstr "Jueves por la mañana"
 
 #. module: resource
 #: sql_constraint:resource.resource:0
 msgid "Time efficiency must be strictly positive"
-msgstr ""
+msgstr "La eficiencia temporal ha de ser estrictamente positiva"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_tz
@@ -481,6 +487,8 @@ msgid ""
 "Timezone used when encoding the leave. It is used to correctlylocalize leave"
 " hours when computing time intervals."
 msgstr ""
+"Huso horario empleado al codificar el permiso. Se utiliza para localizar "
+"debidamente las horas de permiso al computar intervalos de tiempo."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -491,13 +499,13 @@ msgstr "Martes"
 #: code:addons/resource/models/resource.py:68
 #, python-format
 msgid "Tuesday Evening"
-msgstr ""
+msgstr "Martes por la noche"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:67
 #, python-format
 msgid "Tuesday Morning"
-msgstr ""
+msgstr "Martes por la mañana"
 
 #. module: resource
 #: model:ir.ui.view,arch_db:resource.view_resource_resource_search
@@ -524,13 +532,13 @@ msgstr "Miércoles"
 #: code:addons/resource/models/resource.py:70
 #, python-format
 msgid "Wednesday Evening"
-msgstr ""
+msgstr "Miércoles por la noche"
 
 #. module: resource
 #: code:addons/resource/models/resource.py:69
 #, python-format
 msgid "Wednesday Morning"
-msgstr ""
+msgstr "Miércoles por la mañana"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
@@ -540,7 +548,7 @@ msgstr "Detalle del trabajo"
 #. module: resource
 #: model:ir.ui.view,arch_db:resource.resource_calendar_form
 msgid "Work Resources"
-msgstr ""
+msgstr "Recursos laborales"
 
 #. module: resource
 #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_hour_from
@@ -567,7 +575,7 @@ msgstr "Horas laborales"
 #: code:addons/resource/models/resource.py:60
 #, python-format
 msgid "Working Hours of %s"
-msgstr ""
+msgstr "Jornada de %s"
 
 #. module: resource
 #: model:ir.ui.view,arch_db:resource.view_resource_resource_search
diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py
index 4ea97383cc9..c33e7b79860 100644
--- a/addons/sale/controllers/portal.py
+++ b/addons/sale/controllers/portal.py
@@ -57,7 +57,7 @@ class CustomerPortal(CustomerPortal):
         if access_token:
             values['no_breadcrumbs'] = True
             values['access_token'] = access_token
-        values['portal_confirmation'] = request.env['ir.config_parameter'].sudo().get_param('sale.sale_portal_confirmation_options', default='none')
+        values['portal_confirmation'] = order.get_portal_confirmation_action()
 
         if kwargs.get('error'):
             values['error'] = kwargs['error']
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 97711999f5b..46801aa2931 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Alexander Klockhaus <a.klockhaus@gmail.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
@@ -23,20 +23,21 @@
 # Henry Mineehen <info@mineehen.de>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # Pascal <paesce@gentlemansclub.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Markus Wernersbach <inactive+wernersbacher@transifex.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Markus Wernersbach <inactive+wernersbacher@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,6 +94,13 @@ msgid ""
 "% endif\n"
 "</p>\n"
 msgstr ""
+"<p/><p lilt=\"split=2\"/><p lilt=\"split=3\"><i/></p><p "
+"lilt=\"split=0\"><strong/><p "
+"lilt=\"split=1\"><strong/></p><br/><br/></p><center><a "
+"class=\"o_default_snippet_text\" href=\"${access_url}\" style=\"background-"
+"color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-"
+"radius: 5px; font-size: 16px;\"/><br/><br/><br/><span "
+"style=\"color:#888888\"/></center><br/><p/><p/><p style=\"color:#888888;\"/>"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_product_product_sales_count
@@ -157,7 +165,7 @@ msgstr "&amp;nbsp;"
 #: model:ir.ui.view,arch_db:sale.portal_order_page
 #: model:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "&amp;nbsp;<span>on</span>&amp;nbsp;"
-msgstr ""
+msgstr "<span/>"
 
 #. module: sale
 #: model:mail.template,body_html:sale.mail_template_data_notification_email_sale_order
@@ -235,16 +243,46 @@ msgid ""
 "                </html>\n"
 "            "
 msgstr ""
+"<html><head></head><body style=\"margin: 0; padding: 0;\"><table "
+"border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" "
+"style=\"padding: 20px; background-color: #ededed; border-"
+"collapse:separate;\" summary=\"o_mail_notification\"><tbody><!-- HEADER "
+"--><tr><td align=\"center\" style=\"min-width: 590px;\"><table width=\"590\""
+" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: "
+"590px; background-color: rgb(135,90,123); padding: 20px; border-"
+"collapse:separate;\"><tr><td valign=\"middle\"><span style=\"font-size:20px;"
+" color:white; font-weight: bold;\"></span></td><td valign=\"middle\" "
+"align=\"right\"><img src=\"/logo.png?company=${company.id}\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" "
+"alt=\"${company.name}\"></td></tr></table></td></tr><!-- CONTENT --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"590\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px;"
+" background-color: rgb(255, 255, 255); padding: 20px; border-"
+"collapse:separate;\"><tbody><td valign=\"top\" style=\"font-"
+"family:Arial,Helvetica,sans-serif; color: #555; font-size: "
+"14px;\"></td></tbody></table></td></tr><!-- FOOTER --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"590\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px;"
+" background-color: rgb(135,90,123); padding: 20px; border-"
+"collapse:separate;\"><tr><td valign=\"middle\" align=\"left\" style=\"color:"
+" #fff; padding-top: 10px; padding-bottom: 10px; font-size: "
+"12px;\"><br/></td><td valign=\"middle\" align=\"right\" style=\"color: #fff;"
+" padding-top: 10px; padding-bottom: 10px; font-size: 12px;\"><a "
+"href=\"mailto:${company.email}\" style=\"text-decoration:none; color: "
+"white;\"></a><br/><a href=\"${company.website}\" style=\"text-"
+"decoration:none; color: white;\"></a></td></tr></table></td></tr><tr><td "
+"align=\"center\"><a target=\"_blank\" "
+"href=\"https://www.odoo.com\"></a></td></tr></tbody></table></body></html>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_page
 msgid "<i class=\"fa fa-arrow-circle-right\"/> Accept &amp; Sign"
-msgstr ""
+msgstr "<i class=\"fa fa-arrow-circle-right\"/>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_page
 msgid "<i class=\"fa fa-check-circle\"/> Signed"
-msgstr ""
+msgstr "<i class=\"fa fa-check-circle\"/>"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders_upselling
@@ -252,14 +290,14 @@ msgid ""
 "<i>Example: pre-paid service offers for which the customer have\n"
 "                to buy an extra pack of hours, because he used all his support\n"
 "                hours.</i>"
-msgstr ""
+msgstr "<i/>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_my_orders
 msgid ""
 "<span class=\"hidden-xs\">Sales Order #</span>\n"
 "                      <span class=\"visible-xs\">Ref.</span>"
-msgstr ""
+msgstr "<span class=\"hidden-xs\"/><span class=\"visible-xs\"/>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_my_orders
@@ -303,7 +341,7 @@ msgstr ""
 msgid ""
 "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> "
 "Done</span>"
-msgstr ""
+msgstr "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/></span>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_page
@@ -589,6 +627,10 @@ msgid ""
 "codes. Specific conditions can be set (products, customers, minimum purchase"
 " amount, period). Rewards can be discounts (% or amount) or free products."
 msgstr ""
+"Steigern Sie Verkaufszahlen mit zwei Rabattprogrammen: Promo- und Coupon-"
+"Codes. Spezifische Bedingungen können festgelegt werden (Produkte, Kunden, "
+"Mindestbestellmenge, Zeitraum). Prämien können Rabatte sein (Prozent oder "
+"Betrag) oder kostenlose Produkte."
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.report_configuration_search_view
@@ -671,32 +713,32 @@ msgstr "Unternehmen"
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Versandkosten für DHL berechnen und versenden"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Versandkosten für FedEx berechnen und versenden"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Versandkosten für UPS berechnen und versenden"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Versandkosten für USPS berechnen und versenden"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Versandkosten für bpost berechnen und versenden"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs on orders"
-msgstr ""
+msgstr "Versandkosten für Aufträge berechnen"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sale_config
@@ -1346,7 +1388,7 @@ msgstr "Gesperrt"
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Manage promotion &amp; coupon programs"
-msgstr ""
+msgstr "Werbe- und Gutscheinkampagnen verwalten"
 
 #. module: sale
 #: selection:product.template,service_type:0
@@ -1505,7 +1547,7 @@ msgid ""
 "                    You'll be able to invoice it and collect payments.\n"
 "                    From the <i>Sales Orders</i> menu, you can track delivery\n"
 "                    orders or services."
-msgstr ""
+msgstr "<i/>"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_res_config_settings_module_sale_payment
@@ -1660,7 +1702,7 @@ msgid ""
 "Orders to upsell are orders having products with an invoicing\n"
 "                policy based on <i>ordered quantities</i> for which you have\n"
 "                delivered more than what have been ordered."
-msgstr ""
+msgstr "<i/>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.view_order_form
@@ -2282,6 +2324,8 @@ msgstr "Setzen Sie mehrere Preise pro Produkt, automatische Rabatte, etc."
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Set product attributes (e.g. color, size) to sell variants"
 msgstr ""
+"Legen Sie Produktattribute fest (z. B. Farbe, Größe), um Varianten zu "
+"verkaufen."
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
@@ -2312,7 +2356,7 @@ msgstr "Versand"
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery
 msgid "Shipping Costs"
-msgstr ""
+msgstr "Versandkosten"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.view_sales_order_filter
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index e63799c135b..d5bd9db5f1b 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -5,14 +5,14 @@
 # Translators:
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Denis Ledoux <dle@odoo.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -34,13 +34,14 @@
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Eduardo Magdalena <emagdalena@close2circle.com>, 2017
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Cristóbal Martí Oliver <info@moblesmarti.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -2748,7 +2749,7 @@ msgstr ""
 #: code:addons/sale/models/sale.py:430 code:addons/sale/models/sale.py:434
 #, python-format
 msgid "There is no invoiceable line."
-msgstr ""
+msgstr "No hay líneas facturables."
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_error
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 49b2e59f3cf..cd54a31d92c 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -5,9 +5,9 @@
 # Translators:
 # Christophe CHAUVET <christophe.chauvet@gmail.com>, 2016
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2016
@@ -37,13 +37,14 @@
 # Benedicte HANET <hanetb@gmail.com>, 2017
 # Bertrand LATOUR <divoir@gmail.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -289,6 +290,36 @@ msgid ""
 "                </html>\n"
 "            "
 msgstr ""
+"<html><head></head><body style=\"margin: 0; padding: 0;\"><table "
+"border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" "
+"style=\"padding: 20px; background-color: #ededed; border-"
+"collapse:separate;\" summary=\"o_mail_notification\"><tbody><!-- HEADER "
+"--><tr><td align=\"center\" style=\"min-width: 590px;\"><table width=\"590\""
+" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: "
+"590px; background-color: rgb(135,90,123); padding: 20px; border-"
+"collapse:separate;\"><tr><td valign=\"middle\"><span style=\"font-size:20px;"
+" color:white; font-weight: bold;\"></span></td><td valign=\"middle\" "
+"align=\"right\"><img src=\"/logo.png?company=${company.id}\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" "
+"alt=\"${company.name}\"></td></tr></table></td></tr><!-- CONTENT --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"590\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px;"
+" background-color: rgb(255, 255, 255); padding: 20px; border-"
+"collapse:separate;\"><tbody><td valign=\"top\" style=\"font-"
+"family:Arial,Helvetica,sans-serif; color: #555; font-size: "
+"14px;\"></td></tbody></table></td></tr><!-- FOOTER --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"590\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px;"
+" background-color: rgb(135,90,123); padding: 20px; border-"
+"collapse:separate;\"><tr><td valign=\"middle\" align=\"left\" style=\"color:"
+" #fff; padding-top: 10px; padding-bottom: 10px; font-size: "
+"12px;\"><br/></td><td valign=\"middle\" align=\"right\" style=\"color: #fff;"
+" padding-top: 10px; padding-bottom: 10px; font-size: 12px;\"><a "
+"href=\"mailto:${company.email}\" style=\"text-decoration:none; color: "
+"white;\"></a><br/><a href=\"${company.website}\" style=\"text-"
+"decoration:none; color: white;\"></a></td></tr></table></td></tr><tr><td "
+"align=\"center\"><a target=\"_blank\" "
+"href=\"https://www.odoo.com\"></a></td></tr></tbody></table></body></html>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_page
@@ -362,7 +393,7 @@ msgstr ""
 msgid ""
 "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> "
 "Done</span>"
-msgstr ""
+msgstr "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/></span>"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.portal_order_page
@@ -740,32 +771,32 @@ msgstr "Société"
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec DHL"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec FedEx"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec UPS"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec USPS"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec bpost"
 
 #. module: sale
 #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
 msgid "Compute shipping costs on orders"
-msgstr ""
+msgstr "Calculer les frais de port des commandes"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sale_config
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 97bb97b8053..0515336187e 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -3,20 +3,21 @@
 # * sale_crm
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Malte Jansen <work@maltejansen.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr "<span class=\"o_stat_text\"> Aufträge</span>"
 #. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
 msgid "<span class=\"o_stat_text\"> Quotation(s) </span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index fe124c17aea..4e45bcd57c4 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -5,19 +5,20 @@
 # Translators:
 # David Perez <david@closemarketing.es>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Javier Ramirez <elbomba887@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Oriol Carreras <oriolcarreras@gmail.com>, 2017
 # maitaoriana <maitaoriana@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -33,7 +34,7 @@ msgstr "<span class=\"o_stat_text\"> Pedidos</span>"
 #. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
 msgid "<span class=\"o_stat_text\"> Quotation(s) </span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Presupuesto(s)</span>"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
@@ -43,7 +44,7 @@ msgstr "Factura"
 #. module: sale_crm
 #: model:ir.model.fields,field_description:sale_crm.field_res_users_target_sales_invoiced
 msgid "Invoiced in Sales Orders Target"
-msgstr ""
+msgstr "Facturado en objetivo de órdenes de venta"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_lead
@@ -101,7 +102,7 @@ msgstr "Presupuestos"
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.sale_action_orders
 msgid "Sale orders"
-msgstr ""
+msgstr "Órdenes de venta"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_team
@@ -121,7 +122,7 @@ msgstr "Etiquetas"
 #. module: sale_crm
 #: model:ir.model.fields,help:sale_crm.field_crm_lead_sale_amount_total
 msgid "Untaxed Total of Confirmed Orders"
-msgstr ""
+msgstr "Importe total sin impuestos de los pedidos confirmados"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 368d60757ff..ce9478e31d2 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -6,18 +6,19 @@
 # Nicolas Roussey <nro@odoo.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Fred Gilson <fgi@odoo.com>, 2016
 # Lucas Deliege <lud@openerp.com>, 2017
 # Fabien Bourgeois <fabien@yaltik.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Fabien Bourgeois <fabien@yaltik.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -33,7 +34,7 @@ msgstr "<span class=\"o_stat_text\"> Ordres</span>"
 #. module: sale_crm
 #: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
 msgid "<span class=\"o_stat_text\"> Quotation(s) </span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
diff --git a/addons/sale_management/i18n/de.po b/addons/sale_management/i18n/de.po
index d5af320991a..a86b9baa83b 100644
--- a/addons/sale_management/i18n/de.po
+++ b/addons/sale_management/i18n/de.po
@@ -3,15 +3,16 @@
 # * sale_management
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # key six <mobile.umts@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: key six <mobile.umts@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr ""
 msgid ""
 "<p><b>Print this quotation.</b> If not yet done, you will be requested to "
 "set your company data and to select a document layout.</p>"
-msgstr ""
+msgstr "<p><b/></p>"
 
 #. module: sale_management
 #. openerp-web
@@ -47,7 +48,7 @@ msgstr "Rechnung erzeugen"
 msgid ""
 "Let's create a new quotation.<br/><i>Note that colored buttons usually point"
 " to the next logical actions.</i>"
-msgstr ""
+msgstr "<br/><i/>"
 
 #. module: sale_management
 #. openerp-web
@@ -61,7 +62,7 @@ msgstr ""
 #: code:addons/sale_management/static/src/js/tour.js:13
 #, python-format
 msgid "Organize your sales activities with the <b>Sales Management app</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_management
 #. openerp-web
@@ -75,7 +76,7 @@ msgstr ""
 #: code:addons/sale_management/static/src/js/tour.js:69
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_management
 #. openerp-web
diff --git a/addons/sale_management/i18n/es.po b/addons/sale_management/i18n/es.po
index 7726b0228c7..16d28a937bb 100644
--- a/addons/sale_management/i18n/es.po
+++ b/addons/sale_management/i18n/es.po
@@ -5,13 +5,14 @@
 # Translators:
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Miguel Orueta <mo@landoo.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Miguel Orueta <mo@landoo.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,7 +27,7 @@ msgstr ""
 msgid ""
 "<p><b>Print this quotation.</b> If not yet done, you will be requested to "
 "set your company data and to select a document layout.</p>"
-msgstr ""
+msgstr "<p><b/></p>"
 
 #. module: sale_management
 #. openerp-web
@@ -47,7 +48,7 @@ msgstr "Crear Factura"
 msgid ""
 "Let's create a new quotation.<br/><i>Note that colored buttons usually point"
 " to the next logical actions.</i>"
-msgstr ""
+msgstr "<br/><i/>"
 
 #. module: sale_management
 #. openerp-web
@@ -63,7 +64,7 @@ msgstr ""
 #: code:addons/sale_management/static/src/js/tour.js:13
 #, python-format
 msgid "Organize your sales activities with the <b>Sales Management app</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_management
 #. openerp-web
diff --git a/addons/sale_management/i18n/fr.po b/addons/sale_management/i18n/fr.po
index 9677945f90f..0745d7cdcc6 100644
--- a/addons/sale_management/i18n/fr.po
+++ b/addons/sale_management/i18n/fr.po
@@ -5,14 +5,15 @@
 # Translators:
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -69,7 +70,7 @@ msgstr ""
 #: code:addons/sale_management/static/src/js/tour.js:13
 #, python-format
 msgid "Organize your sales activities with the <b>Sales Management app</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_management
 #. openerp-web
diff --git a/addons/sale_payment/i18n/de.po b/addons/sale_payment/i18n/de.po
index 5c760a0a96e..b5ee5c274b7 100644
--- a/addons/sale_payment/i18n/de.po
+++ b/addons/sale_payment/i18n/de.po
@@ -9,16 +9,17 @@
 # Malte Jansen <work@maltejansen.de>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: JackTheHunter <Maximilian.N98@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -178,7 +179,7 @@ msgstr ""
 #. module: sale_payment
 #: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
 msgid "Payments to Capture"
-msgstr ""
+msgstr "Zu erfassende Zahlungen"
 
 #. module: sale_payment
 #: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_pending
diff --git a/addons/sale_payment/i18n/fr.po b/addons/sale_payment/i18n/fr.po
index 2e039ea2535..d1f27525264 100644
--- a/addons/sale_payment/i18n/fr.po
+++ b/addons/sale_payment/i18n/fr.po
@@ -7,18 +7,19 @@
 # fr trans <e2ffr05@hotmail.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
 # Lucas Deliege <lud@openerp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Clo <clo@odoo.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Fabien Pinckaers <fp@openerp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Fabien Pinckaers <fp@openerp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -179,7 +180,7 @@ msgstr ""
 #. module: sale_payment
 #: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
 msgid "Payments to Capture"
-msgstr ""
+msgstr "Paiements à capturer"
 
 #. module: sale_payment
 #: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_pending
diff --git a/addons/sale_payment/views/sale_portal_templates.xml b/addons/sale_payment/views/sale_portal_templates.xml
index e8c5afab5db..06b3f402351 100644
--- a/addons/sale_payment/views/sale_portal_templates.xml
+++ b/addons/sale_payment/views/sale_portal_templates.xml
@@ -31,7 +31,7 @@
 
     <template id="portal_my_orders_payment" name="Payment on my orders" inherit_id="sale.portal_order_page">
         <xpath expr="//t[@name='portal_confirmation_sign']" position="after">
-            <t t-if="not invoices and order.state in ('sent', 'sale') and portal_confirmation == 'pay' and order.payment_tx_id.state != 'done'" name="portal_confirmation_pay">
+            <t t-if="order.amount_total and not invoices and order.state in ('sent', 'sale') and portal_confirmation == 'pay' and order.payment_tx_id.state != 'done'" name="portal_confirmation_pay">
                 <a class="btn btn-primary ml8 pull-right" href="#portal_pay">
                     <i class="fa fa-arrow-circle-right"/> Pay Now
                 </a>
@@ -49,7 +49,7 @@
             </div>
         </xpath>
         <xpath expr="//div[@id='portal_sign']" position="after">
-            <div class="row" t-if="not invoices and order.state in ('sent') and portal_confirmation == 'pay'" id="portal_pay">
+            <div class="row" t-if="order.amount_total and not invoices and order.state in ('sent', 'sale') and portal_confirmation == 'pay' and order.payment_tx_id.state != 'done'" id="portal_pay">
                 <div class="col-md-offset-3 col-md-6">
                     <div t-if="pms or s2s_acquirers or form_acquirers" id="payment_method" class="text-left col-md-13">
                         <h4 class="mb24">Pay with</h4>
diff --git a/addons/sale_stock/i18n/es.po b/addons/sale_stock/i18n/es.po
index 2ba3a12979c..4f160bcd6e7 100644
--- a/addons/sale_stock/i18n/es.po
+++ b/addons/sale_stock/i18n/es.po
@@ -3,8 +3,8 @@
 # * sale_stock
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
@@ -16,13 +16,14 @@
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2017
 # José Vicente <txusev@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -100,6 +101,8 @@ msgstr "Post-venta"
 #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Apply special routes from orders (e.g. dropshipping, MTO)"
 msgstr ""
+"Aplicar rutas especiales de pedidos (por ejemplo: triangulación de envíos, "
+"fabricación a medida)"
 
 #. module: sale_stock
 #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
@@ -108,6 +111,10 @@ msgid ""
 "highest customer lead time of products. With this option, you can set a "
 "specific delivery date on orders rather than setting lead times on products."
 msgstr ""
+"Odoo calcula, de forma predeterminada, la fecha de entrega prevista de este "
+"modo: fecha del pedido + plazo de entrega máximo de los productos. Con esta "
+"opción, puede fijar una fecha concreta de entrega para los pedidos en lugar "
+"de establecer plazos de entrega de productos."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_res_company
@@ -209,6 +216,9 @@ msgid ""
 "for delivery that many days earlier than the actual promised date, to cope "
 "with unexpected delays in the supply chain."
 msgstr ""
+"Margen de error para fechas prometidas a los clientes. La entrega de los "
+"productos quedará programada días antes de la fecha prometida para hacer así"
+" frente a posibles retrasos inesperados en la cadena de suministro."
 
 #. module: sale_stock
 #: model:ir.model.fields,help:sale_stock.field_res_company_security_lead
@@ -238,7 +248,7 @@ msgstr "¡No hay suficiente inventario!"
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_res_config_settings_group_route_so_lines
 msgid "Order-Specific Routes"
-msgstr ""
+msgstr "Rutas específicas de pedidos"
 
 #. module: sale_stock
 #: code:addons/sale_stock/models/sale_order.py:200
@@ -284,6 +294,9 @@ msgid ""
 "or/and frequent stock-outs. By default, the scheduler runs automatically "
 "every 24 hours."
 msgstr ""
+"Se recomienda reservar manualmente los productos en las órdenes de entrega o"
+" ejecutando el planificador para gestionar mejor las prioridades en caso de "
+"largos plazos de entrega del cliente o frecuentes desabastecimientos. "
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_route_id
@@ -293,12 +306,12 @@ msgstr "Ruta"
 #. module: sale_stock
 #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
 msgid "Routes for Sales Order Lines"
-msgstr ""
+msgstr "Rutas para líneas de órdenes de venta"
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_stock_move_sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Línea de venta"
 
 #. module: sale_stock
 #: model:ir.model.fields,field_description:sale_stock.field_procurement_group_sale_id
@@ -363,12 +376,13 @@ msgstr "Establecer fecha de entrega en pedidos"
 #. module: sale_stock
 #: selection:res.config.settings,default_picking_policy:0
 msgid "Ship all products at once"
-msgstr ""
+msgstr "Enviar todos los productos de inmediato"
 
 #. module: sale_stock
 #: selection:res.config.settings,default_picking_policy:0
 msgid "Ship products as soon as available, with back orders"
 msgstr ""
+"Enviar los productos tan pronto estén disponibles, con pedidos pendientes"
 
 #. module: sale_stock
 #: model:ir.ui.view,arch_db:sale_stock.view_order_form_inherit_sale_stock
@@ -403,6 +417,11 @@ msgid ""
 "available in sales orders, routes must have 'Sales Order Line' option "
 "checked in their setup form."
 msgstr ""
+"Esto permite aplicar una ruta especial a líneas de órdenes de venta (por "
+"ejemplo: triangulación de envíos o fabricación a medida) en el caso de que "
+"se dé una situación inusual con uno o varios pedidos. Las rutas, para que "
+"estén disponibles en las órdenes de venta, deben tener marcada la opción "
+"\"Línea de orden de venta\" en su formulario de configuración."
 
 #. module: sale_stock
 #: code:addons/sale_stock/models/sale_order.py:298
@@ -461,6 +480,8 @@ msgstr ""
 msgid ""
 "You plan to sell %s %s but you only have %s %s available in %s warehouse."
 msgstr ""
+"Planea vender %s %s, pero solo tiene %s %s disponible(s) en el almacén de "
+"%s."
 
 #. module: sale_stock
 #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
diff --git a/addons/sale_timesheet/i18n/es.po b/addons/sale_timesheet/i18n/es.po
index 3da2f7a91ec..0922ae9040c 100644
--- a/addons/sale_timesheet/i18n/es.po
+++ b/addons/sale_timesheet/i18n/es.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # oihane <oihanecruce@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
@@ -14,14 +14,15 @@
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
 # Gelo Joga Landoo <gj@landoo.es>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -43,17 +44,17 @@ msgid ""
 "                    customers if required.\n"
 "                </p>\n"
 "            "
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\"/><p/>"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "<b>Total</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_kanban_inherit_sale_timesheet
 msgid "<span class=\"o_label\">Overview</span>"
-msgstr ""
+msgstr "<span class=\"o_label\"/>"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_account_analytic_line
@@ -63,43 +64,43 @@ msgstr "Línea Analítica"
 #. module: sale_timesheet
 #: selection:account.analytic.line,timesheet_invoice_type:0
 msgid "Billable Fixed"
-msgstr ""
+msgstr "Fijo facturable"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
 msgid "Billable Hours"
-msgstr ""
+msgstr "Horas facturables"
 
 #. module: sale_timesheet
 #: selection:account.analytic.line,timesheet_invoice_type:0
 msgid "Billable Time"
-msgstr ""
+msgstr "Tiempo facturable"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line_timesheet_invoice_type
 msgid "Billable Type"
-msgstr ""
+msgstr "Tipo facturable"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Billable fixed"
-msgstr ""
+msgstr "Fijo facturable"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Billable time"
-msgstr ""
+msgstr "Tiempo facturable"
 
 #. module: sale_timesheet
 #: model:ir.filters,name:sale_timesheet.timesheet_filter_billing
 msgid "Billing Rate"
-msgstr ""
+msgstr "Tasa de facturación"
 
 #. module: sale_timesheet
 #: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_billing_report
 #: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_billing_analysis
 msgid "By Billing Rate"
-msgstr ""
+msgstr "Por tasa de facturación"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
@@ -110,7 +111,7 @@ msgstr "Coste"
 #: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_report_cost_revenue
 #: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_report_cost_revenue
 msgid "Costs and Revenues"
-msgstr ""
+msgstr "Gastos e ingresos"
 
 #. module: sale_timesheet
 #: selection:product.template,service_tracking:0
@@ -150,7 +151,7 @@ msgstr "Fijo"
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
 msgid "Fixed Price Projects"
-msgstr ""
+msgstr "Proyectos con precio fijo"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
@@ -177,7 +178,7 @@ msgstr "Factura basada en"
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_account_analytic_line_timesheet_invoice_id
 msgid "Invoice created from the timesheet"
-msgstr ""
+msgstr "Facturada creada a partir del parte de horas"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
@@ -187,7 +188,7 @@ msgstr "Facturado"
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line_is_service
 msgid "Is a Service"
-msgstr ""
+msgstr "Es un servicio"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
@@ -203,28 +204,28 @@ msgstr "Objetivos (marcados manualmente en el pedido)"
 #: selection:account.analytic.line,timesheet_invoice_type:0
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "No task found"
-msgstr ""
+msgstr "No se han encontrado tareas"
 
 #. module: sale_timesheet
 #: selection:account.analytic.line,timesheet_invoice_type:0
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Non Billable"
-msgstr ""
+msgstr "No facturable"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
 msgid "Non Billable Hours"
-msgstr ""
+msgstr "Horas no facturables"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Non billable"
-msgstr ""
+msgstr "No facturable"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_count
 msgid "Number of timesheets"
-msgstr ""
+msgstr "Número de partes de horas"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_product_product_service_tracking
@@ -233,6 +234,9 @@ msgid ""
 "On Sales order confirmation, this product can generate a project and/or "
 "task. From those, you can track the service you are selling."
 msgstr ""
+"Este producto puede generar un proyecto y/o una tarea en la confirmación de "
+"la orden de venta. Partiendo de ello, puede supervisar el servicio que "
+"oferta."
 
 #. module: sale_timesheet
 #: selection:product.template,service_policy:0
@@ -260,7 +264,7 @@ msgstr "Productos"
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Profitability"
-msgstr ""
+msgstr "Rentabilidad"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_project_project
@@ -277,7 +281,7 @@ msgstr "Proyecto asociado a esta venta"
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
 msgid "Project(s) Overview"
-msgstr ""
+msgstr "Resumen del o de los proyectos"
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/sale_order.py:107
@@ -289,7 +293,7 @@ msgstr "Proyectos"
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_sale_order_project_ids
 msgid "Projects used in this sales order."
-msgstr ""
+msgstr "Proyectos empleados en esta orden de venta."
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_sale_order
@@ -312,6 +316,8 @@ msgid ""
 "Sale order line from which the project has been created. Used for "
 "tracability."
 msgstr ""
+"Línea de orden de venta a partir de la cual se ha creado el proyecto. Usado "
+"para trazabilidad"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
@@ -322,7 +328,7 @@ msgstr "Aviso para pedido de venta"
 #: model:ir.model.fields,field_description:sale_timesheet.field_project_task_sale_line_id
 #: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
 msgid "Sales Order Item"
-msgstr ""
+msgstr "Elemento de orden de venta"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_sale_order_line
@@ -336,6 +342,8 @@ msgid ""
 "Sales Order item should generate a task and/or a project, depending on the "
 "product settings."
 msgstr ""
+"El elemento de orden de venta ha de generar una tarea y/o un proyecto en "
+"función de los ajustes del producto."
 
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_product_product_project_id
@@ -344,6 +352,8 @@ msgid ""
 "Select a non billable project on which tasks can be created. This setting "
 "must be set for each company."
 msgstr ""
+"Seleccione un proyecto no facturable en el que poder crear tareas. Este "
+"ajuste debe ser fijado para cada empresa."
 
 #. module: sale_timesheet
 #: model:ir.model.fields,field_description:sale_timesheet.field_product_product_service_tracking
@@ -383,7 +393,7 @@ msgstr ""
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_sale_order_line_task_id
 msgid "Task generated by the sales order item"
-msgstr ""
+msgstr "Tarea generada por el elemento de orden de venta"
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/controllers/main.py:109
@@ -402,7 +412,7 @@ msgstr "Tareas asociadas a esta etapa"
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "There is no timesheet for now."
-msgstr ""
+msgstr "No hay ningún parte de horas por el momento."
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/sale_order.py:237
@@ -417,12 +427,12 @@ msgstr ""
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Time and material"
-msgstr ""
+msgstr "Tiempo y material"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "Time by people"
-msgstr ""
+msgstr "Tiempo por personas"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
@@ -470,7 +480,7 @@ msgstr "Partes de horas"
 #: code:addons/sale_timesheet/models/project.py:20
 #, python-format
 msgid "Timesheets of %s"
-msgstr ""
+msgstr "Partes de horas de %s"
 
 #. module: sale_timesheet
 #: selection:product.template,service_policy:0
@@ -489,6 +499,8 @@ msgid ""
 "You can not modify already invoiced timesheets (linked to a Sales order "
 "items invoiced on Time and material)."
 msgstr ""
+"No puede modificar partes de horas ya facturados (vinculados a elementos de "
+"órdenes de venta facturados en tiempo y material)."
 
 #. module: sale_timesheet
 #: code:addons/sale_timesheet/models/project.py:74
@@ -497,8 +509,10 @@ msgid ""
 "You cannot delete a task related to a Sales Order. You can only archive this"
 " task."
 msgstr ""
+"No puede eliminar una tarea vinculada a una orden de venta. Únicamente puede"
+" archivar esta tarea."
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
 msgid "per hour"
-msgstr ""
+msgstr "por hora"
diff --git a/addons/sale_timesheet/i18n/zh_CN.po b/addons/sale_timesheet/i18n/zh_CN.po
index 1d012d59c13..19647383d9e 100644
--- a/addons/sale_timesheet/i18n/zh_CN.po
+++ b/addons/sale_timesheet/i18n/zh_CN.po
@@ -3,20 +3,21 @@
 # * sale_timesheet
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
 # Xu Lei <xulei8@qq.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,17 +39,17 @@ msgid ""
 "                    customers if required.\n"
 "                </p>\n"
 "            "
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\"/><p/>"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
 msgid "<b>Total</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_kanban_inherit_sale_timesheet
 msgid "<span class=\"o_label\">Overview</span>"
-msgstr ""
+msgstr "<span class=\"o_label\"/>"
 
 #. module: sale_timesheet
 #: model:ir.model,name:sale_timesheet.model_account_analytic_line
@@ -372,7 +373,7 @@ msgstr "任务"
 #, python-format
 msgid ""
 "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
-msgstr ""
+msgstr "<a href=# data-oe-model=project.task data-oe-id=%d></a>"
 
 #. module: sale_timesheet
 #: model:ir.model.fields,help:sale_timesheet.field_sale_order_line_task_id
@@ -404,7 +405,7 @@ msgstr ""
 msgid ""
 "This task has been created from: <a href=# data-oe-model=sale.order data-oe-"
 "id=%d>%s</a> (%s)"
-msgstr ""
+msgstr "<a href=# data-oe-model=sale.order data-oe-id=%d></a>"
 
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
diff --git a/addons/sale_timesheet/models/account.py b/addons/sale_timesheet/models/account.py
index ec51d2085a2..00a4b708e2c 100644
--- a/addons/sale_timesheet/models/account.py
+++ b/addons/sale_timesheet/models/account.py
@@ -75,6 +75,13 @@ class AccountAnalyticLine(models.Model):
 
     @api.multi
     def _timesheet_compute_theorical_revenue(self):
+        for timesheet in self:
+            values = timesheet._timesheet_compute_theorical_revenue_values()
+            timesheet.write(values)
+        return True
+
+    @api.multi
+    def _timesheet_compute_theorical_revenue_values(self):
         """ This method set the theorical revenue on the current timesheet lines.
 
             If invoice on delivered quantity:
@@ -87,53 +94,55 @@ class AccountAnalyticLine(models.Model):
             else:
                 0
         """
-        for timesheet in self:
-            # find the timesheet UoM
-            timesheet_uom = timesheet.product_uom_id
-            if not timesheet_uom:  # fallback on default company timesheet UoM
-                timesheet_uom = self.env.user.company_id.project_time_mode_id
-
-            # default values
-            unit_amount = timesheet.unit_amount
-            so_line = timesheet.so_line
-            values = {
-                'timesheet_revenue': 0.0,
-                'timesheet_invoice_type': 'non_billable_project' if not timesheet.task_id else 'non_billable',
-            }
-            # set the revenue and billable type according to the product and the SO line
-            if timesheet.task_id and so_line.product_id.type == 'service':
-                # find the analytic account to convert revenue into its currency
-                analytic_account = timesheet.account_id
-                # convert the unit of mesure into hours
-                sale_price_hour = so_line.product_uom._compute_price(so_line.price_unit, timesheet_uom)
-                sale_price = so_line.currency_id.compute(sale_price_hour, analytic_account.currency_id)  # amount from SO should be convert into analytic account currency
-
-                # calculate the revenue on the timesheet
-                if so_line.product_id.invoice_policy == 'delivery':
-                    values['timesheet_revenue'] = analytic_account.currency_id.round(unit_amount * sale_price * (1-(so_line.discount/100)))
-                    values['timesheet_invoice_type'] = 'billable_time' if so_line.product_id.service_type == 'timesheet' else 'billable_fixed'
-                elif so_line.product_id.invoice_policy == 'order' and so_line.product_id.service_type == 'timesheet':
-                    quantity_hour = unit_amount
-                    if so_line.product_uom.category_id == timesheet_uom.category_id:
-                        quantity_hour = so_line.product_uom._compute_quantity(so_line.product_uom_qty, timesheet_uom)
-                    # compute the total revenue the SO since we are in fixed price
-                    total_revenue_so = analytic_account.currency_id.round(quantity_hour * sale_price * (1-(so_line.discount/100)))
-                    # compute the total revenue already existing (without the current timesheet line)
-                    domain = [('so_line', '=', so_line.id)]
-                    if timesheet.ids:
-                        domain += [('id', 'not in', timesheet.ids)]
-                    analytic_lines = timesheet.search(domain)
-                    total_revenue_invoiced = sum(analytic_lines.mapped('timesheet_revenue'))
-                    # compute (new) revenue of current timesheet line
-                    values['timesheet_revenue'] = min(
-                        analytic_account.currency_id.round(unit_amount * so_line.currency_id.compute(so_line.price_unit, analytic_account.currency_id) * (1-so_line.discount)),
-                        total_revenue_so - total_revenue_invoiced
-                    )
-                    values['timesheet_invoice_type'] = 'billable_fixed'
-                    # if the so line is already invoiced, and the delivered qty is still smaller than the ordered, then link the timesheet to the invoice
-                    if so_line.invoice_status == 'invoiced':
-                        values['timesheet_invoice_id'] = so_line.invoice_lines[0].invoice_id.id
-                elif so_line.product_id.invoice_policy == 'order' and so_line.product_id.service_type != 'timesheet':
-                    values['timesheet_invoice_type'] = 'billable_fixed'
-            timesheet.write(values)
-        return True
+        self.ensure_one()
+        timesheet = self
+
+        # find the timesheet UoM
+        timesheet_uom = timesheet.product_uom_id
+        if not timesheet_uom:  # fallback on default company timesheet UoM
+            timesheet_uom = self.env.user.company_id.project_time_mode_id
+
+        # default values
+        unit_amount = timesheet.unit_amount
+        so_line = timesheet.so_line
+        values = {
+            'timesheet_revenue': 0.0,
+            'timesheet_invoice_type': 'non_billable_project' if not timesheet.task_id else 'non_billable',
+        }
+        # set the revenue and billable type according to the product and the SO line
+        if timesheet.task_id and so_line.product_id.type == 'service':
+            # find the analytic account to convert revenue into its currency
+            analytic_account = timesheet.account_id
+            # convert the unit of mesure into hours
+            sale_price_hour = so_line.product_uom._compute_price(so_line.price_unit, timesheet_uom)
+            sale_price = so_line.currency_id.compute(sale_price_hour, analytic_account.currency_id)  # amount from SO should be convert into analytic account currency
+
+            # calculate the revenue on the timesheet
+            if so_line.product_id.invoice_policy == 'delivery':
+                values['timesheet_revenue'] = analytic_account.currency_id.round(unit_amount * sale_price * (1-(so_line.discount/100)))
+                values['timesheet_invoice_type'] = 'billable_time' if so_line.product_id.service_type == 'timesheet' else 'billable_fixed'
+            elif so_line.product_id.invoice_policy == 'order' and so_line.product_id.service_type == 'timesheet':
+                quantity_hour = unit_amount
+                if so_line.product_uom.category_id == timesheet_uom.category_id:
+                    quantity_hour = so_line.product_uom._compute_quantity(so_line.product_uom_qty, timesheet_uom)
+                # compute the total revenue the SO since we are in fixed price
+                total_revenue_so = analytic_account.currency_id.round(quantity_hour * sale_price * (1-(so_line.discount/100)))
+                # compute the total revenue already existing (without the current timesheet line)
+                domain = [('so_line', '=', so_line.id)]
+                if timesheet.ids:
+                    domain += [('id', 'not in', timesheet.ids)]
+                analytic_lines = timesheet.search(domain)
+                total_revenue_invoiced = sum(analytic_lines.mapped('timesheet_revenue'))
+                # compute (new) revenue of current timesheet line
+                values['timesheet_revenue'] = min(
+                    analytic_account.currency_id.round(unit_amount * so_line.currency_id.compute(so_line.price_unit, analytic_account.currency_id) * (1-so_line.discount)),
+                    total_revenue_so - total_revenue_invoiced
+                )
+                values['timesheet_invoice_type'] = 'billable_fixed'
+                # if the so line is already invoiced, and the delivered qty is still smaller than the ordered, then link the timesheet to the invoice
+                if so_line.invoice_status == 'invoiced':
+                    values['timesheet_invoice_id'] = so_line.invoice_lines[0].invoice_id.id
+            elif so_line.product_id.invoice_policy == 'order' and so_line.product_id.service_type != 'timesheet':
+                values['timesheet_invoice_type'] = 'billable_fixed'
+
+        return values
diff --git a/addons/sales_team/i18n/de.po b/addons/sales_team/i18n/de.po
index 9f9d5f49879..ebb254ab08e 100644
--- a/addons/sales_team/i18n/de.po
+++ b/addons/sales_team/i18n/de.po
@@ -396,7 +396,7 @@ msgstr ""
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_period
 msgid "The time period this channel's dashboard graph will consider."
-msgstr ""
+msgstr "Der Zeitraum, den das Dashboard-Diagramm des Kanals betrachtet."
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_type
diff --git a/addons/sales_team/i18n/es.po b/addons/sales_team/i18n/es.po
index faee9278305..36b2b8834af 100644
--- a/addons/sales_team/i18n/es.po
+++ b/addons/sales_team/i18n/es.po
@@ -6,9 +6,9 @@
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # oihane <oihanecruce@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # David Perez <david@closemarketing.es>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
@@ -26,15 +26,16 @@
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
 # David Arnold <blaggacao@users.noreply.github.com>, 2017
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -80,13 +81,13 @@ msgstr "Archivado"
 #. module: sales_team
 #: selection:crm.team,dashboard_graph_type:0
 msgid "Bar"
-msgstr ""
+msgstr "Barra"
 
 #. module: sales_team
 #: code:addons/sales_team/models/crm_team.py:269
 #, python-format
 msgid "Big Pretty Button :)"
-msgstr ""
+msgstr "Botón bastante grande :)"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_user_id
@@ -107,7 +108,7 @@ msgstr "Tipo de canal"
 #: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
 #: model:ir.actions.act_window,help:sales_team.sales_team_config_action
 msgid "Click here to define a new sales channel."
-msgstr ""
+msgstr "Haga clic aquí para definir un nuevo canal de ventas."
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_color
@@ -157,12 +158,12 @@ msgstr "Tablero"
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_button_name
 msgid "Dashboard Button"
-msgstr ""
+msgstr "Botón del panel"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_data
 msgid "Dashboard Graph Data"
-msgstr ""
+msgstr "Datos gráficos en panel"
 
 #. module: sales_team
 #: selection:crm.team,dashboard_graph_group:0
@@ -182,13 +183,15 @@ msgstr "Europa"
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_favorite_user_ids
 msgid "Favorite Members"
-msgstr ""
+msgstr "Miembros favoritos"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_is_favorite
 msgid ""
 "Favorite teams to display them in the dashboard and access them easily."
 msgstr ""
+"Equipos favoritos a mostrar en el panel y tener un acceso rápido y fácil a "
+"ellos."
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
@@ -231,6 +234,8 @@ msgid ""
 "If set, this sales channel will be used for sales and assignations related "
 "to this partner"
 msgstr ""
+"Si así se fija, este canal de ventas se utilizará para ventas y asignaciones"
+" relacionadas con este socio"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_active
@@ -238,6 +243,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the sales "
 "channel without removing it."
 msgstr ""
+"Si el campo activo está fijado en falso, le permitirá ocultar el canal de "
+"ventas sin tener que eliminarlo."
 
 #. module: sales_team
 #: selection:crm.team,dashboard_graph_model:0
@@ -298,7 +305,7 @@ msgstr "Mis favoritos"
 #: code:addons/sales_team/models/crm_team.py:255
 #, python-format
 msgid "Not Defined"
-msgstr ""
+msgstr "No definido"
 
 #. module: sales_team
 #: selection:crm.team,dashboard_graph_model:0
@@ -337,6 +344,8 @@ msgid ""
 "Sales Channel the user is member of. Used to compute the members of a sales "
 "channel through the inverse one2many"
 msgstr ""
+"Canal de ventas del que el usuario es miembro. Utilizado para computar los "
+"miembros de un canal de ventas por medio de one2many inverso"
 
 #. module: sales_team
 #: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
@@ -372,7 +381,7 @@ msgstr "Configuración"
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_is_favorite
 msgid "Show on dashboard"
-msgstr ""
+msgstr "Mostrar en panel"
 
 #. module: sales_team
 #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
@@ -387,7 +396,7 @@ msgstr "Miembros del equipo"
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_color
 msgid "The color of the channel"
-msgstr ""
+msgstr "El color del canal"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_reply_to
@@ -395,11 +404,14 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Odoo about "
 "cases in this sales channel"
 msgstr ""
+"La dirección de correo electrónico indicada en el campo \"Responder a\" de "
+"todos los correos electrónicos enviados por Odoo sobre casos de este canal "
+"de ventas"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_model
 msgid "The graph this channel will display in the Dashboard.\n"
-msgstr ""
+msgstr "El gráfico que este canal mostrará en el panel.\n"
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_period
@@ -411,13 +423,13 @@ msgstr ""
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_type
 msgid "The type of graph this channel will display in the dashboard."
-msgstr ""
+msgstr "El tipo de gráficos que este canal mostrará en el panel."
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_team_type
 msgid ""
 "The type of this channel, it will define the resources this channel uses."
-msgstr ""
+msgstr "El tipo de canal, que determinará los recursos que emplea este canal."
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_type
@@ -429,7 +441,7 @@ msgstr "Tipo"
 #: code:addons/sales_team/models/crm_team.py:173
 #, python-format
 msgid "Undefined graph model for Sales Channel: %s"
-msgstr ""
+msgstr "Modelo de gráficos indefinido para canal de ventas: %s"
 
 #. module: sales_team
 #: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
@@ -438,6 +450,8 @@ msgid ""
 "Use sales channels to organize your sales departments. \n"
 "                    Each channel will work with a separate pipeline."
 msgstr ""
+"Utilice canales de ventas para organizar sus departamentos de ventas. \n"
+" Cada canal funcionará de manera independiente."
 
 #. module: sales_team
 #: model:res.groups,name:sales_team.group_sale_salesman_all_leads
diff --git a/addons/sales_team/i18n/fr.po b/addons/sales_team/i18n/fr.po
index a19b1e6493a..2c70e71bb0d 100644
--- a/addons/sales_team/i18n/fr.po
+++ b/addons/sales_team/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Henri Cornuau <hcornuau@gmail.com>, 2016
 # Nicolas JEUDY <njeudy@panda-chi.io>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
@@ -12,7 +12,7 @@
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Melanie Bernard <mbe@odoo.com>, 2017
 # lucasdeliege <deliegelucas@gmail.com>, 2017
 # leemannd <denis.leemann@camptocamp.com>, 2017
@@ -24,13 +24,14 @@
 # Félix Desjardins <felixinx@gmail.com>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Matillon Samantha <smatillon@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Matillon Samantha <smatillon@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -403,6 +404,7 @@ msgstr ""
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_period
 msgid "The time period this channel's dashboard graph will consider."
 msgstr ""
+"La période que ce graphique de tableau de bord de canal prendra en compte."
 
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_type
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index 18330c1d793..c47ed128a8a 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -14,6 +14,10 @@ The service is provided by the In App Purchase Odoo platform.
     'data': [
         'wizard/send_sms_views.xml',
         'views/res_partner_views.xml',
+        'views/templates.xml',
+    ],
+    'qweb': [
+        'static/src/xml/sms_widget.xml',
     ],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sms/static/src/js/sms_widget.js b/addons/sms/static/src/js/sms_widget.js
new file mode 100644
index 00000000000..a01ff3753cf
--- /dev/null
+++ b/addons/sms/static/src/js/sms_widget.js
@@ -0,0 +1,120 @@
+odoo.define('sms.sms_widget', function (require) {
+"use strict";
+
+var basicFields = require('web.basic_fields');
+var core = require('web.core');
+var fieldRegistry = require('web.field_registry');
+var framework = require('web.framework');
+
+var FieldText = basicFields.FieldText;
+var QWeb = core.qweb;
+
+/**
+ * SmsWidget is a widget to display a textarea (the body) and a text representing
+ * the number of SMS and the number of characters. This text is computed every
+ * time the user changes the body.
+ */
+var SmsWidget = FieldText.extend({
+    /**
+     * @constructor
+     */
+    init: function () {
+        this._super.apply(this, arguments);
+        this.nbrChar = 0;
+        this.nbrSMS = 0;
+        this.encoding = "GSM7";
+        this.tagName = 'div';
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+     * Compute the number of characters and sms
+     * @private
+     */
+    _compute: function () {
+        var content = this._getValue();
+        this.encoding = this._extractEncoding(content);
+        this.nbrChar = content.length;
+        this.nbrChar += (content.match(/\n/g) || []).length;
+        this.nbrSMS = this._countSMS(this.nbrChar, this.encoding);
+        this._renderSMS();
+    },
+    /**
+     * Count the number of SMS of the content
+     * @private
+     * @returns {integer} Number of SMS
+     */
+    _countSMS: function () {
+        if (this.nbrChar === 0) {
+            return 0;
+        }
+        if (this.encoding === 'UNICODE') {
+            if (this.nbrChar <= 70) {
+                return 1;
+            }
+            return Math.ceil(this.nbrChar / 67);
+        }
+        if (this.nbrChar <= 160) {
+            return 1;
+        }
+        return Math.ceil(this.nbrChar / 153);
+    },
+    /**
+     * @private
+     * @override
+     */
+    _renderEdit: function () {
+        this.$el.empty();
+        this._prepareInput($('<textarea/>')).appendTo(this.$el);
+        this.$el.append($(QWeb.render("sms.sms_count", {})));
+        this._compute();
+    },
+    /**
+     * Extract the encoding depending on the characters in the content
+     * @private
+     * @param {String} content Content of the SMS
+     * @returns {String} Encoding of the content (GSM7 or UNICODE)
+     */
+    _extractEncoding: function (content) {
+        if (String(content).match(RegExp("^[@£$¥èéùìòÇ\\nØø\\rÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ !\\\"#¤%&'()*+,-./0123456789:;<=>?¡ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÑÜ§¿abcdefghijklmnopqrstuvwxyzäöñüà]*$"))) {
+            return 'GSM7';
+        }
+        return 'UNICODE';
+    },
+    /**
+     * Render the number of characters, sms and the encoding.
+     * @private
+     */
+    _renderSMS: function () {
+        this.$('.o_sms_count').text(this.nbrChar + ' / ' + this.nbrSMS + ' SMS (' + this.encoding + ') ');
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------   
+
+    /**
+     * @override
+     * @private
+     */
+    _onChange: function () {
+        this._super.apply(this, arguments);
+        this._compute();
+    },
+    /**
+     * @override
+     * @private
+     */
+    _onInput: function () {
+        this._super.apply(this, arguments);
+        this._compute();
+    },
+});
+
+fieldRegistry.add('sms_widget', SmsWidget);
+
+return SmsWidget;
+});
diff --git a/addons/sms/static/src/tests/sms_widget_test.js b/addons/sms/static/src/tests/sms_widget_test.js
new file mode 100644
index 00000000000..b346c5a6f98
--- /dev/null
+++ b/addons/sms/static/src/tests/sms_widget_test.js
@@ -0,0 +1,67 @@
+odoo.define('sms.sms_widget_tests', function (require) {
+"use strict";
+    
+var FormView = require('web.FormView');
+var testUtils = require('web.test_utils');
+
+var createView = testUtils.createView;
+
+QUnit.module('fields', {
+    beforeEach: function () {
+        this.data = {
+            partner: {
+                fields: {
+                    message: {string: "message", type: "text"},
+                },
+                records: [{
+                    id: 1,
+                    message: "",
+                }]
+            },
+        };
+    }
+}, function () {
+    
+    QUnit.module('SmsWidget');
+
+    QUnit.test('Sms widgets are correctly rendered', function (assert) {
+        assert.expect(9);
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form><sheet><field name="message" widget="sms_widget"/></sheet></form>',
+        });
+        form.$buttons.find('.o_form_button_edit').click();
+        assert.ok(form.$('.o_sms_count').length, "Should have a sms counter");
+        assert.strictEqual(form.$('.o_sms_count').text(), '0 / 0 SMS (GSM7) ', 'Should be "0 / 0 SMS (GSM7) " by default');
+        // GSM-7
+        form.$('.o_input').val("Hello from Odoo").trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '15 / 1 SMS (GSM7) ', 'Should be "15 / 1 SMS (GSM7) " for "Hello from Odoo"');
+        // GSM-7 with \n => this one count as 2 characters
+        form.$('.o_input').val("Hello from Odoo\n").trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '17 / 1 SMS (GSM7) ', 'Should be "17 / 1 SMS (GSM7) " for "Hello from Odoo\\n"');
+        // Unicode => ê
+        form.$('.o_input').val("Hêllo from Odoo").trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '15 / 1 SMS (UNICODE) ', 'Should be "15 / 1 SMS (UNICODE) " for "Hêllo from Odoo"');
+        // GSM-7 with 160c
+        var text = Array(161).join('a');
+        form.$('.o_input').val(text).trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '160 / 1 SMS (GSM7) ', 'Should be "160 / 1 SMS (GSM7) " for 160 x "a"');
+        // GSM-7 with 161c
+        text = Array(162).join('a');
+        form.$('.o_input').val(text).trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '161 / 2 SMS (GSM7) ', 'Should be "161 / 2 SMS (GSM7) " for 161 x "a"');
+        // Unicode with 70c
+        text = Array(71).join('ê');
+        form.$('.o_input').val(text).trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '70 / 1 SMS (UNICODE) ', 'Should be "70 / 1 SMS (UNICODE) " for 70 x "ê"');
+        // Unicode with 71c
+        text = Array(72).join('ê');
+        form.$('.o_input').val(text).trigger('input');
+        assert.strictEqual(form.$('.o_sms_count').text(), '71 / 2 SMS (UNICODE) ', 'Should be "71 / 2 SMS (UNICODE) " for 71 x "ê"');
+        
+        form.destroy();
+    });
+});
+});
diff --git a/addons/sms/static/src/xml/sms_widget.xml b/addons/sms/static/src/xml/sms_widget.xml
new file mode 100644
index 00000000000..9969cf2b3c1
--- /dev/null
+++ b/addons/sms/static/src/xml/sms_widget.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+    <t t-name="sms.sms_count">
+        <span class="pull-right"><span class="text-muted o_sms_count"></span> <a href="https://iap-services.odoo.com/iap/sms/pricing" class="fa fa-lg fa-info"/></span>
+    </t>
+</templates>
diff --git a/addons/sms/views/templates.xml b/addons/sms/views/templates.xml
new file mode 100644
index 00000000000..15bf5fc1454
--- /dev/null
+++ b/addons/sms/views/templates.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="assets_backend" name="sms_assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/sms/static/src/js/sms_widget.js"></script>
+            </xpath>
+        </template>
+
+        <template id="qunit_suite" name="sms_widget_tests" inherit_id="web.qunit_suite">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/sms/static/src/tests/sms_widget_test.js"></script>
+            </xpath>
+        </template>
+    </data>
+</odoo>
diff --git a/addons/sms/wizard/send_sms.py b/addons/sms/wizard/send_sms.py
index 139f542e597..15d284e0879 100644
--- a/addons/sms/wizard/send_sms.py
+++ b/addons/sms/wizard/send_sms.py
@@ -71,8 +71,7 @@ class SendSMS(models.TransientModel):
             phone_numbers = []
             no_phone_partners = []
             for partner in partners:
-                default_field_name = 'mobile' if partner.mobile else 'phone'
-                number = self._sms_sanitization(partner, self.env.context.get('field_name') or default_field_name)
+                number = self._sms_sanitization(partner, self.env.context.get('field_name') or 'mobile')
                 if number:
                     phone_numbers.append(number)
                 else:
diff --git a/addons/sms/wizard/send_sms_views.xml b/addons/sms/wizard/send_sms_views.xml
index 34746c32825..165272737c3 100644
--- a/addons/sms/wizard/send_sms_views.xml
+++ b/addons/sms/wizard/send_sms_views.xml
@@ -9,7 +9,7 @@
                 <sheet>
                     <group>
                         <field name="recipients"/>
-                        <field name="message" widget="text"/>
+                        <field name="message" widget="sms_widget"/>
                     </group>
                 </sheet>
                 <footer>
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index aeeab1aa846..bc3110ae352 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -3,10 +3,10 @@
 # * stock
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Alexander Klockhaus <a.klockhaus@gmail.com>, 2017
@@ -14,7 +14,7 @@
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # aNj <anj2j@yahoo.de>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Akim Juillerat <akim.juillerat@camptocamp.com>, 2017
@@ -29,19 +29,20 @@
 # Philipp Hug <philipp@hug.cx>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: DE R1 <e2fes1@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,12 +124,12 @@ msgstr ""
 msgid ""
 "<br/>\n"
 "                    <strong>Here is your current inventory: </strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "<span class=\"o_stat_text\">Details</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
@@ -168,7 +169,7 @@ msgstr "<span><strong>Lieferadresse:</strong></span>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<span><strong>Partner Address:</strong></span>"
-msgstr ""
+msgstr "<span><strong/></span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
@@ -183,7 +184,7 @@ msgstr "<span>Neu</span>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<span>No reservation or quantity done yet.</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
@@ -206,7 +207,7 @@ msgid ""
 "<strong>\n"
 "                The done move line has been corrected.\n"
 "            </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
@@ -294,7 +295,7 @@ msgstr "<strong>Status</strong>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.message_head
 msgid "<strong>The initial demand has been updated.</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_inventory
@@ -495,7 +496,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "As soon as possible"
-msgstr ""
+msgstr "Sobald wie möglich"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -971,27 +972,27 @@ msgstr "Berechnen"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Versandkosten für DHL berechnen und versenden"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Versandkosten für FedEx berechnen und versenden"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Versandkosten für UPS berechnen und versenden"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Versandkosten für USPS berechnen und versenden"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Versandkosten für bpost berechnen und versenden"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
@@ -5384,7 +5385,7 @@ msgstr ""
 msgid ""
 "The backorder <a href=# data-oe-model=stock.picking data-oe-id=%d>%s</a> has"
 " been created."
-msgstr ""
+msgstr "<a href=# data-oe-model=stock.picking data-oe-id=%d></a>"
 
 #. module: stock
 #: sql_constraint:stock.location:0
@@ -5677,7 +5678,7 @@ msgid ""
 "receive the goods you are returning now, make sure to <b>reverse</b> the "
 "returned picking in order to avoid logistic rules to be applied again (which"
 " would create duplicated operations)"
-msgstr ""
+msgstr "<b/>"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_change_product_qty_new_quantity
@@ -6576,7 +6577,7 @@ msgstr ""
 msgid ""
 "You haven't entered <i>done</i> quantities, by clicking on <i>apply</i>\n"
 "                        Odoo will process all the <i>reserved</i> quantities."
-msgstr ""
+msgstr "<i/><i/><i/>"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:44
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index b88fc1b74c0..257e033871f 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -3,8 +3,8 @@
 # * stock
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
@@ -35,13 +35,14 @@
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Kiko <kiko@comunitea.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Kiko <kiko@comunitea.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -145,7 +146,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "<span class=\"o_stat_text\">Details</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
@@ -2631,6 +2632,7 @@ msgstr "Es la cantidad realizada editable"
 msgid ""
 "It is not possible to reserve more products of %s than you have in stock."
 msgstr ""
+"No es posible reservar más productos de %s de los que tiene en existencias."
 
 #. module: stock
 #: code:addons/stock/models/stock_quant.py:256
@@ -2638,6 +2640,8 @@ msgstr ""
 msgid ""
 "It is not possible to unreserve more products of %s than you have in stock."
 msgstr ""
+"No es posible deshacer la reserva de más productos de %s de los que tiene en"
+" existencias."
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_move_product_packaging
@@ -5074,7 +5078,7 @@ msgstr "Mostrar operaciones detalladas"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_show_lots_text
 msgid "Show Lots Text"
-msgstr ""
+msgstr "Mostrar texto de lotes"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_show_mark_as_todo
@@ -5761,6 +5765,8 @@ msgstr ""
 msgid ""
 "This location's usage cannot be changed to view as it contains products."
 msgstr ""
+"El uso de esta ubicación no puede cambiarse a \"vista\" puesto que contiene "
+"productos."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.stock_move_action
@@ -6627,6 +6633,10 @@ msgid ""
 "Please first validatethe first inventory adjustement with this product "
 "before creating another one."
 msgstr ""
+"No puedes tener dos ajustes de inventario en estado \"en progreso\" con el "
+"mismo producto(%s), misma ubicación(%s), mismo paquete, mismo propietario y "
+"mismo lote. Valide en primera instancia el primer ajuste de inventario con "
+"este producto antes de crear uno diferente."
 
 #. module: stock
 #: code:addons/stock/models/stock_inventory.py:159
@@ -6657,7 +6667,7 @@ msgstr "No puede dividir un movimiento realizado"
 msgid ""
 "You cannot take products from or deliver products to a location of type "
 "\"view\"."
-msgstr ""
+msgstr "No puede retirar o entregar productos a una ubicación de tipo \"vista\"."
 
 #. module: stock
 #: code:addons/stock/models/stock_move_line.py:152
@@ -6677,6 +6687,8 @@ msgid ""
 "You cannot validate a transfer if you have not processed any quantity for "
 "%s."
 msgstr ""
+"No puede validar una transferencia si no ha procesado ninguna cantidad para "
+"%s."
 
 #. module: stock
 #: code:addons/stock/models/stock_picking.py:656
@@ -6790,6 +6802,7 @@ msgstr "Debe proporcionar un lote / número de serie para %s."
 #, python-format
 msgid "You should not put the contents of a package in different locations."
 msgstr ""
+"No debería poner el contenido de un paquete en ubicaciones diferentes."
 
 #. module: stock
 #: code:addons/stock/models/product.py:369
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index ecae3799171..881f7059d4f 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -42,13 +42,14 @@
 # fr trans <e2ftrans1@yahoo.com>, 2017
 # Bertrand LATOUR <divoir@gmail.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -125,12 +126,12 @@ msgstr ""
 msgid ""
 "<br/>\n"
 "                    <strong>Here is your current inventory: </strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_inventory_form
 msgid "<span class=\"o_stat_text\">Details</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
@@ -170,7 +171,7 @@ msgstr "<span><strong>Adresse de livraison :</strong></span>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<span><strong>Partner Address:</strong></span>"
-msgstr ""
+msgstr "<span><strong/></span>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
@@ -185,7 +186,7 @@ msgstr "<span>Nouvelle</span>"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
 msgid "<span>No reservation or quantity done yet.</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
@@ -208,7 +209,7 @@ msgid ""
 "<strong>\n"
 "                The done move line has been corrected.\n"
 "            </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.report_picking
@@ -969,27 +970,27 @@ msgstr "Calculer"
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec DHL"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec FedEx"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec UPS"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec USPS"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec bpost"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_move_picking_form
@@ -5378,7 +5379,7 @@ msgstr ""
 msgid ""
 "The backorder <a href=# data-oe-model=stock.picking data-oe-id=%d>%s</a> has"
 " been created."
-msgstr ""
+msgstr "<a href=# data-oe-model=stock.picking data-oe-id=%d></a>"
 
 #. module: stock
 #: sql_constraint:stock.location:0
@@ -6027,7 +6028,7 @@ msgstr "Urgent"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_picking_type_use_existing_lots
 msgid "Use Existing Lots/Serial Numbers"
-msgstr ""
+msgstr "Utiliser les numéros de lot/série existants"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -6610,7 +6611,7 @@ msgstr "Vous devez définir un nom pour cette localisation."
 msgid ""
 "You haven't entered <i>done</i> quantities, by clicking on <i>apply</i>\n"
 "                        Odoo will process all the <i>reserved</i> quantities."
-msgstr ""
+msgstr "<i/><i/><i/>"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_picking_return.py:44
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 4f0e2e15b2e..b68c907c795 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -823,7 +823,8 @@ class StockMove(models.Model):
 
         # Find a candidate move line to update or create a new one.
         for reserved_quant, quantity in quants:
-            to_update = self.move_line_ids.filtered(lambda m: m.location_id.id == reserved_quant.location_id.id and m.lot_id.id == reserved_quant.lot_id.id and m.package_id.id == reserved_quant.package_id.id and m.owner_id.id == reserved_quant.owner_id.id)
+            to_update = self.move_line_ids.filtered(lambda m: m.product_id.tracking != 'serial' and
+                                                    m.location_id.id == reserved_quant.location_id.id and m.lot_id.id == reserved_quant.lot_id.id and m.package_id.id == reserved_quant.package_id.id and m.owner_id.id == reserved_quant.owner_id.id)
             if to_update:
                 to_update[0].with_context(bypass_reservation_update=True).product_uom_qty += self.product_id.uom_id._compute_quantity(quantity, self.product_uom, rounding_method='HALF-UP')
             else:
diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index a50bfc82ef0..e9614cfc531 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -340,8 +340,13 @@ class StockMoveLine(models.Model):
                 raise UserError(_('You can not delete product moves if the picking is done. You can only correct the done quantities.'))
             # Unlinking a move line should unreserve.
             if ml.product_id.type == 'product' and not ml.location_id.should_bypass_reservation() and not float_is_zero(ml.product_qty, precision_digits=precision):
-                self.env['stock.quant']._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id,
-                                                                   package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
+                try:
+                    self.env['stock.quant']._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=ml.lot_id, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
+                except UserError:
+                    if ml.lot_id:
+                        self.env['stock.quant']._update_reserved_quantity(ml.product_id, ml.location_id, -ml.product_qty, lot_id=False, package_id=ml.package_id, owner_id=ml.owner_id, strict=True)
+                    else:
+                        raise
         moves = self.mapped('move_id')
         res = super(StockMoveLine, self).unlink()
         if moves:
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 193246de1d6..1f3a31f46b6 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -606,6 +606,55 @@ class StockMove(TransactionCase):
         quants = self.env['stock.quant']._gather(self.product2, self.stock_location)
         self.assertEqual(len(quants), 0)
 
+    def test_mixed_tracking_reservation_8(self):
+        """ Send one product tracked by lot to a customer. In your stock, there are one tracked and
+        one untracked quant. Reserve the move, then edit the lot to one not present in stock. The
+        system will update the reservation and use the untracked quant. Now unreserve, no error
+        should happen
+        """
+        lot1 = self.env['stock.production.lot'].create({
+            'name': 'lot1',
+            'product_id': self.product2.id,
+        })
+
+        # at first, we only make the tracked quant available in stock to make sure this one is selected
+        self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1, lot_id=lot1)
+
+        # creation
+        move1 = self.env['stock.move'].create({
+            'name': 'test_mixed_tracking_reservation_7',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product2.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 1.0,
+        })
+        move1._action_confirm()
+        move1._action_assign()
+
+        self.assertEqual(move1.reserved_availability, 1.0)
+        self.assertEqual(move1.move_line_ids.lot_id.id, lot1.id)
+
+        # change the lot_id to one not available in stock while an untracked quant is available
+        self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 1)
+        lot2 = self.env['stock.production.lot'].create({
+            'name': 'lot2',
+            'product_id': self.product2.id,
+        })
+        move1.move_line_ids.lot_id = lot2
+        self.assertEqual(move1.reserved_availability, 1.0)
+        self.assertEqual(move1.move_line_ids.lot_id.id, lot2.id)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, strict=True), 0.0)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, lot_id=lot1, strict=True), 1.0)
+
+        # unreserve
+        move1._do_unreserve()
+
+        self.assertEqual(move1.reserved_availability, 0.0)
+        self.assertEqual(len(move1.move_line_ids), 0)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, strict=True), 1.0)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product2, self.stock_location, lot_id=lot1, strict=True), 1.0)
+
     def test_putaway_1(self):
         """ Receive products from a supplier. Check that putaway rules are rightly applied on
         the receipt move line.
@@ -756,6 +805,28 @@ class StockMove(TransactionCase):
         self.assertEqual(customer_quants.quantity, 30)
         self.assertEqual(customer_quants.reserved_quantity, 0)
 
+    def test_availability_5(self):
+        """ Check that rerun action assign only create new stock move
+        lines instead of adding quantity in existing one.
+        """
+        self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 2.0)
+        # move from shelf1
+        move = self.env['stock.move'].create({
+            'name': 'test_edit_moveline_1',
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product2.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 4.0,
+        })
+        move._action_confirm()
+        move._action_assign()
+
+        self.env['stock.quant']._update_available_quantity(self.product2, self.stock_location, 4.0)
+        move._action_assign()
+
+        self.assertEqual(len(move.move_line_ids), 4.0)
+
     def test_unreserve_1(self):
         """ Check that unreserving a stock move sets the products reserved as available and
         set the state back to confirmed.
diff --git a/addons/stock/tests/test_move2.py b/addons/stock/tests/test_move2.py
index 08e7bbfda00..d3a268799d7 100644
--- a/addons/stock/tests/test_move2.py
+++ b/addons/stock/tests/test_move2.py
@@ -1698,19 +1698,15 @@ class TestSinglePicking(TestStockCommon):
 
 class TestStockUOM(TestStockCommon):
     def setUp(self):
-        with registry().cursor() as cr:
-            env = api.Environment(cr, 1, {})
-            dp = env.ref('product.decimal_product_uom')
-            self.old_digits = dp.digits
-            dp.digits = 7
         super(TestStockUOM, self).setUp()
-
-    def tearDown(self):
-        super(TestStockUOM, self).tearDown()
-        with self.registry.cursor() as cr:
-            env = api.Environment(cr, 1, {})
-            dp = env.ref('product.decimal_product_uom')
-            dp.digits = self.old_digits
+        dp = self.env.ref('product.decimal_product_uom')
+        dp.digits = 7
+
+        # Trick: invoke the method 'precision_get' with the current environment.
+        # This fills in the cache of the method with the right value. If we
+        # don't do that, the registry will access the corresponding precision
+        # with a new cursor (LazyCursor), and get a different value!
+        self.assertEqual(dp.precision_get(dp.name), 7)
 
     def test_pickings_transfer_with_different_uom_and_back_orders(self):
         """ Picking transfer with diffrent unit of meassure. """
diff --git a/addons/stock_account/i18n/es.po b/addons/stock_account/i18n/es.po
index d5b2252cb35..b39dce88479 100644
--- a/addons/stock_account/i18n/es.po
+++ b/addons/stock_account/i18n/es.po
@@ -3,7 +3,7 @@
 # * stock_account
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
@@ -16,16 +16,17 @@
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Miguel Orueta <mo@landoo.es>, 2016
 # Glen Sojo <inactive+glen.sojo@transifex.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Gustavo Valverde, 2017
+# Antonio Trueba, 2017
 # Raquel Iciarte <ric@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-30 13:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
-"Last-Translator: Raquel Iciarte <ric@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -41,7 +42,7 @@ msgstr "Asiento Contable"
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_move_account_move_ids
 msgid "Account Move"
-msgstr ""
+msgstr "Movimiento de cuenta"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_category_property_form
@@ -65,17 +66,19 @@ msgid ""
 "Affect landed costs on receipt operations and split them among products to "
 "update their cost price."
 msgstr ""
+"Asuma los precios de entrega en operaciones de recibo y divídalos entre "
+"productos para actualizar sus precios de coste."
 
 #. module: stock_account
 #: selection:product.category,property_valuation:0
 msgid "Automated"
-msgstr ""
+msgstr "Automatizado"
 
 #. module: stock_account
 #: selection:product.category,property_cost_method:0
 #: selection:product.template,property_cost_method:0
 msgid "Average Cost (AVCO)"
-msgstr ""
+msgstr "Coste promedio (AVCO)"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
@@ -124,6 +127,8 @@ msgid ""
 "Changing your cost method is an important change that will impact your "
 "inventory valuation. Are you sure you want to make that change?"
 msgstr ""
+"Cambiar el método de coste es un cambio importante que repercutirá en su "
+"valoración de inventario. ¿Seguro que desea efectuar tal cambio?"
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_stock_inventory_accounting_date
@@ -159,7 +164,7 @@ msgstr "Coste"
 #: model:ir.model.fields,field_description:stock_account.field_product_product_cost_method
 #: model:ir.model.fields,field_description:stock_account.field_product_template_cost_method
 msgid "Cost Method"
-msgstr ""
+msgstr "Método de coste"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
@@ -181,7 +186,7 @@ msgstr "Cuenta en Contrapartida"
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_counterpart_account_id_required
 msgid "Counter-Part Account Required"
-msgstr ""
+msgstr "Cuenta de contrapartida requerida"
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_create_uid
@@ -202,7 +207,7 @@ msgstr "Nombre a mostrar"
 #: selection:product.category,property_cost_method:0
 #: selection:product.template,property_cost_method:0
 msgid "First In First Out (FIFO)"
-msgstr ""
+msgstr "Primeras entradas, primeras salidas (FIFO)"
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_inventory_accounting_date
@@ -226,7 +231,7 @@ msgstr ""
 #. module: stock_account
 #: model:ir.actions.act_window,help:stock_account.product_valuation_action
 msgid "If there are products, you will see its name and valuation."
-msgstr ""
+msgstr "Si hay productos, verá su nombre y valoración."
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.res_config_settings_view_form
@@ -296,6 +301,8 @@ msgid ""
 "Manual: The accounting entries to value the inventory are not posted automatically.\n"
 "        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company."
 msgstr ""
+"Manual: Los registros contables de valoración del inventario no se publican automáticamente.\n"
+" Automatizado: Se crea automáticamente un registro contable para evaluar el inventario cuando un producto entra o sale de la empresa."
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_product_category_property_valuation
@@ -304,6 +311,8 @@ msgid ""
 "        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.\n"
 "        "
 msgstr ""
+"Manual: Los registros contables de valoración del inventario no se publican automáticamente.\n"
+" Automatizado: Se crea automáticamente un registro contable para evaluar el inventario cuando un producto entra o sale de la empresa.\n"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -360,7 +369,7 @@ msgstr "Plantilla de producto"
 #. module: stock_account
 #: model:ir.actions.act_window,name:stock_account.product_valuation_action
 msgid "Product Valuation"
-msgstr ""
+msgstr "Validación de producto"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -370,7 +379,7 @@ msgstr "Cant."
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
 msgid "Quantity on Hand"
-msgstr ""
+msgstr "Cantidad disponible"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -385,7 +394,7 @@ msgstr "Cantidad restante"
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_move_remaining_value
 msgid "Remaining Value"
-msgstr ""
+msgstr "Valor restante"
 
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_stock_return_picking
@@ -395,7 +404,7 @@ msgstr "Albarán de devolución"
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
 msgid "Set standard cost"
-msgstr ""
+msgstr "Fijar coste estándar"
 
 #. module: stock_account
 #: selection:product.category,property_cost_method:0
@@ -408,7 +417,7 @@ msgstr "Precio estándar"
 #: code:addons/stock_account/models/product.py:150
 #, python-format
 msgid "Standard Price changed  - %s"
-msgstr ""
+msgstr "Precio estándar cambiado: %s"
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_product_product_property_cost_method
@@ -418,6 +427,9 @@ msgid ""
 "        Average Cost (AVCO): The products are valued at weighted average cost.\n"
 "        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first."
 msgstr ""
+"Precio estándar: Los productos se valoran según su coste estándar definido en el producto.\n"
+" Coste promedio (AVCO): Los productos se valoran según su coste promedio ponderado.\n"
+" Primeras entradas, primeras salidas (FIFO): Los productos se valoran dando por hecho que los primeros en entrar en la empresa son también los primeros en salir."
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_product_category_property_cost_method
@@ -427,6 +439,9 @@ msgid ""
 "        First In First Out (FIFO): The products are valued supposing those that enter the company first will also leave it first.\n"
 "        "
 msgstr ""
+"Precio estándar: Los productos se valoran según su coste estándar definido en el producto.\n"
+" Coste promedio (AVCO): Los productos se valoran según su coste promedio ponderado.\n"
+" Primeras entradas, primeras salidas (FIFO): Los productos se valoran dando por hecho que los primeros en entrar en la empresa son también los primeros en salir.\n"
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_product_category_property_stock_account_input_categ_id
@@ -485,7 +500,7 @@ msgstr "Cuenta de valoracion de existencias (salida)"
 #. module: stock_account
 #: model:ir.actions.server,name:stock_account.action_stock_account_valuation_report
 msgid "Stock Valuation Report"
-msgstr ""
+msgstr "Informe de valoración de existencias"
 
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_account_chart_template
@@ -499,6 +514,8 @@ msgid ""
 "The cost of %s is currently equal to 0. Change the cost or the configuration"
 " of your product to avoid an incorrect valuation."
 msgstr ""
+"El coste de %s es actualmente igual a 0. Cambie el coste o la configuración "
+"de su producto para evitar una valoración incorrecta."
 
 #. module: stock_account
 #: code:addons/stock_account/models/stock.py:309
@@ -507,6 +524,8 @@ msgid ""
 "The move lines are not in a consistent state: some are entering and other "
 "are leaving the company. "
 msgstr ""
+"Las líneas de movimiento no se encuentran en un estado consistente, pues "
+"algunas están entrando y otras están abandonado la empresa."
 
 #. module: stock_account
 #: code:addons/stock_account/models/stock.py:320
@@ -516,6 +535,9 @@ msgid ""
 "intercompany in a single step while they should go through the intercompany "
 "transit location."
 msgstr ""
+"Las líneas de movimiento no se encuentran en estados consistentes, pues "
+"están llevando a cabo una operación interempresarial en un solo paso "
+"mientras deberían pasar por la ubicación de tránsito interempresarial."
 
 #. module: stock_account
 #: code:addons/stock_account/models/stock.py:318
@@ -524,12 +546,14 @@ msgid ""
 "The move lines are not in a consistent states: they do not share the same "
 "origin or destination company."
 msgstr ""
+"Las líneas de movimiento no se encuentran en estados consistentes, puesto "
+"que no comparten la misma empresa de origen o de destino."
 
 #. module: stock_account
 #: model:ir.model.fields,field_description:stock_account.field_stock_move_to_refund
 #: model:ir.model.fields,field_description:stock_account.field_stock_return_picking_line_to_refund
 msgid "To Refund (update SO/PO)"
-msgstr ""
+msgstr "A reembolsar (actualizar SO/PO)"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
@@ -543,6 +567,8 @@ msgid ""
 "Trigger a decrease of the delivered/received quantity in the associated Sale"
 " Order/Purchase Order"
 msgstr ""
+"Originar una disminución de la cantidad entregada/recibida en la orden de "
+"venta/compra asociada"
 
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
@@ -552,7 +578,7 @@ msgstr "Unidad de medida"
 #. module: stock_account
 #: model:ir.ui.view,arch_db:stock_account.view_template_property_form
 msgid "Update Cost"
-msgstr ""
+msgstr "Actualizar coste"
 
 #. module: stock_account
 #: model:ir.model.fields,help:stock_account.field_stock_location_valuation_in_account_id
diff --git a/addons/stock_dropshipping/i18n/es.po b/addons/stock_dropshipping/i18n/es.po
index aea0b8b1994..31ebb560ce8 100644
--- a/addons/stock_dropshipping/i18n/es.po
+++ b/addons/stock_dropshipping/i18n/es.po
@@ -3,16 +3,17 @@
 # * stock_dropshipping
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Antonio Trueba, 2016
+# Martin Trigaux, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -43,7 +44,7 @@ msgstr "Línea de pedido de compra"
 #. module: stock_dropshipping
 #: model:ir.model.fields,field_description:stock_dropshipping.field_purchase_order_line_sale_line_id
 msgid "Sale Line"
-msgstr ""
+msgstr "Línea de venta"
 
 #. module: stock_dropshipping
 #: model:procurement.rule,name:stock_dropshipping.procurement_rule_drop_shipping
diff --git a/addons/stock_picking_batch/i18n/es.po b/addons/stock_picking_batch/i18n/es.po
index 7b02be1533c..c9ee4fe2226 100644
--- a/addons/stock_picking_batch/i18n/es.po
+++ b/addons/stock_picking_batch/i18n/es.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # José Vicente <txusev@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # José Matias Zuazo <jose.zuazo@tpsistemas.com.ar>, 2017
 # e2f_EPV Translator <e2f_EPV@outlook.com>, 2017
@@ -16,13 +16,14 @@
 # Sergio Flores <vitavitae1@gmail.com>, 2017
 # Ana Juaristi <ajuaristio@gmail.com>, 2017
 # Esteban Echeverry <tebanep@nubark.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Esteban Echeverry <tebanep@nubark.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -33,19 +34,19 @@ msgstr ""
 #. module: stock_picking_batch
 #: model:ir.model,name:stock_picking_batch.model_stock_picking_to_batch
 msgid "Add pickings to a batch picking"
-msgstr ""
+msgstr "Añadir albaranes a un albarán de remesa"
 
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
 msgid "Add pickings to batch"
-msgstr ""
+msgstr "Añadir albaranes a remesa"
 
 #. module: stock_picking_batch
 #: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_to_batch_action
 #: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_to_batch_action_stock_picking
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
 msgid "Add to Batch"
-msgstr ""
+msgstr "Añadir a remesa"
 
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.view_picking_internal_search_inherit_stock_picking_batch
@@ -60,12 +61,12 @@ msgstr "Por lotes"
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 #, python-format
 msgid "Batch Picking"
-msgstr ""
+msgstr "Albarán de remesa"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_name
 msgid "Batch Picking Name"
-msgstr ""
+msgstr "Nombre de albarán de remesa"
 
 #. module: stock_picking_batch
 #: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_batch_action
@@ -76,12 +77,12 @@ msgstr "Lotes de Operaciones"
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "Batch Pickings not finished"
-msgstr ""
+msgstr "Albaranes de remesa no finalizados"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_id_8938
 msgid "Batch associated to this picking"
-msgstr ""
+msgstr "Remesa asociada a este albarán"
 
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
@@ -102,7 +103,7 @@ msgstr "Cancelado"
 #. module: stock_picking_batch
 #: model:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action
 msgid "Click to create a Batch Picking."
-msgstr ""
+msgstr "Haga clic para crear un albarán de remesa."
 
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
@@ -211,12 +212,12 @@ msgstr "Última actualización el"
 #. module: stock_picking_batch
 #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_picking_ids
 msgid "List of picking associated to this batch"
-msgstr ""
+msgstr "Lista de albaranes asociados a esta remesa"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_name
 msgid "Name of the batch picking"
-msgstr ""
+msgstr "Nombre del albarán de remesa"
 
 #. module: stock_picking_batch
 #: code:addons/stock_picking_batch/models/stock_picking_batch.py:52
@@ -227,17 +228,17 @@ msgstr "Nada que imprimir."
 #. module: stock_picking_batch
 #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch_user_id
 msgid "Person responsible for this batch picking"
-msgstr ""
+msgstr "Persona responsable de este albarán de remesa"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_immediate_transfer_pick_to_backorder_ids
 msgid "Pick To Backorder"
-msgstr ""
+msgstr "Elegir para pedido en espera"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,help:stock_picking_batch.field_stock_immediate_transfer_pick_to_backorder_ids
 msgid "Picking to backorder"
-msgstr ""
+msgstr "Albarán para pedido pendiente"
 
 #. module: stock_picking_batch
 #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch_picking_ids
@@ -263,12 +264,12 @@ msgstr "En ejecución"
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
 msgid "Search Batch Picking"
-msgstr ""
+msgstr "Buscar albarán de remesa"
 
 #. module: stock_picking_batch
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form
 msgid "Select a batch"
-msgstr ""
+msgstr "Seleccionar remesa"
 
 #. module: stock_picking_batch
 #: code:addons/stock_picking_batch/models/stock_picking_batch.py:59
@@ -277,6 +278,8 @@ msgid ""
 "Some pickings are still waiting for goods. Please check or force their "
 "availability before setting this batch to done."
 msgstr ""
+"Algunos albaranes están aún en espera de mercancías. Verifique o fuerce su "
+"disponibilidad antes de fijar esta remesa como finalizada."
 
 #. module: stock_picking_batch
 #: code:addons/stock_picking_batch/models/stock_picking_batch.py:77
@@ -316,7 +319,7 @@ msgstr "Estado"
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
 #: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_tree
 msgid "Stock Batch Picking"
-msgstr ""
+msgstr "Albarán de remesa en existencias"
 
 #. module: stock_picking_batch
 #: model:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action
@@ -326,6 +329,10 @@ msgid ""
 "            It may also be useful to assign jobs (one person = one batch) or\n"
 "            help the timing management of operations (tasks to be done at 1pm)."
 msgstr ""
+"El albarán de remesa tiene como objetivo agrupar operaciones que pueden\n"
+" (deben) realizarse conjuntamente para así aumentar su eficacia.\n"
+" Podría estimarse también útil asignar labores (una persona = una remesa) o\n"
+" colaborar con la gestión del tiempo de las operaciones (tareas a terminar a la 1 p.m.)."
 
 #. module: stock_picking_batch
 #: model:ir.model,name:stock_picking_batch.model_stock_picking
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 3ef4a1a7f54..bba82bd3967 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -3,18 +3,18 @@
 # * survey
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Thomas Neu <t.neu@runbox.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
@@ -24,14 +24,15 @@
 # Katharina Moritz <kmo@e2f.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,6 +52,9 @@ msgid ""
 "                \n"
 "            "
 msgstr ""
+"<p/><p/><p><a href=\"__URL__\" style=\"margin-left: 85px; padding:5px 10px; "
+"border-radius: 3px; background-color:#875A7B; text-align:center; text-"
+"decoration:none; color:#F7FBFD;\"/></p><p/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_page_tree
@@ -140,7 +144,7 @@ msgstr "<i class=\"fa fa-list-alt\"/> Daten"
 msgid ""
 "<i class=\"fa fa-list-ol\"/>\n"
 "                    Most Common"
-msgstr ""
+msgstr "<i class=\"fa fa-list-ol\"/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -164,6 +168,8 @@ msgid ""
 "surveys</span><span class=\"label label-primary only_right_radius filter-"
 "finished\">Finished surveys</span>"
 msgstr ""
+"<span class=\"label label-default only_left_radius filter-all\"/><span "
+"class=\"label label-primary only_right_radius filter-finished\"/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.result_number
@@ -183,7 +189,7 @@ msgstr "<span class=\"label label-default only_left_radius\">Minimum </span>"
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.result_number
 msgid "<span class=\"label label-default only_left_radius\">Sum </span>"
-msgstr ""
+msgstr "<span class=\"label label-default only_left_radius\"/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.result
@@ -192,6 +198,8 @@ msgid ""
 "surveys</span><span class=\"label label-default only_right_radius filter-"
 "finished\">Finished surveys</span>"
 msgstr ""
+"<span class=\"label label-primary only_left_radius filter-all\"/><span "
+"class=\"label label-default only_right_radius filter-finished\"/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.no_result
@@ -200,7 +208,7 @@ msgid ""
 "                            <i style=\"font-size:1.8em\" class=\"fa fa-users pull-right\"/>\n"
 "                        </span>\n"
 "                        Sorry, No one answered this survey yet"
-msgstr ""
+msgstr "<span><i class=\"fa fa-users pull-right\" style=\"font-size:1.8em\"/></span>"
 
 #. module: survey
 #: code:addons/survey/models/survey.py:687
@@ -1677,7 +1685,7 @@ msgstr "Bewertung"
 msgid ""
 "YYYY-MM-DD\n"
 "                                            <i class=\"fa fa-calendar fa-2x\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar fa-2x\"/>"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 8d195068260..d72cebf6917 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -3,8 +3,8 @@
 # * survey
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
@@ -22,13 +22,14 @@
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
 # Fernando San Martín Woerner <fsnmartin@gmail.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -271,11 +272,14 @@ msgid ""
 "Add a list of email of recipients (will not be converted into contacts). "
 "Separated by commas, semicolons or newline..."
 msgstr ""
+"Añada un listado de correos electrónicos de destinatarios (no serán "
+"convertidos en contactos). Separados por comas, puntos y comas o saltos de "
+"línea..."
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_email_compose_message
 msgid "Add existing contacts..."
-msgstr ""
+msgstr "Añadir contactos existentes..."
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -1437,7 +1441,7 @@ msgstr "Página de la encuesta"
 #. module: survey
 #: model:ir.actions.server,name:survey.survey_action_server_clean_test_answers
 msgid "Survey: Clean test answers"
-msgstr ""
+msgstr "Encuesta: Limpiar respuestas de prueba"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form
@@ -1455,7 +1459,7 @@ msgstr "Test"
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_user_input_test_entry
 msgid "Test Entry"
-msgstr ""
+msgstr "Entrada de prueba"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_form
@@ -1521,7 +1525,7 @@ msgstr "Esta respuesta debe ser una dirección de correo electrónica"
 #: code:addons/survey/tests/test_survey.py:107
 #, python-format
 msgid "This is not a date"
-msgstr ""
+msgstr "Esto no es una fecha"
 
 #. module: survey
 #: code:addons/survey/models/survey.py:565
@@ -1600,7 +1604,7 @@ msgstr "Tipos de respuestas"
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_survey_view_search
 msgid "Upcoming Activities"
-msgstr ""
+msgstr "Próximas actividades"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_email_compose_message
@@ -1696,7 +1700,7 @@ msgstr "Votar"
 msgid ""
 "YYYY-MM-DD\n"
 "                                            <i class=\"fa fa-calendar fa-2x\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar fa-2x\"/>"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 4dd08a116ba..d3c1df1a32c 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Agathe Mollé <molleagathe@gmail.com>, 2016
@@ -16,8 +16,8 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
-# Bruno JOLIVEAU <bruno@joliveau.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Bruno JOLIVEAU, 2016
+# Florian Hatat, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
@@ -25,13 +25,14 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Lucas Deliege <lud@openerp.com>, 2017
 # fr rev <e2ffr04@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: fr rev <e2ffr04@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -1705,7 +1706,7 @@ msgstr "Voter"
 msgid ""
 "YYYY-MM-DD\n"
 "                                            <i class=\"fa fa-calendar fa-2x\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar fa-2x\"/>"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 06821cd55a3..363d2773ee3 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -3,27 +3,28 @@
 # * survey
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2016
 # mrshelly <mrshelly@hotmail.com>, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # waveyeung <waveyeung@qq.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
 # THL <wt39181819@gmail.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
-# xiangye xiao <xiangye.xiao@gmail.com>, 2016
+# fausthuang, 2016
+# xiangye xiao, 2016
 # 厦门-许舟 <windedge99@gmail.com>, 2017
 # liulixia <liu.lixia@elico-corp.com>, 2017
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -43,6 +44,9 @@ msgid ""
 "                \n"
 "            "
 msgstr ""
+"<p/><p/><p><a href=\"__URL__\" style=\"margin-left: 85px; padding:5px 10px; "
+"border-radius: 3px; background-color:#875A7B; text-align:center; text-"
+"decoration:none; color:#F7FBFD;\"/></p><p/>"
 
 #. module: survey
 #: model:ir.ui.view,arch_db:survey.survey_page_tree
@@ -1657,7 +1661,7 @@ msgstr "投票"
 msgid ""
 "YYYY-MM-DD\n"
 "                                            <i class=\"fa fa-calendar fa-2x\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar fa-2x\"/>"
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form
diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py
index 34956afe545..435dc3d9b50 100644
--- a/addons/test_mail/tests/test_mail_message.py
+++ b/addons/test_mail/tests/test_mail_message.py
@@ -111,6 +111,15 @@ class TestMessageValues(common.BaseFunctionalTest, common.MockEmails):
         self.assertNotIn('mail.test', msg.message_id)
         self.assertNotIn('-%d-' % self.alias_record.id, msg.message_id)
 
+    def test_mail_message_base64_image(self):
+        msg = self.env['mail.message'].sudo(self.user_employee).create({
+            'body': 'taratata <img src="data:image/png;base64,iV/+OkI=" width="2"> <img src="data:image/png;base64,iV/+OkI=" width="2">',
+        })
+        self.assertEqual(len(msg.attachment_ids), 1)
+        body = '<p>taratata <img src="/web/image/%s?access_token=%s" alt="image0" width="2"> <img src="/web/image/%s?access_token=%s" alt="image0" width="2"></p>'
+        body = body % (msg.attachment_ids[0].id, msg.attachment_ids[0].access_token, msg.attachment_ids[0].id, msg.attachment_ids[0].access_token)
+        self.assertEqual(msg.body, body)
+
 
 class TestMessageAccess(common.BaseFunctionalTest, common.MockEmails):
 
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index dc47a1f19e6..1dcfb891805 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -276,7 +276,7 @@ class TestHeavyMailPerformance(TransactionCase):
         customer_id = self.customer.id
         user_id = self.user_portal.id
 
-        with self.assertQueryCount(admin=325, emp=388):  # test_mail only: 308 - 368
+        with self.assertQueryCount(admin=325, emp=389):  # test_mail only: 308 - 368
             rec = self.env['mail.test.full'].create({
                 'name': 'Test',
                 'umbrella_id': umbrella_id,
diff --git a/addons/transifex/i18n/es.po b/addons/transifex/i18n/es.po
index a50fdcdcc0e..8254ea870ac 100644
--- a/addons/transifex/i18n/es.po
+++ b/addons/transifex/i18n/es.po
@@ -3,14 +3,15 @@
 # * transifex
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Antonio Trueba <atgayol@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -22,12 +23,12 @@ msgstr ""
 #: model:ir.ui.view,arch_db:transifex.ir_translation_dialog_view_tree_transifex
 #: model:ir.ui.view,arch_db:transifex.ir_translation_view_tree_transifex
 msgid "Transifex"
-msgstr ""
+msgstr "Transifex"
 
 #. module: transifex
 #: model:ir.model.fields,field_description:transifex.field_ir_translation_transifex_url
 msgid "Transifex URL"
-msgstr ""
+msgstr "URL de Transifex"
 
 #. module: transifex
 #: model:ir.model,name:transifex.model_ir_translation
diff --git a/addons/utm/i18n/es.po b/addons/utm/i18n/es.po
index f62951c1ba0..05c840b522a 100644
--- a/addons/utm/i18n/es.po
+++ b/addons/utm/i18n/es.po
@@ -3,7 +3,7 @@
 # * utm
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
@@ -15,13 +15,14 @@
 # José Vicente <txusev@gmail.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -233,6 +234,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Esto es un nombre que facilita el seguimiento de sus diferentes proyectos de"
+" campaña (por ejemplo: Rebajas de otoño, Especial de Navidad)"
 
 #. module: utm
 #: model:ir.model.fields,help:utm.field_account_invoice_medium_id
@@ -243,6 +246,8 @@ msgstr ""
 #: model:ir.model.fields,help:utm.field_utm_mixin_medium_id
 msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
 msgstr ""
+"Esto es el método de entrega (por ejemplo: correo postal, correo "
+"electrónico, pancarta publicitaria)"
 
 #. module: utm
 #: model:ir.model.fields,help:utm.field_account_invoice_source_id
@@ -255,6 +260,8 @@ msgid ""
 "This is the source of the link, e.g. Search Engine, another domain, or name "
 "of email list"
 msgstr ""
+"Esto es la fuente del enlace (por ejemplo: motor de búsqueda, dominio "
+"alterno o nombre en listado de correos electrónicos)"
 
 #. module: utm
 #: model:utm.source,name:utm.utm_source_twitter
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index c995bce1747..e5a7ba5c1ab 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -4,34 +4,35 @@
 # 
 # Translators:
 # Henry Mineehen <info@mineehen.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Thorsten Brandt <thorsten.brandt@web.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # aNj <anj2j@yahoo.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: DE T1 <e2f8846@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,12 +245,12 @@ msgstr ""
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu_secondary
 msgid "<span class=\"oe_logo_edit\">Edit Company data</span>"
-msgstr ""
+msgstr "<span class=\"oe_logo_edit\"/>"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu_secondary
 msgid "<span>Odoo</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: web
 #. openerp-web
@@ -2911,7 +2912,7 @@ msgid ""
 "Your installation of Wkhtmltopdf seems to be broken. The report will be "
 "shown in html.<br><br><a href=\"http://wkhtmltopdf.org/\" "
 "target=\"_blank\">wkhtmltopdf.org</a>"
-msgstr ""
+msgstr "<br><br><a href=\"http://wkhtmltopdf.org/\" target=\"_blank\"></a>"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index b8fdb9fd654..ef95370064a 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
@@ -29,13 +29,14 @@
 # Esteban Echeverry <tebanep@nubark.com>, 2017
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Cristian Salamea <ovnicraft@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Cristian Salamea <ovnicraft@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -62,7 +63,7 @@ msgstr " [Yo]"
 #: code:addons/web/static/src/js/chrome/search_filters.js:226
 #, python-format
 msgid " and "
-msgstr ""
+msgstr "y"
 
 #. module: web
 #. openerp-web
@@ -92,7 +93,7 @@ msgstr "No se pudo cargar la vista"
 #: code:addons/web/static/src/xml/base.xml:612
 #, python-format
 msgid "# Code editor"
-msgstr ""
+msgstr "# editor de código"
 
 #. module: web
 #. openerp-web
@@ -214,7 +215,7 @@ msgstr "'%s' no es un entero correcto"
 #: code:addons/web/static/src/js/fields/field_utils.js:483
 #, python-format
 msgid "'%s' is not a correct monetary field"
-msgstr ""
+msgstr "\"%s\" no es un campo monetario correcto"
 
 #. module: web
 #. openerp-web
@@ -242,7 +243,7 @@ msgstr "(sin etiqueta)"
 #: code:addons/web/static/src/js/fields/field_utils.js:239
 #, python-format
 msgid "1 record"
-msgstr ""
+msgstr "1 registro"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu_secondary
@@ -262,20 +263,23 @@ msgid ""
 "A popup window with your report was blocked.  You may need to change your "
 "browser settings to allow popup windows for this page."
 msgstr ""
+"Se ha bloqueado una ventana emergente que contenía su informe. Puede cambiar"
+" los ajustes de su navegador para permitir ventanas emergentes en esta "
+"página."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:589
 #, python-format
 msgid "ALL"
-msgstr ""
+msgstr "TODO"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:590
 #, python-format
 msgid "ANY"
-msgstr ""
+msgstr "CUALQUIERA"
 
 #. module: web
 #. openerp-web
@@ -378,7 +382,7 @@ msgstr "Añadir grupo personalizado"
 #: code:addons/web/static/src/xml/base.xml:597
 #, python-format
 msgid "Add filter"
-msgstr ""
+msgstr "Añadir filtro"
 
 #. module: web
 #. openerp-web
@@ -392,14 +396,14 @@ msgstr "Añadir nueva columna"
 #: code:addons/web/static/src/xml/base.xml:657
 #, python-format
 msgid "Add new value"
-msgstr ""
+msgstr "Añadir valor nuevo"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/fields/basic_fields.js:1576
 #, python-format
 msgid "Add to Favorites"
-msgstr ""
+msgstr "Añadir a favoritos"
 
 #. module: web
 #. openerp-web
@@ -457,7 +461,7 @@ msgstr "Todos los usuarios"
 #: code:addons/web/static/src/xml/base.xml:146
 #, python-format
 msgid "An error occurred"
-msgstr ""
+msgstr "Se ha producido un error"
 
 #. module: web
 #. openerp-web
@@ -467,6 +471,8 @@ msgid ""
 "An unknown CORS error occured. The error probably originates from a "
 "JavaScript file served from a different origin."
 msgstr ""
+"Se ha producido un error desconocido de CORS. El error es debido "
+"probablemente a un archivo de JavaScript procedente de un origen distinto."
 
 #. module: web
 #. openerp-web
@@ -563,6 +569,8 @@ msgid ""
 "Binary fields can not be exported to Excel unless their content is "
 "base64-encoded. That does not seem to be the case for %s."
 msgstr ""
+"No es posible exportar los campos binarios a Excel a menos que su contenido "
+"tenga codificación de base64. Ese no parece ser el caso de %s."
 
 #. module: web
 #. openerp-web
@@ -626,7 +634,7 @@ msgstr "Cancelar"
 #: code:addons/web/static/src/js/views/graph/graph_renderer.js:68
 #, python-format
 msgid "Cannot render chart with mode : "
-msgstr ""
+msgstr "No es posible renderizar el gráfico con el modo:"
 
 #. module: web
 #. openerp-web
@@ -744,7 +752,7 @@ msgstr "¡Copiado!"
 #: code:addons/web/static/src/xml/base.xml:144
 #, python-format
 msgid "Copy the full error to clipboard"
-msgstr ""
+msgstr "Copiar el error al completo en el portapapeles"
 
 #. module: web
 #. openerp-web
@@ -791,7 +799,7 @@ msgstr "Crear"
 #: code:addons/web/static/src/js/views/form/form_controller.js:479
 #, python-format
 msgid "Create "
-msgstr ""
+msgstr "Crear"
 
 #. module: web
 #. openerp-web
@@ -926,7 +934,7 @@ msgstr "Descartar"
 #: code:addons/web/static/src/js/widgets/data_export.js:336
 #, python-format
 msgid "Do you really want to delete this export template?"
-msgstr ""
+msgstr "¿Seguro que desea eliminar esta plantilla de exportación?"
 
 #. module: web
 #. openerp-web
@@ -954,7 +962,7 @@ msgstr "Dominio"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:520
 #, python-format
 msgid "Domain error"
-msgstr ""
+msgstr "Error de dominio"
 
 #. module: web
 #. openerp-web
@@ -1016,7 +1024,7 @@ msgstr "Editar columna"
 #: code:addons/web/static/src/xml/base.xml:565
 #, python-format
 msgid "Edit Domain"
-msgstr ""
+msgstr "Editar dominio"
 
 #. module: web
 #. openerp-web
@@ -1070,7 +1078,7 @@ msgstr "Calendarios de todos"
 #: code:addons/web/static/src/js/views/calendar/calendar_model.js:511
 #, python-format
 msgid "Everything"
-msgstr ""
+msgstr "Todo"
 
 #. module: web
 #. openerp-web
@@ -1307,7 +1315,7 @@ msgstr ""
 #: code:addons/web/static/src/js/core/dialog.js:250
 #, python-format
 msgid "I am sure about this."
-msgstr ""
+msgstr "Estoy seguro de esto."
 
 #. module: web
 #. openerp-web
@@ -1361,7 +1369,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:563
 #, python-format
 msgid "Invalid domain"
-msgstr ""
+msgstr "Dominio inválido"
 
 #. module: web
 #. openerp-web
@@ -1369,21 +1377,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:694
 #, python-format
 msgid "Invalid field chain"
-msgstr ""
+msgstr "Cadena de campos inválida"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/graph/graph_renderer.js:67
 #, python-format
 msgid "Invalid mode for chart"
-msgstr ""
+msgstr "Modo de gráfico inválido"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/debug_manager.js:208
 #, python-format
 msgid "JS Mobile Tests"
-msgstr ""
+msgstr "Pruebas de JS Mobile"
 
 #. module: web
 #. openerp-web
@@ -1491,7 +1499,7 @@ msgstr ""
 #. module: web
 #: model:ir.ui.view,arch_db:web.external_layout_boxed
 msgid "Mail:"
-msgstr ""
+msgstr "Correo:"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login_layout
@@ -1511,21 +1519,21 @@ msgstr "Gestionar Filtros"
 #: code:addons/web/static/src/xml/base.xml:596
 #, python-format
 msgid "Match"
-msgstr ""
+msgstr "Combinar"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:603
 #, python-format
 msgid "Match records with"
-msgstr ""
+msgstr "Combinar registros con"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:601
 #, python-format
 msgid "Match records with the following rule:"
-msgstr ""
+msgstr "Combinar registros con la siguiente regla:"
 
 #. module: web
 #. openerp-web
@@ -1634,7 +1642,7 @@ msgstr "Mi cuenta Odoo.com"
 #: code:addons/web/static/src/xml/base.xml:591
 #, python-format
 msgid "NONE"
-msgstr ""
+msgstr "NINGUNO"
 
 #. module: web
 #. openerp-web
@@ -1728,7 +1736,7 @@ msgstr "Metadatos no disponibles"
 #: code:addons/web/static/src/js/fields/field_utils.js:237
 #, python-format
 msgid "No records"
-msgstr ""
+msgstr "No hay registros"
 
 #. module: web
 #. openerp-web
@@ -1780,7 +1788,7 @@ msgstr "Odoo Apps estará disponible en breve"
 #: code:addons/web/static/src/js/services/crash_manager.js:156
 #, python-format
 msgid "Odoo Client Error"
-msgstr ""
+msgstr "Error del cliente de Odoo"
 
 #. module: web
 #. openerp-web
@@ -1794,14 +1802,14 @@ msgstr "Odoo Enterprise"
 #: code:addons/web/static/src/js/services/crash_manager.js:118
 #, python-format
 msgid "Odoo Error"
-msgstr ""
+msgstr "Error de Odoo"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/services/crash_manager.js:58
 #, python-format
 msgid "Odoo Session Expired"
-msgstr ""
+msgstr "Sesión de Odoo expirada"
 
 #. module: web
 #. openerp-web
@@ -1809,7 +1817,7 @@ msgstr ""
 #: code:addons/web/static/src/js/services/crash_manager.js:197
 #, python-format
 msgid "Odoo Warning"
-msgstr ""
+msgstr "Advertencia de Odoo"
 
 #. module: web
 #. openerp-web
@@ -1864,6 +1872,8 @@ msgstr "El único valor válido es un entero."
 msgid ""
 "Only employee can access this database. Please contact the administrator."
 msgstr ""
+"Solo los empleados pueden acceder a esta base de datos. Contacte con el "
+"administrador."
 
 #. module: web
 #. openerp-web
@@ -1910,13 +1920,13 @@ msgid ""
 "                    <span class=\"page\"/>\n"
 "                    of\n"
 "                    <span class=\"topage\"/>"
-msgstr ""
+msgstr "<span class=\"page\"/><span class=\"topage\"/>"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.external_layout_boxed
 #: model:ir.ui.view,arch_db:web.external_layout_standard
 msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
-msgstr ""
+msgstr "<span class=\"page\"/><span class=\"topage\"/>"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login
@@ -1969,7 +1979,7 @@ msgstr "Pivote"
 #: code:addons/web/static/src/js/views/list/list_renderer.js:327
 #, python-format
 msgid "Please click on the \"save\" button first"
-msgstr ""
+msgstr "Haga clic primero en el botón \"Guardar\""
 
 #. module: web
 #. openerp-web
@@ -2025,6 +2035,8 @@ msgstr ""
 msgid ""
 "Please use the copy button to report the error to your support service."
 msgstr ""
+"Utilice el botón \"Copiar\" para informar al servicio de asistencia del "
+"error."
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu_secondary
@@ -2080,7 +2092,7 @@ msgstr ""
 #: code:addons/web/static/src/js/widgets/model_field_selector.js:455
 #, python-format
 msgid "Relation not allowed"
-msgstr ""
+msgstr "Relación no permitida"
 
 #. module: web
 #. openerp-web
@@ -2108,7 +2120,7 @@ msgstr "Eliminar Todo"
 #: code:addons/web/static/src/js/fields/basic_fields.js:1576
 #, python-format
 msgid "Remove from Favorites"
-msgstr ""
+msgstr "Eliminar de favoritos"
 
 #. module: web
 #. openerp-web
@@ -2136,14 +2148,14 @@ msgstr "Restaurar"
 #: code:addons/web/static/src/xml/kanban.xml:27
 #, python-format
 msgid "Restore Records"
-msgstr ""
+msgstr "Recuperar registros"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:223
 #, python-format
 msgid "Run JS Mobile Tests"
-msgstr ""
+msgstr "Ejecutar pruebas de JS Mobile"
 
 #. module: web
 #. openerp-web
@@ -2255,7 +2267,7 @@ msgstr "Buscar: "
 #: code:addons/web/static/src/xml/base.xml:151
 #, python-format
 msgid "See details"
-msgstr ""
+msgstr "Ver detalles"
 
 #. module: web
 #. openerp-web
@@ -2276,7 +2288,7 @@ msgstr "Escoge <i class=\"fa fa-database\"/>"
 #: code:addons/web/static/src/xml/base.xml:567
 #, python-format
 msgid "Select a model to add a filter."
-msgstr ""
+msgstr "Seleccione un modelo para añadir un filtro."
 
 #. module: web
 #. openerp-web
@@ -2394,7 +2406,7 @@ msgstr "Activar"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:567
 #, python-format
 msgid "Syntax error"
-msgstr ""
+msgstr "Error de sintaxis"
 
 #. module: web
 #. openerp-web
@@ -2408,7 +2420,7 @@ msgstr "Tome un minuto para ir por un café,<br />porque está cargando ..."
 #: code:addons/web/static/src/js/widgets/switch_company_menu.js:44
 #, python-format
 msgid "Tap on the list to change company"
-msgstr ""
+msgstr "Pulse en la lista para cambiar la empresa"
 
 #. module: web
 #. openerp-web
@@ -2429,7 +2441,7 @@ msgstr "Tel.:"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:567
 #, python-format
 msgid "The domain you entered is not properly formed"
-msgstr ""
+msgstr "El dominio introducido no se encuentra debidamente formado"
 
 #. module: web
 #. openerp-web
@@ -2439,6 +2451,8 @@ msgid ""
 "The field chain is not valid. Did you maybe use a non-existing field name or"
 " followed a non-relational field?"
 msgstr ""
+"La cadena de campos no es válida. ¿Es posible que haya utilizado un nombre "
+"de campo inexistente o seguido un campo no relacional?"
 
 #. module: web
 #. openerp-web
@@ -2477,6 +2491,8 @@ msgid ""
 "The record has been modified, your changes will be discarded. Do you want to"
 " proceed?"
 msgstr ""
+"El registro ha sido modificado. Sus cambios se descartarán. ¿Desea "
+"continuar?"
 
 #. module: web
 #. openerp-web
@@ -2503,6 +2519,9 @@ msgid ""
 "There are too many rows (%s rows, limit: 65535) to export as Excel 97-2003 "
 "(.xls) format. Consider splitting the export."
 msgstr ""
+"Hay demasiadas filas (%s filas; límite: 65535) para llevar a cabo una "
+"exportación correcta a Excel 97-2003 en formato .xls. Considere dividir la "
+"exportación."
 
 #. module: web
 #. openerp-web
@@ -2516,7 +2535,7 @@ msgstr "Hubo un problema subiendo el fichero"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:459
 #, python-format
 msgid "This domain is not supported."
-msgstr ""
+msgstr "Este dominio no es compatible."
 
 #. module: web
 #. openerp-web
@@ -2656,7 +2675,7 @@ msgstr "Indefinido"
 #: code:addons/web/static/src/js/chrome/abstract_web_client.js:187
 #, python-format
 msgid "Unknown CORS error"
-msgstr ""
+msgstr "Error de CORS desconocido"
 
 #. module: web
 #. openerp-web
@@ -2677,7 +2696,7 @@ msgstr "Sin nombre"
 #: code:addons/web/static/src/js/views/pivot/pivot_view.js:96
 #, python-format
 msgid "Untitled"
-msgstr ""
+msgstr "Sin título"
 
 #. module: web
 #. openerp-web
@@ -2765,23 +2784,23 @@ msgstr "Aviso"
 #. module: web
 #: model:ir.ui.view,arch_db:web.benchmark_suite
 msgid "Web Benchmarks"
-msgstr ""
+msgstr "Criterios de red"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.qunit_mobile_suite
 msgid "Web Mobile Tests"
-msgstr ""
+msgstr "Pruebas de red móvil"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "Web Tests"
-msgstr ""
+msgstr "Pruebas de red"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.external_layout_boxed
 #: model:ir.ui.view,arch_db:web.external_layout_standard
 msgid "Web:"
-msgstr ""
+msgstr "Red:"
 
 #. module: web
 #. openerp-web
@@ -2803,7 +2822,7 @@ msgstr "Semana "
 #: code:addons/web/static/src/js/widgets/rainbow_man.js:45
 #, python-format
 msgid "Well Done!"
-msgstr ""
+msgstr "¡Bien hecho!"
 
 #. module: web
 #. openerp-web
@@ -2867,6 +2886,7 @@ msgstr "Está creando un nuevo %s, ¿está seguro de que no existe ya?"
 #, python-format
 msgid "You cannot follow relations for this field chain construction"
 msgstr ""
+"No puede seguir las relaciones de esta construcción de cadena de campos"
 
 #. module: web
 #: code:addons/web/controllers/main.py:787
@@ -2936,7 +2956,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/kanban/kanban_record.js:199
 #, python-format
 msgid "[No widget %s]"
-msgstr ""
+msgstr "[No hay widget %s]"
 
 #. module: web
 #. openerp-web
@@ -2978,7 +2998,7 @@ msgstr "Hace una hora"
 #: code:addons/web/static/src/xml/base.xml:596
 #, python-format
 msgid "all records"
-msgstr ""
+msgstr "todos los registros"
 
 #. module: web
 #: model:ir.model,name:web.model_base
@@ -2990,7 +3010,7 @@ msgstr "base"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:28
 #, python-format
 msgid "child of"
-msgstr ""
+msgstr "descendiente de"
 
 #. module: web
 #. openerp-web
@@ -3050,14 +3070,14 @@ msgstr "es"
 #: code:addons/web/static/src/js/chrome/search_filters.js:183
 #, python-format
 msgid "is after"
-msgstr ""
+msgstr "está detrás de"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome/search_filters.js:184
 #, python-format
 msgid "is before"
-msgstr ""
+msgstr "está antes de"
 
 #. module: web
 #. openerp-web
@@ -3168,7 +3188,7 @@ msgstr "menor o igual que"
 #: code:addons/web/static/src/xml/base.xml:686
 #, python-format
 msgid "not"
-msgstr ""
+msgstr "No"
 
 #. module: web
 #. openerp-web
@@ -3189,35 +3209,35 @@ msgstr "no es un número válido"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:24
 #, python-format
 msgid "not contains"
-msgstr ""
+msgstr "no contiene"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:26
 #, python-format
 msgid "not in"
-msgstr ""
+msgstr "no en"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:658
 #, python-format
 msgid "not set (false)"
-msgstr ""
+msgstr "no fijado (falso)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:605
 #, python-format
 msgid "of the following rules:"
-msgstr ""
+msgstr "de la siguientes reglas:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:620
 #, python-format
 msgid "of:"
-msgstr ""
+msgstr "de:"
 
 #. module: web
 #. openerp-web
@@ -3232,14 +3252,14 @@ msgstr "o"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:29
 #, python-format
 msgid "parent of"
-msgstr ""
+msgstr "matriz de"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:561
 #, python-format
 msgid "record(s)"
-msgstr ""
+msgstr "registro(s)"
 
 #. module: web
 #. openerp-web
@@ -3253,11 +3273,11 @@ msgstr "restante)"
 #: code:addons/web/static/src/xml/base.xml:686
 #, python-format
 msgid "set"
-msgstr ""
+msgstr "fijado"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/domain_selector.js:658
 #, python-format
 msgid "set (true)"
-msgstr ""
+msgstr "fijado (verdadero)"
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index b3b0001596c..507e9abdf53 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -6,25 +6,26 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
 # Olivier Dony <odo@odoo.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Christophe CHAUVET <christophe.chauvet@gmail.com>, 2017
 # Fabien Pinckaers <fp@openerp.com>, 2017
-# Jerther <jerther@gmail.com>, 2017
+# Jerther, 2017
 # Rémi CAZENAVE <remi@le-filament.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Rémi CAZENAVE <remi@le-filament.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -1899,7 +1900,7 @@ msgid ""
 "                    <span class=\"page\"/>\n"
 "                    of\n"
 "                    <span class=\"topage\"/>"
-msgstr ""
+msgstr "<span class=\"page\"/><span class=\"topage\"/>"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.external_layout_boxed
@@ -2916,7 +2917,7 @@ msgid ""
 "Your installation of Wkhtmltopdf seems to be broken. The report will be "
 "shown in html.<br><br><a href=\"http://wkhtmltopdf.org/\" "
 "target=\"_blank\">wkhtmltopdf.org</a>"
-msgstr ""
+msgstr "<br><br><a href=\"http://wkhtmltopdf.org/\" target=\"_blank\"></a>"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/static/src/js/_deprecated/data.js b/addons/web/static/src/js/_deprecated/data.js
index be5496c55c7..eb70f330076 100644
--- a/addons/web/static/src/js/_deprecated/data.js
+++ b/addons/web/static/src/js/_deprecated/data.js
@@ -314,6 +314,7 @@ var DataSet =  Class.extend(mixins.PropertiesMixin, {
      */
     init: function (parent, model, context) {
         mixins.PropertiesMixin.init.call(this);
+        this.setParent(parent);
         this.model = model;
         this.context = context || {};
         this.index = null;
diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js
index 2dd69d7426c..b4b192c1ea9 100644
--- a/addons/web/static/src/js/chrome/abstract_web_client.js
+++ b/addons/web/static/src/js/chrome/abstract_web_client.js
@@ -245,6 +245,10 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, {
      * identified by strings. Each time a title part is changed, all parts
      * are gathered, ordered by alphabetical order and displayed in the title
      * of the window separated by ``-``.
+     *
+     * @private
+     * @param {string} part
+     * @param {string} title
      */
     set_title_part: function (part, title) {
         var tmp = _.clone(this.get("title_part"));
diff --git a/addons/web/static/src/js/chrome/control_panel.js b/addons/web/static/src/js/chrome/control_panel.js
index fb8bd5dec6c..16b22761581 100644
--- a/addons/web/static/src/js/chrome/control_panel.js
+++ b/addons/web/static/src/js/chrome/control_panel.js
@@ -79,7 +79,7 @@ var ControlPanel = Widget.extend({
             this.template = template;
         }
 
-        this.bus = new Bus();
+        this.bus = new Bus(this);
         this.bus.on("update", this, this.update);
     },
     /**
diff --git a/addons/web/static/src/js/chrome/root_widget.js b/addons/web/static/src/js/chrome/root_widget.js
new file mode 100644
index 00000000000..9cf0515b134
--- /dev/null
+++ b/addons/web/static/src/js/chrome/root_widget.js
@@ -0,0 +1,7 @@
+odoo.define('root.widget', function (require) {
+"use strict";
+
+var webClient = require('web.web_client');
+
+return webClient;
+});
diff --git a/addons/web/static/src/js/core/abstract_service.js b/addons/web/static/src/js/core/abstract_service.js
index cbd6c1322ca..14efef09b39 100644
--- a/addons/web/static/src/js/core/abstract_service.js
+++ b/addons/web/static/src/js/core/abstract_service.js
@@ -6,7 +6,6 @@ var Mixins = require('web.mixins');
 var ServicesMixin = require('web.ServicesMixin');
 
 var AbstractService = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
-    Services: [],
     dependencies: [],
     name: null,
     init: function (parent) {
@@ -15,13 +14,5 @@ var AbstractService = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
     },
 });
 
-var realExtend = AbstractService.extend;
-
-AbstractService.extend = function () {
-    var Service = realExtend.apply(this, arguments);
-    AbstractService.prototype.Services.push(Service);
-    return Service;
-};
-
 return AbstractService;
 });
diff --git a/addons/web/static/src/js/core/bus.js b/addons/web/static/src/js/core/bus.js
index 92278e0f1d6..5257453edab 100644
--- a/addons/web/static/src/js/core/bus.js
+++ b/addons/web/static/src/js/core/bus.js
@@ -10,8 +10,9 @@ var mixins = require('web.mixins');
  * @class Bus
  */
 return Class.extend(mixins.EventDispatcherMixin, {
-    init: function () {
-        mixins.EventDispatcherMixin.init.call(this, arguments);
+    init: function (parent) {
+        mixins.EventDispatcherMixin.init.call(this);
+        this.setParent(parent);
     },
 });
 
diff --git a/addons/web/static/src/js/core/registry.js b/addons/web/static/src/js/core/registry.js
index d70c09e4ae0..f925b0ea30a 100644
--- a/addons/web/static/src/js/core/registry.js
+++ b/addons/web/static/src/js/core/registry.js
@@ -25,6 +25,7 @@ var Registry = Class.extend({
      */
     init: function (mapping) {
         this.map = Object.create(mapping || null);
+        this.listeners = []; // listening callbacks on newly added items.
     },
 
     //--------------------------------------------------------------------------
@@ -34,12 +35,17 @@ var Registry = Class.extend({
     /**
      * Add a key (and a value) to the registry.
      *
+     * Notify the listeners on newly added item in the registry.
+     *
      * @param {string} key
      * @param {any} value
      * @returns {Registry} can be used to chain add calls.
      */
     add: function (key, value) {
         this.map[key] = value;
+        _.each(this.listeners, function (callback) {
+            callback(key, value);
+        });
         return this;
     },
     /**
@@ -89,6 +95,14 @@ var Registry = Class.extend({
         }
         return null;
     },
+    /**
+     * Register a callback to execute when items are added to the registry.
+     *
+     * @param {function} callback function with parameters (key, value).
+     */
+    onAdd: function (callback) {
+        this.listeners.push(callback);
+    },
 });
 
 return Registry;
diff --git a/addons/web/static/src/js/core/service_mixins.js b/addons/web/static/src/js/core/service_mixins.js
index d5abf727704..4ab0a361988 100644
--- a/addons/web/static/src/js/core/service_mixins.js
+++ b/addons/web/static/src/js/core/service_mixins.js
@@ -1,58 +1,86 @@
 odoo.define('web.ServiceProviderMixin', function (require) {
 "use strict";
 
-var AbstractService = require('web.AbstractService');
-var utils = require('web.utils');
+var core = require('web.core');
 
 var ServiceProviderMixin = {
-    services: {},
-    init: function () {
+    services: {}, // dict containing deployed service instances
+    UndeployedServices: {}, // dict containing classes of undeployed services
+    /**
+     * @override
+     */
+    init: function (parent) {
+        var self = this;
         // to properly instantiate services with this as parent, this mixin
         // assumes that it is used along the EventDispatcherMixin, and that
         // EventDispatchedMixin's init is called first
-        var self = this;
-        // as EventDispatcherMixin's init is already called, this handler has to
-        // be bound manually
+        // as EventDispatcherMixin's init is already called, this handler has
+        // to be bound manually
         this.on('call_service', this, this._call_service.bind(this));
 
-        var sortedServices = this._sortServices(AbstractService.prototype.Services);
-        _.each(sortedServices, function (Service) {
-            var service = new Service(self);
-            self.services[service.name] = service;
+        // add already registered services from the service registry
+        _.each(core.serviceRegistry.map, function (Service, serviceName) {
+            self.UndeployedServices[serviceName] = Service;
+        });
+        this._deployServices();
+
+        // listen on newly added services
+        core.serviceRegistry.onAdd(function (serviceName, Service) {
+            self.UndeployedServices[serviceName] = Service;
+            self._deployServices();
         });
     },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+     * @private
+     */
+    _deployServices: function () {
+        var self = this;
+        var done = false;
+        while (!done) {
+            var Service = _.find(this.UndeployedServices, function (Service) {
+                // no missing dependency
+                return !_.some(Service.prototype.dependencies, function (depName) {
+                    return !self.services[depName];
+                });
+            });
+            if (Service) {
+                this.services[Service.prototype.name] = new Service(this);
+                delete this.UndeployedServices[Service.prototype.name];
+            } else {
+                done = true;
+            }
+        }
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * Call the 'service', using data from the 'event' that
+     * has triggered the service call.
+     *
+     * For the ajax service, the arguments are extended with
+     * the target so that it can call back the caller.
+     *
+     * @private
+     * @param  {OdooEvent} event
+     */
     _call_service: function (event) {
-        var service = this.services[event.data.service];
         var args = event.data.args || [];
-        // ajax service uses an extra 'target' argument for rpc
         if (event.data.service === 'ajax' && event.data.method === 'rpc') {
+            // ajax service uses an extra 'target' argument for rpc
             args = args.concat(event.target);
         }
+        var service = this.services[event.data.service];
         var result = service[event.data.method].apply(service, args);
         event.data.callback(result);
     },
-    _sortServices: function (services) {
-        var nodes = {};
-        // Create nodes (services)
-        _.each(services, function (Service) {
-            nodes[Service.prototype.name] = Service.prototype.dependencies;
-        });
-        var sorted;
-        try {
-            sorted = utils.topologicalSort(nodes);
-        } catch (err) {
-            console.warn('topologicalSort Error:', err.message);
-            sorted = nodes;
-        }
-        // Sort services based on sorted
-        // Note: we convert sorted to an object key=>index for efficiency
-        var sortedObj = _.invert(_.object(_.pairs(sorted)));
-        sorted = _.sortBy(services, function (Service) {
-            return sortedObj[Service.prototype.name];
-        });
-
-        return sorted;
-    },
 };
 
 return ServiceProviderMixin;
@@ -69,6 +97,11 @@ var rpc = require('web.rpc');
  * @name ServicesMixin
  */
 var ServicesMixin = {
+    /**
+     * @param  {string} service
+     * @param  {string} method
+     * @return {any} result of the service called
+     */
     call: function (service, method) {
         var args = Array.prototype.slice.call(arguments, 2);
         var result;
diff --git a/addons/web/static/src/js/core/session.js b/addons/web/static/src/js/core/session.js
index e17b1b0c7fc..4760867e99f 100644
--- a/addons/web/static/src/js/core/session.js
+++ b/addons/web/static/src/js/core/session.js
@@ -29,7 +29,8 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
           "override_session" is set to true.
      */
     init: function (parent, origin, options) {
-        mixins.EventDispatcherMixin.init.call(this, parent);
+        mixins.EventDispatcherMixin.init.call(this);
+        this.setParent(parent);
         options = options || {};
         this.module_list = (options.modules && options.modules.slice()) || (window.odoo._modules && window.odoo._modules.slice()) || [];
         this.server = null;
diff --git a/addons/web/static/src/js/core/utils.js b/addons/web/static/src/js/core/utils.js
index 0b4af722203..1bdd9e70a69 100644
--- a/addons/web/static/src/js/core/utils.js
+++ b/addons/web/static/src/js/core/utils.js
@@ -301,37 +301,6 @@ var utils = {
         return fn(mod, Math.floor(x));
     },
     /**
-     * Topological sort of nodes
-     *
-     * @param {Object} nodes where key is name of node, and value is list of
-     *                       names of dependent nodes.
-     * @param {string[]} nodes[name] list of named dependencies of node having
-     *                       'name' as its name.
-     * @return {string[]} topological sort of nodes by their names.
-     * @throws {Error} if there is at least one circular
-     *                       dependency between nodes
-     */
-    topologicalSort: function (nodes) {
-        var sorted = [];
-        var unresolved = nodes;
-        while (!_.isEmpty(unresolved)) {
-            // Get all nodes that have no dependency
-            var resolvable = _.pick(unresolved, function (dependencies, name) {
-                return _.isEmpty(_.difference(dependencies, sorted));
-            });
-            if (_.isEmpty(resolvable)) {
-                throw new Error("Circular dependency detected");
-            }
-            // Append them to sorted
-            sorted = _.union(sorted, _.keys(resolvable));
-            // Remove these nodes from unresolved
-            _.each(resolvable, function (dependencies, name) {
-                unresolved = _.omit(unresolved, name);
-            });
-        }
-        return sorted;
-    },
-    /**
      * performs a half up rounding with a fixed amount of decimals, correcting for float loss of precision
      * See the corresponding float_round() in server/tools/float_utils.py for more info
      * @param {Number} value the value to be rounded
diff --git a/addons/web/static/src/js/services/ajax_service.js b/addons/web/static/src/js/services/ajax_service.js
index 480549347d4..3446f651a59 100644
--- a/addons/web/static/src/js/services/ajax_service.js
+++ b/addons/web/static/src/js/services/ajax_service.js
@@ -2,6 +2,7 @@ odoo.define('web.AjaxService', function (require) {
 "use strict";
 
 var AbstractService = require('web.AbstractService');
+var core = require('web.core');
 var session = require('web.session');
 
 var AjaxService = AbstractService.extend({
@@ -21,6 +22,8 @@ var AjaxService = AbstractService.extend({
     },
 });
 
+core.serviceRegistry.add('ajax', AjaxService);
+
 return AjaxService;
 
 });
diff --git a/addons/web/static/src/js/services/core.js b/addons/web/static/src/js/services/core.js
index 73071a2a65d..522d6b07302 100644
--- a/addons/web/static/src/js/services/core.js
+++ b/addons/web/static/src/js/services/core.js
@@ -41,6 +41,7 @@ return {
     crash_registry: new Registry(),
     search_filters_registry: new Registry(),
     search_widgets_registry: new Registry(),
+    serviceRegistry: new Registry(),
     /**
      * @type {String}
      */
diff --git a/addons/web/static/src/js/services/local_storage_service.js b/addons/web/static/src/js/services/local_storage_service.js
index a4527026238..7a8c803a0f9 100644
--- a/addons/web/static/src/js/services/local_storage_service.js
+++ b/addons/web/static/src/js/services/local_storage_service.js
@@ -2,6 +2,7 @@ odoo.define('web.LocalStorageService', function (require) {
 'use strict';
 
 var AbstractService = require('web.AbstractService');
+var core = require('web.core');
 var localStorage = require('web.local_storage');
 
 var LocalStorageService = AbstractService.extend({
@@ -20,6 +21,8 @@ var LocalStorageService = AbstractService.extend({
     }
 });
 
+core.serviceRegistry.add('local_storage', LocalStorageService);
+
 return LocalStorageService;
 
 });
diff --git a/addons/web/static/src/js/services/report_service.js b/addons/web/static/src/js/services/report_service.js
index a2bb8759a24..cfd62c0499f 100644
--- a/addons/web/static/src/js/services/report_service.js
+++ b/addons/web/static/src/js/services/report_service.js
@@ -6,6 +6,7 @@ odoo.define('web.ReportService', function (require) {
  */
 
 var AbstractService = require('web.AbstractService');
+var core = require('web.core');
 
 var ReportService = AbstractService.extend({
     name: 'report',
@@ -28,6 +29,8 @@ var ReportService = AbstractService.extend({
     },
 });
 
+core.serviceRegistry.add('report', ReportService);
+
 return ReportService;
 
 });
diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index a696f05bffe..9853f279794 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -181,21 +181,23 @@ var AbstractView = Class.extend({
      */
     getController: function (parent) {
         var self = this;
+        // check if a model already exists, as if not, one will be created and
+        // we'll have to set the controller as its parent
+        var alreadyHasModel = !!this.model;
         return $.when(this._loadData(parent), ajax.loadLibs(this)).then(function () {
-            var model = self.getModel();
-            var state = model.get(arguments[0]);
+            var state = self.model.get(arguments[0]);
             var renderer = self.getRenderer(parent, state);
             var Controller = self.Controller || self.config.Controller;
             var controllerParams = _.extend({
                 initialState: state,
             }, self.controllerParams);
-            var controller = new Controller(parent, model, renderer, controllerParams);
+            var controller = new Controller(parent, self.model, renderer, controllerParams);
             renderer.setParent(controller);
 
-            if (!self.model) {
+            if (!alreadyHasModel) {
                 // if we have a model, it already has a parent. Otherwise, we
                 // set the controller, so the rpcs from the model actually work
-                model.setParent(controller);
+                self.model.setParent(controller);
             }
             return controller;
         });
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index c4dff8fad2e..2ddadfb0027 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -514,7 +514,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
                 // TODO this will tell the renderer to rerender the widget that
                 // asked for the discard but will unfortunately lose the click
                 // made on another row if any
-                self._confirmChange(self.handle, [ev.data.fieldName], ev)
+                self._confirmChange(recordID, [ev.data.fieldName], ev)
                     .always(ev.data.onSuccess);
             })
             .fail(ev.data.onFailure);
diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js
index f0d41f31f49..977674c022a 100644
--- a/addons/web/static/src/js/views/basic/basic_renderer.js
+++ b/addons/web/static/src/js/views/basic/basic_renderer.js
@@ -30,6 +30,7 @@ var BasicRenderer = AbstractRenderer.extend({
         this.activeActions = params.activeActions;
         this.viewType = params.viewType;
         this.mode = params.mode || 'readonly';
+        this.widgets = [];
     },
     /**
      * This method has two responsabilities: find every invalid fields in the
@@ -95,6 +96,9 @@ var BasicRenderer = AbstractRenderer.extend({
             return this._render().then(_.constant([]));
         }
 
+        // reset all widgets (from the <widget> tag) if any:
+        _.invoke(this.widgets, 'updateState', state);
+
         var defs = [];
 
         // Reset all the field widgets that are marked as changed and the ones
@@ -254,7 +258,10 @@ var BasicRenderer = AbstractRenderer.extend({
             if ('readonly' in modifiers && element.widget) {
                 var mode = modifiers.readonly ? 'readonly' : modifiersData.baseMode;
                 if (mode !== element.widget.mode) {
-                    self._rerenderFieldWidget(element.widget, record, mode);
+                    self._rerenderFieldWidget(element.widget, record, {
+                        keepBaseMode: true,
+                        mode: mode,
+                    });
                     return; // Rerendering already applied the modifiers, no need to go further
                 }
             }
@@ -406,12 +413,25 @@ var BasicRenderer = AbstractRenderer.extend({
      * @param {Object} record
      * @param {jQuery|AbstractField} [element]
      * @param {Object} [options]
-     * @param {Object} [options.callback] - the callback to call on registration
-     *                                    and on modifiers updates
+     * @param {Object} [options.callback] the callback to call on registration
+     *   and on modifiers updates
+     * @param {boolean} [options.keepBaseMode=false] this function registers the
+     *   'baseMode' of the node; this is a field widget specific settings which
+     *   represents the generic mode of the widget, regardless of its modifiers
+     *   (the interesting case is the list view: all widgets are supposed to be
+     *   in the baseMode 'readonly', except the ones that are in the line that
+     *   is currently being edited).
+     *   With option 'keepBaseMode' set to true, the current baseMode of the
+     *   node isn't overridden (this is particularily useful when a field widget
+     *   is re-rendered because its readonly modifier changed, as in this case,
+     *   we don't want to change its base mode).
+     * @param {string} [options.mode] the 'baseMode' of the node is set to this
+     *   value (if not given, it is set to this.mode, the mode of the renderer)
      * @returns {Object} for code efficiency, returns the last evaluated
-     *                   modifiers for the given node and record.
+     *   modifiers for the given node and record.
      */
     _registerModifiers: function (node, record, element, options) {
+        options = options || {};
         // Check if we already registered the modifiers for the given node
         // If yes, this is simply an update of the related element
         // If not, check the modifiers to see if it needs registration
@@ -428,12 +448,11 @@ var BasicRenderer = AbstractRenderer.extend({
                 this.allModifiersData.push(modifiersData);
             }
         }
-        // we register here the base mode of the node.  This is a field widget
-        // specific settings which represents the generic mode for the widget,
-        // regardless of its modifiers.  The interesting case is the list view:
-        // all widgets are supposed to be in the baseMode 'readonly', except the
-        // ones that are in the line that is currently being edited.
-        modifiersData.baseMode = (options && options.mode) || this.mode;
+
+        // Compute node's base mode if necessary
+        if (!options.keepBaseMode) {
+            modifiersData.baseMode = options.mode || this.mode;
+        }
 
         // Evaluate if necessary
         if (!modifiersData.evaluatedModifiers[record.id]) {
@@ -497,13 +516,16 @@ var BasicRenderer = AbstractRenderer.extend({
      * @private
      * @param {Object} node
      * @param {Object} record
-     * @param {Object} [options]
+     * @param {Object} [options] passed to @_registerModifiers
+     * @param {string} [options.mode] either 'edit' or 'readonly' (defaults to
+     *   this.mode, the mode of the renderer)
      * @returns {jQueryElement}
      */
     _renderFieldWidget: function (node, record, options) {
+        options = options || {};
         var fieldName = node.attrs.name;
         // Register the node-associated modifiers
-        var mode = options && options.mode || this.mode;
+        var mode = options.mode || this.mode;
         var modifiers = this._registerModifiers(node, record, null, options);
         // Initialize and register the widget
         // Readonly status is known as the modifiers have just been registered
@@ -545,7 +567,8 @@ var BasicRenderer = AbstractRenderer.extend({
                         && !element.widget.isSet()
                     ));
                 },
-                mode: mode
+                keepBaseMode: !!options.keepBaseMode,
+                mode: mode,
             });
             self._postProcessField(widget, node);
         });
@@ -596,6 +619,8 @@ var BasicRenderer = AbstractRenderer.extend({
         var Widget = widgetRegistry.get(node.attrs.name);
         var widget = new Widget(this, record, node);
 
+        this.widgets.push(widget);
+
         // Prepare widget rendering and save the related deferred
         var def = widget._widgetRenderAndInsert(function () {});
         if (def.state() === 'pending') {
@@ -616,11 +641,11 @@ var BasicRenderer = AbstractRenderer.extend({
      * @private
      * @param {Widget} widget
      * @param {Object} record
-     * @param {string} mode either 'readonly' or 'edit'
+     * @param {Object} [options] options passed to @_renderFieldWidget
      */
-    _rerenderFieldWidget: function (widget, record, mode) {
+    _rerenderFieldWidget: function (widget, record, options) {
         // Render the new field widget
-        var $el = this._renderFieldWidget(widget.__node, record, {mode: mode});
+        var $el = this._renderFieldWidget(widget.__node, record, options);
         widget.$el.replaceWith($el);
 
         // Destroy the old widget and position the new one at the old one's
diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js
index fffdb66b509..601752ce532 100644
--- a/addons/web/static/src/js/views/list/list_renderer.js
+++ b/addons/web/static/src/js/views/list/list_renderer.js
@@ -71,6 +71,7 @@ var ListRenderer = BasicRenderer.extend({
      */
     updateState: function (state, params) {
         this._processColumns(params.columnInvisibleFields || {});
+        this.selection = [];
         return this._super.apply(this, arguments);
     },
 
@@ -202,9 +203,11 @@ var ListRenderer = BasicRenderer.extend({
                 var field = self.state.fields[column.attrs.name];
                 var value = aggregateValues[column.attrs.name].value;
                 var help = aggregateValues[column.attrs.name].help;
-                var formattedValue = field_utils.format[field.type](value, field, {
-                    escape: true,
-                });
+                var formatFunc = field_utils.format[column.attrs.widget];
+                if (!formatFunc) {
+                    formatFunc = field_utils.format[field.type];
+                }
+                var formattedValue = formatFunc(value, field, {escape: true});
                 $cell.addClass('o_list_number').attr('title', help).html(formattedValue);
             }
             return $cell;
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 7eb2ba4bc6b..99a5e4ee334 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -545,7 +545,6 @@ var PivotModel = AbstractModel.extend({
             var data = Array.prototype.slice.call(arguments);
             if (data[0][0].__count === 0) {
                 self.data.has_data = false;
-                return;
             }
             self._prepareData(data);
         });
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js
index 23e59b2f03d..1ac0e56b7bd 100644
--- a/addons/web/static/tests/chrome/action_manager_tests.js
+++ b/addons/web/static/tests/chrome/action_manager_tests.js
@@ -1333,6 +1333,7 @@ QUnit.module('ActionManager', {
             actions: this.actions,
             archs: this.archs,
             data: this.data,
+            services: [ReportService],
             mockRPC: function (route, args) {
                 assert.step(args.method || route);
                 if (route === '/report/check_wkhtmltopdf') {
@@ -1340,7 +1341,6 @@ QUnit.module('ActionManager', {
                 }
                 return this._super.apply(this, arguments);
             },
-            services: [ReportService],
             session: {
                 get_file: function (params) {
                     assert.step(params.url);
@@ -1373,6 +1373,7 @@ QUnit.module('ActionManager', {
             actions: this.actions,
             archs: this.archs,
             data: this.data,
+            services: [ReportService],
             mockRPC: function (route, args) {
                 assert.step(args.method || route);
                 if (route === '/report/check_wkhtmltopdf') {
@@ -1380,7 +1381,6 @@ QUnit.module('ActionManager', {
                 }
                 return this._super.apply(this, arguments);
             },
-            services: [ReportService],
             session: {
                 get_file: function (params) {
                     assert.step(params.url);
@@ -1427,6 +1427,7 @@ QUnit.module('ActionManager', {
             actions: this.actions,
             archs: this.archs,
             data: this.data,
+            services: [ReportService],
             mockRPC: function (route, args) {
                 assert.step(args.method || route);
                 if (route === '/report/check_wkhtmltopdf') {
@@ -1437,7 +1438,6 @@ QUnit.module('ActionManager', {
                 }
                 return this._super.apply(this, arguments);
             },
-            services: [ReportService],
             session: {
                 get_file: function (params) {
                     assert.step(params.url); // should not be called
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 0a1fd9128e6..ecedd4c5bc5 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -6271,7 +6271,7 @@ QUnit.module('relational_fields', {
                 }
                 if (args.method === 'write') {
                     assert.deepEqual(args.args[1].timmy, [[6,  false, [12]]],
-                        'should properly write ids')
+                        'should properly write ids');
                 }
                 return this._super.apply(this, arguments);
             },
@@ -9354,7 +9354,7 @@ QUnit.module('relational_fields', {
         $input = form.$('.o_field_many2manytags span[data-id=13]'); // selects 'red' tag
         $input.click(); // opens the colorpicker dropdown
         assert.ok(form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox'), "should have a checkbox in the colorpicker dropdown menu");
-        
+
         $input.click();
         var $checkBox = form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox input');
         assert.notOk($checkBox.is(':checked'), "should have unticked checkbox in colorpicker dropdown menu");
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index d08beffb977..2d8e719ade4 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -19,7 +19,6 @@ var core = require('web.core');
 var dom = require('web.dom');
 var session = require('web.session');
 var MockServer = require('web.MockServer');
-var utils = require('web.utils');
 var Widget = require('web.Widget');
 
 var DebouncedField = basic_fields.DebouncedField;
@@ -218,6 +217,7 @@ function createAsyncView(params) {
     return view.getController(widget).then(function (view) {
         // override the view's 'destroy' so that it calls 'destroy' on the widget
         // instead, as the widget is the parent of the view and the mockServer.
+        view.__destroy = view.destroy;
         view.destroy = function () {
             // remove the override to properly destroy the view and its children
             // when it will be called the second time (by its parent)
@@ -400,7 +400,7 @@ function addMockEnvironment(widget, params) {
     // Dispatch service calls
     // Note: some services could call other services at init,
     // Which is why we have to init services after that
-    var services = {};
+    var services = {ajax: null}; // mocked ajax service already loaded
     intercept(widget, 'call_service', function (ev) {
         var args, result;
         if (ev.data.service === 'ajax') {
@@ -415,36 +415,22 @@ function addMockEnvironment(widget, params) {
         }
         ev.data.callback(result);
     });
-    // Instantiate services
-    // Note: ensure topological sort of services based on their dependencies
-    var sortServices = function (services) {
-        // Create nodes (services), with ajax already loaded
-        var nodes = { ajax: [] };
-        _.each(services, function (Service) {
-            nodes[Service.prototype.name] = Service.prototype.dependencies;
+
+    // Deploy services
+    var done = false;
+    while (!done) {
+        var index = _.findIndex(params.services, function (Service) {
+            return !_.some(Service.prototype.dependencies, function (depName) {
+                return !_.has(services, depName);
+            });
         });
-        var sorted;
-        try {
-            sorted = utils.topologicalSort(nodes);
-        } catch (err) {
-            console.warn('topologicalSort Error:', err.message);
-            sorted = nodes;
+        if (index !== -1) {
+            var Service = params.services.splice(index, 1)[0];
+            services[Service.prototype.name] = new Service(widget);
+        } else {
+            done = true;
         }
-        // Remove ajax from sorted
-        sorted = _.without(sorted, 'ajax');
-        // Sort services based on sorted
-        // Note: we convert sorted to an object key=>index for efficiency
-        var sortedObj = _.invert(_.object(_.pairs(sorted)));
-        sorted = _.sortBy(services, function (Service) {
-            return sortedObj[Service.prototype.name];
-        });
-        return sorted;
-    };
-    var sortedServices = sortServices(params.services);
-    _.each(sortedServices, function (Service) {
-        var service = new Service(widget);
-        services[service.name] = service;
-    });
+    }
 
     intercept(widget, 'load_action', function (event) {
         mockServer.performRpc('/web/action/load', {
@@ -680,47 +666,83 @@ function removeSrcAttribute($el, widget) {
 
 var patches = {};
 /**
- * Patches a given Class with the given properties.
+ * Patches a given Class or Object with the given properties.
  *
- * @param {Class} Klass
+ * @param {Class|Object} target
  * @param {Object} props
  */
-function patch (Klass, props) {
+function patch (target, props) {
     var patchID = _.uniqueId('patch_');
-    Klass.__patchID = patchID;
+    target.__patchID = patchID;
     patches[patchID] = {
-        Klass: Klass,
+        target: target,
         otherPatchedProps: [],
         ownPatchedProps: [],
     };
-    _.each(props, function (value, key) {
-        if (Klass.prototype.hasOwnProperty(key)) {
-            patches[patchID].ownPatchedProps.push({
-                key: key,
-                initialValue: Klass.prototype[key],
-            });
-        } else {
-            patches[patchID].otherPatchedProps.push(key);
-        }
-    });
-    Klass.include(props);
+    if (target.prototype) {
+        _.each(props, function (value, key) {
+            if (target.prototype.hasOwnProperty(key)) {
+                patches[patchID].ownPatchedProps.push({
+                    key: key,
+                    initialValue: target.prototype[key],
+                });
+            } else {
+                patches[patchID].otherPatchedProps.push(key);
+            }
+        });
+        target.include(props);
+    } else {
+        _.each(props, function (value, key) {
+            if (key in target) {
+                var oldValue = target[key];
+                patches[patchID].ownPatchedProps.push({
+                    key: key,
+                    initialValue: oldValue,
+                });
+                if (typeof value === 'function') {
+                    target[key] = function () {
+                        var oldSuper = this._super;
+                        this._super = oldValue;
+                        var result = value.apply(this, arguments);
+                        if (oldSuper === undefined) {
+                            delete this._super;
+                        } else {
+                            this._super = oldSuper;
+                        }
+                        return result;
+                    };
+                } else {
+                    target[key] = value;
+                }
+            } else {
+                patches[patchID].otherPatchedProps.push(key);
+                target[key] = value;
+            }
+        });
+    }
 }
 /**
- * Unpatches a given Class.
+ * Unpatches a given Class or Object.
  *
- * @param {Class} Klass
+ * @param {Class|Object} target
  */
-function unpatch(Klass) {
-    var patchID = Klass.__patchID;
+function unpatch(target) {
+    var patchID = target.__patchID;
     var patch = patches[patchID];
     _.each(patch.ownPatchedProps, function (p) {
-        Klass[p.key] = p.initialValue;
-    });
-    _.each(patch.otherPatchedProps, function (key) {
-        delete Klass.prototype[key];
+        target[p.key] = p.initialValue;
     });
+    if (target.prototype) {
+        _.each(patch.otherPatchedProps, function (key) {
+            delete target.prototype[key];
+        });
+    } else {
+        _.each(patch.otherPatchedProps, function (key) {
+            delete target[key];
+        });
+    }
     delete patches[patchID];
-    delete Klass.__patchID;
+    delete target.__patchID;
 }
 
 // Loading static files cannot be properly simulated when their real content is
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index 3bc412910c2..478f53331b4 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -5,6 +5,7 @@ var CalendarView = require('web.CalendarView');
 var CalendarRenderer = require('web.CalendarRenderer');
 var Dialog = require('web.Dialog');
 var fieldUtils = require('web.field_utils');
+var mixins = require('web.mixins');
 var testUtils = require('web.test_utils');
 var session = require('web.session');
 
@@ -1629,6 +1630,63 @@ QUnit.module('Views', {
         calendar.destroy();
     });
 
+    QUnit.test('check if the view destroys all widgets and instances', function (assert) {
+        assert.expect(1);
+
+        var instanceNumber = 0;
+        testUtils.patch(mixins.ParentedMixin, {
+            init: function () {
+                instanceNumber++;
+                return this._super.apply(this, arguments);
+            },
+            destroy: function () {
+                if (!this.isDestroyed()) {
+                    instanceNumber--;
+                }
+                return this._super.apply(this, arguments);
+            }
+        });
+
+        var params = {
+            View: CalendarView,
+            model: 'event',
+            data: this.data,
+            arch:
+            '<calendar class="o_calendar_test" '+
+                'event_open_popup="true" '+
+                'date_start="start_date" '+
+                'all_day="allday" '+
+                'mode="week" '+
+                'attendee="partner_ids" '+
+                'color="partner_id">'+
+                    '<field name="name"/>'+
+                    '<filter name="user_id" avatar_field="image"/>'+
+                    '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+            '</calendar>',
+            archs: archs,
+            viewOptions: {
+                initialDate: initialDate,
+            },
+        };
+
+        var calendar = createView(params);
+        calendar.destroy();
+
+        var initialInstanceNumber = instanceNumber;
+        instanceNumber = 0;
+
+        calendar = createView(params);
+
+        // call destroy function of controller to ensure that it correctly destroys everything
+        calendar.__destroy();
+
+        assert.strictEqual(instanceNumber, initialInstanceNumber + 3, "every widget must be destroyed exept the parent");
+
+        calendar.destroy();
+
+        testUtils.unpatch(mixins.ParentedMixin);
+    });
+
     QUnit.test('create an event (async dialog) [REQUIRE FOCUS]', function (assert) {
         assert.expect(3);
 
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 37420e0f076..5b0dd69ddd4 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -7,6 +7,7 @@ var config = require('web.config');
 var core = require('web.core');
 var fieldRegistry = require('web.field_registry');
 var FormView = require('web.FormView');
+var mixins = require('web.mixins');
 var pyeval = require('web.pyeval');
 var testUtils = require('web.test_utils');
 var widgetRegistry = require('web.widget_registry');
@@ -629,7 +630,7 @@ QUnit.module('Views', {
     });
 
     QUnit.test('readonly attrs on fields are re-evaluated on field change', function (assert) {
-        assert.expect(3);
+        assert.expect(4);
 
         var form = createView({
             View: FormView,
@@ -655,6 +656,9 @@ QUnit.module('Views', {
         form.$('.o_field_boolean input').click();
         assert.strictEqual(form.$('span[name="foo"]').length, 1,
             "the foo field widget should have been rerendered to now be readonly again");
+        form.$('.o_field_boolean input').click();
+        assert.strictEqual(form.$('input[name="foo"]').length, 1,
+            "the foo field widget should have been rerendered to now be editable again");
 
         form.destroy();
     });
@@ -6249,6 +6253,41 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('basic support for widgets', function (assert) {
+        assert.expect(1);
+
+        var MyWidget = Widget.extend({
+            init: function (parent, dataPoint) {
+                this.data = dataPoint.data;
+            },
+            start: function () {
+                this.$el.text(this.data.foo + "!");
+            },
+            updateState: function (dataPoint) {
+                this.$el.text(dataPoint.data.foo + "!");
+            },
+        });
+        widgetRegistry.add('test', MyWidget);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<field name="foo"/>' +
+                    '<widget name="test"/>' +
+                '</form>',
+        });
+
+        form.$('input[name="foo"]').val("I am alive").trigger('input');
+        assert.strictEqual(form.$('.o_widget').text(), 'I am alive!',
+            "widget should have been updated");
+
+        form.destroy();
+        delete widgetRegistry.map.test;
+    });
+
+
     QUnit.test('bounce edit button in readonly mode', function (assert) {
         assert.expect(3);
 
@@ -6360,6 +6399,84 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('check if the view destroys all widgets and instances', function (assert) {
+        assert.expect(1);
+
+        var instanceNumber = 0;
+        testUtils.patch(mixins.ParentedMixin, {
+            init: function () {
+                instanceNumber++;
+                return this._super.apply(this, arguments);
+            },
+            destroy: function () {
+                if (!this.isDestroyed()) {
+                    instanceNumber--;
+                }
+                return this._super.apply(this, arguments);
+            }
+        });
+
+        var params = {
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<sheet>' +
+                        '<field name="display_name"/>' +
+                        '<field name="foo"/>' +
+                        '<field name="bar"/>' +
+                        '<field name="int_field"/>' +
+                        '<field name="qux"/>' +
+                        '<field name="trululu"/>' +
+                        '<field name="timmy"/>' +
+                        '<field name="product_id"/>' +
+                        '<field name="priority"/>' +
+                        '<field name="state"/>' +
+                        '<field name="date"/>' +
+                        '<field name="datetime"/>' +
+                        '<field name="product_ids"/>' +
+                        '<field name="p">' +
+                            '<tree default_order="foo desc">' +
+                                '<field name="display_name"/>' +
+                                '<field name="foo"/>' +
+                            '</tree>' +
+                        '</field>' +
+                    '</sheet>' +
+                '</form>',
+            archs: {
+                'partner,false,form':
+                    '<form string="Partner">' +
+                        '<sheet>' +
+                            '<group>' +
+                                '<field name="foo"/>' +
+                            '</group>' +
+                        '</sheet>' +
+                    '</form>',
+                "partner_type,false,list": '<tree><field name="name"/></tree>',
+                'product,false,list': '<tree><field name="display_name"/></tree>',
+
+            },
+            res_id: 1,
+        };
+
+        var form = createView(params);
+        form.destroy();
+
+        var initialInstanceNumber = instanceNumber;
+        instanceNumber = 0;
+
+        form = createView(params);
+
+        // call destroy function of controller to ensure that it correctly destroys everything
+        form.__destroy();
+
+        assert.strictEqual(instanceNumber, initialInstanceNumber + 3, "every widget must be destroyed exept the parent");
+
+        form.destroy();
+
+        testUtils.unpatch(mixins.ParentedMixin);
+    });
+
     QUnit.test('edition in form view on a "noCache" model', function (assert) {
         assert.expect(4);
 
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 0bea1567d49..f5c31c05c8b 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -5,6 +5,7 @@ var KanbanColumnProgressBar = require('web.KanbanColumnProgressBar');
 var kanbanExamplesRegistry = require('web.kanban_examples_registry');
 var KanbanRenderer = require('web.KanbanRenderer');
 var KanbanView = require('web.KanbanView');
+var mixins = require('web.mixins');
 var testUtils = require('web.test_utils');
 var Widget = require('web.Widget');
 var widgetRegistry = require('web.widget_registry');
@@ -3346,6 +3347,62 @@ QUnit.module('Views', {
 
         kanban.destroy();
     });
+
+    QUnit.test('check if the view destroys all widgets and instances', function (assert) {
+        assert.expect(1);
+
+        var instanceNumber = 0;
+        testUtils.patch(mixins.ParentedMixin, {
+            init: function () {
+                instanceNumber++;
+                return this._super.apply(this, arguments);
+            },
+            destroy: function () {
+                if (!this.isDestroyed()) {
+                    instanceNumber--;
+                }
+                return this._super.apply(this, arguments);
+            }
+        });
+
+        var params = {
+            View: KanbanView,
+            model: 'partner',
+            data: this.data,
+            arch: '<kanban string="Partners">' +
+                    '<field name="foo"/>' +
+                    '<field name="bar"/>' +
+                    '<field name="int_field"/>' +
+                    '<field name="qux"/>' +
+                    '<field name="product_id"/>' +
+                    '<field name="category_ids"/>' +
+                    '<field name="state"/>' +
+                    '<field name="date"/>' +
+                    '<field name="datetime"/>' +
+                    '<templates><t t-name="kanban-box">' +
+                        '<div><field name="foo"/></div>' +
+                    '</t></templates>' +
+                '</kanban>',
+        };
+
+        var kanban = createView(params);
+        kanban.destroy();
+
+        var initialInstanceNumber = instanceNumber;
+        instanceNumber = 0;
+
+        kanban = createView(params);
+
+        // call destroy function of controller to ensure that it correctly destroys everything
+        kanban.__destroy();
+
+        assert.strictEqual(instanceNumber, initialInstanceNumber + 3, "every widget must be destroyed exept the parent");
+
+        kanban.destroy();
+
+        testUtils.unpatch(mixins.ParentedMixin);
+    });
+
 });
 
 });
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index cfe00bf9141..4f22945250a 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -7,6 +7,7 @@ var core = require('web.core');
 var basicFields = require('web.basic_fields');
 var FormView = require('web.FormView');
 var ListView = require('web.ListView');
+var mixins = require('web.mixins');
 var testUtils = require('web.test_utils');
 var widgetRegistry = require('web.widget_registry');
 var Widget = require('web.Widget');
@@ -583,6 +584,40 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('selection is reset on reload', function (assert) {
+        assert.expect(5);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree>' +
+                    '<field name="foo"/>' +
+                    '<field name="int_field" sum="Sum"/>' +
+                '</tree>',
+        });
+
+        assert.strictEqual(list.$('tfoot td:nth(2)').text(), '32',
+            "total should be 32 (no record selected)");
+
+        // select first record
+        var $firstRowSelector = list.$('tbody .o_list_record_selector input').first();
+        $firstRowSelector.click();
+        assert.ok($firstRowSelector.is(':checked'), "first row should be selected");
+        assert.strictEqual(list.$('tfoot td:nth(2)').text(), '10',
+            "total should be 10 (first record selected)");
+
+        // reload
+        list.reload();
+        $firstRowSelector = list.$('tbody .o_list_record_selector input').first();
+        assert.notOk($firstRowSelector.is(':checked'),
+            "first row should no longer be selected");
+        assert.strictEqual(list.$('tfoot td:nth(2)').text(), '32',
+            "total should be 32 (no more record selected)");
+
+        list.destroy();
+    });
+
     QUnit.test('aggregates are computed correctly', function (assert) {
         assert.expect(4);
 
@@ -661,6 +696,25 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('aggregates are formatted according to field widget', function (assert) {
+        assert.expect(1);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree>' +
+                    '<field name="foo"/>' +
+                    '<field name="qux" widget="float_time" sum="Sum"/>' +
+                '</tree>',
+        });
+
+        assert.strictEqual(list.$('tfoot td:nth(2)').text(), '19:24',
+            "total should be formatted as a float_time");
+
+        list.destroy();
+    });
+
     QUnit.test('groups can be sorted on aggregates', function (assert) {
         assert.expect(10);
 
@@ -1930,7 +1984,7 @@ QUnit.module('Views', {
     });
 
     QUnit.test('readonly attrs on fields are re-evaluated on field change', function (assert) {
-        assert.expect(7);
+        assert.expect(9);
 
         var list = createView({
             View: ListView,
@@ -1964,9 +2018,14 @@ QUnit.module('Views', {
         assert.strictEqual(list.$('tbody td.o_readonly_modifier').length, 3,
             "the foo field widget parent cell should now be readonly again");
 
-        // Reswitch the cell to editable and save the row
         list.$('tbody tr:nth(0) td:nth(2) input').click();
-        list.$('thead').click();
+        assert.strictEqual(list.$('tbody tr:nth(0) td:nth(1) > input[name="foo"]').length, 1,
+            "the foo field widget should have been rerendered as editable again");
+        assert.strictEqual(list.$('tbody td.o_readonly_modifier').length, 2,
+            "the foo field widget parent cell should not be readonly again");
+
+        // Click outside to leave edition mode
+        list.$el.click();
 
         assert.strictEqual(list.$('tbody td.o_readonly_modifier').length, 2,
             "there should be 2 readonly foo cells in readonly mode");
@@ -2772,6 +2831,28 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('pressing ESC discard the current line changes (with required)', function (assert) {
+        assert.expect(3);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree editable="top"><field name="foo" required="1"/></tree>',
+        });
+
+        list.$buttons.find('.o_list_button_add').click();
+
+        list.$('input[name="foo"]').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE});
+        assert.strictEqual(list.$('tr.o_data_row').length, 4,
+            "should have 4 data row in list");
+        assert.strictEqual(list.$('tr.o_data_row.o_selected_row').length, 0,
+            "no rows should be selected");
+        assert.ok(!list.$buttons.find('.o_list_button_save').is(':visible'),
+            "should not have a visible save button");
+        list.destroy();
+    });
+
     QUnit.test('field with password attribute', function (assert) {
         assert.expect(2);
 
@@ -3223,6 +3304,61 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('check if the view destroys all widgets and instances', function (assert) {
+        assert.expect(1);
+
+        var instanceNumber = 0;
+        testUtils.patch(mixins.ParentedMixin, {
+            init: function () {
+                instanceNumber++;
+                return this._super.apply(this, arguments);
+            },
+            destroy: function () {
+                if (!this.isDestroyed()) {
+                    instanceNumber--;
+                }
+                return this._super.apply(this, arguments);
+            }
+        });
+
+        var params = {
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree string="Partners">' +
+                    '<field name="foo"/>' +
+                    '<field name="bar"/>' +
+                    '<field name="date"/>' +
+                    '<field name="int_field"/>' +
+                    '<field name="qux"/>' +
+                    '<field name="m2o"/>' +
+                    '<field name="o2m"/>' +
+                    '<field name="m2m"/>' +
+                    '<field name="amount"/>' +
+                    '<field name="currency_id"/>' +
+                    '<field name="datetime"/>' +
+                    '<field name="reference"/>' +
+                '</tree>',
+        };
+
+        var list = createView(params);
+        list.destroy();
+
+        var initialInstanceNumber = instanceNumber;
+        instanceNumber = 0;
+
+        list = createView(params);
+
+        // call destroy function of controller to ensure that it correctly destroys everything
+        list.__destroy();
+
+        assert.strictEqual(instanceNumber, initialInstanceNumber + 3, "every widget must be destroyed exept the parent");
+
+        list.destroy();
+
+        testUtils.unpatch(mixins.ParentedMixin);
+    });
+
     QUnit.test('list view on a "noCache" model', function (assert) {
         assert.expect(8);
 
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index 94d4bcf36b8..1fcc03ee483 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -1,7 +1,6 @@
 odoo.define('web.pivot_tests', function (require) {
 "use strict";
 
-var Context = require('web.Context');
 var core = require('web.core');
 var PivotView = require('web.PivotView');
 var testUtils = require('web.test_utils');
@@ -739,7 +738,33 @@ QUnit.module('Views', {
             },
         });
 
-        $('.o_pivot_download').click();
+        pivot.$buttons.find('.o_pivot_download').click();
+        pivot.destroy();
+    });
+
+    QUnit.test('can download a file without data', function (assert) {
+        assert.expect(1);
+
+        this.data.partner.records = [];
+
+        var pivot = createView({
+            View: PivotView,
+            model: "partner",
+            data: this.data,
+            arch: '<pivot>' +
+                        '<field name="date" interval="month" type="col"/>' +
+                        '<field name="foo" type="measure"/>' +
+                '</pivot>',
+            session: {
+                get_file: function (args) {
+                    assert.strictEqual(args.url, '/web/pivot/export_xls',
+                        "should call get_file with correct parameters");
+                    args.complete();
+                },
+            },
+        });
+
+        pivot.$buttons.find('.o_pivot_download').click();
         pivot.destroy();
     });
 
diff --git a/addons/web/static/tests/views/view_dialogs_tests.js b/addons/web/static/tests/views/view_dialogs_tests.js
index 08ddd2c91c2..014435194f3 100644
--- a/addons/web/static/tests/views/view_dialogs_tests.js
+++ b/addons/web/static/tests/views/view_dialogs_tests.js
@@ -21,7 +21,6 @@ QUnit.module('Views', {
                 ],
             },
         };
-
     },
 }, function () {
 
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 35ded8170cf..bfd3bbb751e 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -155,6 +155,7 @@
         <script type="text/javascript" src="/web/static/src/js/chrome/control_panel.js"></script>
         <script type="text/javascript" src="/web/static/src/js/chrome/abstract_web_client.js"></script>
         <script type="text/javascript" src="/web/static/src/js/chrome/web_client.js"></script>
+        <script type="text/javascript" src="/web/static/src/js/chrome/root_widget.js"></script>
         <script type="text/javascript" src="/web/static/src/js/_deprecated/data.js"></script>
         <script type="text/javascript" src="/web/static/src/js/core/context.js"></script>
         <script type="text/javascript" src="/web/static/src/js/core/misc.js"></script>
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index a207ea11c98..3e766cfbcbc 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -3,16 +3,16 @@
 # * web_diagram
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
-# Sergio Flores <vitavitae1@gmail.com>, 2017
+# Martin Trigaux, 2016
+# Sergio Flores <vitavitae1@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Sergio Flores <vitavitae1@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -36,13 +36,15 @@ msgid ""
 "Are you sure you want to remove this node ? This will remove its connected "
 "transitions as well."
 msgstr ""
+"¿Seguro que quiere eliminar este nodo? Si lo hace, también se eliminarán sus"
+" transiciones conectadas."
 
 #. module: web_diagram
 #. openerp-web
 #: code:addons/web_diagram/static/src/js/diagram_controller.js:172
 #, python-format
 msgid "Are you sure you want to remove this transition?"
-msgstr ""
+msgstr "¿Seguro que desea eliminar esta transición?"
 
 #. module: web_diagram
 #. openerp-web
@@ -72,7 +74,7 @@ msgstr "Nuevo Nodo"
 #: code:addons/web_diagram/static/src/js/diagram_controller.js:160
 #, python-format
 msgid "Open:"
-msgstr ""
+msgstr "Abrir:"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py
index f4500c7bcc6..b14c58ae938 100644
--- a/addons/web_editor/controllers/main.py
+++ b/addons/web_editor/controllers/main.py
@@ -146,6 +146,9 @@ class Web_Editor(http.Controller):
         # therefore we have to recover the files from the request object
         Attachments = request.env['ir.attachment']  # registry for the attachment table
 
+        res_model = kwargs.get('res_model', 'ir.ui.view')
+        res_id = res_model != 'ir.ui.view' and kwargs.get('res_id') or None
+
         uploads = []
         message = None
         if not upload: # no image provided, storing the link and the image name
@@ -159,9 +162,11 @@ class Web_Editor(http.Controller):
                 'type': 'url',
                 'url': url,
                 'public': True,
-                'res_model': 'ir.ui.view',
+                'res_id': res_id,
+                'res_model': res_model,
             })
-            uploads += attachment.read(['name', 'mimetype', 'checksum', 'url'])
+            attachment.generate_access_token()
+            uploads += attachment.read(['name', 'mimetype', 'checksum', 'url', 'res_id', 'res_model', 'access_token'])
         else:                                                  # images provided
             try:
                 attachments = request.env['ir.attachment']
@@ -188,10 +193,12 @@ class Web_Editor(http.Controller):
                         'datas': base64.b64encode(data),
                         'datas_fname': datas_fname,
                         'public': True,
-                        'res_model': 'ir.ui.view',
+                        'res_id': res_id,
+                        'res_model': res_model,
                     })
+                    attachment.generate_access_token()
                     attachments += attachment
-                uploads += attachments.read(['name', 'mimetype', 'checksum', 'url'])
+                uploads += attachments.read(['name', 'mimetype', 'checksum', 'url', 'res_id', 'res_model', 'access_token'])
             except Exception as e:
                 logger.exception("Failed to upload image to attachment")
                 message = pycompat.text_type(e)
diff --git a/addons/web_editor/i18n/de.po b/addons/web_editor/i18n/de.po
index b2308adbf5c..11d95f5c9a2 100644
--- a/addons/web_editor/i18n/de.po
+++ b/addons/web_editor/i18n/de.po
@@ -3,29 +3,30 @@
 # * web_editor
 # 
 # Translators:
-# Henry Mineehen <info@mineehen.de>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# Krakataua Katarajtu <shlok@hotmail.de>, 2017
+# Henry Mineehen <info@mineehen.de>, 2017
+# Wolfgang Taferner, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
+# Ralf Hilgenstock <rh@dialoge.info>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
+# Renzo Meister, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
+# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: AppleMentalist <felix.schnatbaum@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +39,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "(URL or Embed)"
-msgstr ""
+msgstr "(URL oder Einbetten)"
 
 #. module: web_editor
 #. openerp-web
@@ -60,27 +61,27 @@ msgstr "25% Weiß"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% Black"
-msgstr ""
+msgstr "50 % Schwarz"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "50% White"
-msgstr ""
+msgstr "50 % Weiß"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% Black"
-msgstr ""
+msgstr "75 % Schwarz"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "75% White"
-msgstr ""
+msgstr "75 % Weiß"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.snippets
 msgid "<i class=\"fa fa-th-large\"/> First Panel"
-msgstr ""
+msgstr "<i class=\"fa fa-th-large\"/>Panel Eins"
 
 #. module: web_editor
 #. openerp-web
@@ -90,13 +91,16 @@ msgid ""
 "A server error occured. Please check you correctly signed in and that the "
 "file you are saving is well-formed."
 msgstr ""
+"Ein Server-Fehler ist aufgetreten. Bitte überprüfen Sie die korrekt "
+"signierte Anmeldung und ob die von Ihnen gespeicherte Datei gut gestaltet "
+"ist."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Accepts"
-msgstr ""
+msgstr "Akzeptiert"
 
 #. module: web_editor
 #. openerp-web
@@ -122,7 +126,7 @@ msgstr "Bild-URL hinzufügen"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.snippets
 msgid "Add blocks"
-msgstr ""
+msgstr "Blockierungen hinzufügen"
 
 #. module: web_editor
 #. openerp-web
@@ -148,7 +152,7 @@ msgstr "Rechtsbündig"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Alpha"
-msgstr ""
+msgstr "Alpha"
 
 #. module: web_editor
 #. openerp-web
@@ -162,7 +166,7 @@ msgstr "Alternativer Upload"
 #: code:addons/web_editor/static/src/xml/editor.xml:315
 #, python-format
 msgid "Assign a focal point that will always be visible"
-msgstr ""
+msgstr "Einen Knotenpunkt zuweisen, der stets sichtbar ist."
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_ir_attachment_local_url
@@ -174,7 +178,7 @@ msgstr "Dateianhang URL"
 #: code:addons/web_editor/static/src/xml/snippets.xml:11
 #, python-format
 msgid "Auto size"
-msgstr ""
+msgstr "Automatische Größe"
 
 #. module: web_editor
 #. openerp-web
@@ -203,40 +207,40 @@ msgstr "Grösse Hintergrundbild"
 #: code:addons/web_editor/static/src/xml/editor.xml:354
 #, python-format
 msgid "Background height"
-msgstr ""
+msgstr "Hintergrundhöhe"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:364
 #, python-format
 msgid "Background position"
-msgstr ""
+msgstr "Hintergrundposition"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:386
 #, python-format
 msgid "Background repeat"
-msgstr ""
+msgstr "Hintergrund wiederholen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:342
 #, python-format
 msgid "Background size"
-msgstr ""
+msgstr "Hintergrundgröße"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:345
 #, python-format
 msgid "Background width"
-msgstr ""
+msgstr "Hintergrundbreite"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Beta"
-msgstr ""
+msgstr "Beta"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -262,7 +266,7 @@ msgstr "Fett:"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:827
 #, python-format
 msgid "Careful !"
-msgstr ""
+msgstr "Vorsicht!"
 
 #. module: web_editor
 #. openerp-web
@@ -276,7 +280,7 @@ msgstr "Zentriert"
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:55
 #, python-format
 msgid "Change media description and tooltip"
-msgstr ""
+msgstr "Medienbeschreibung und Kurzinfo ändern"
 
 #. module: web_editor
 #. openerp-web
@@ -320,14 +324,14 @@ msgstr "Spalten"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:61
 #, python-format
 msgid "Common colors"
-msgstr ""
+msgstr "Übliche Farben"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:310
 #, python-format
 msgid "Contain"
-msgstr ""
+msgstr "Enthalten"
 
 #. module: web_editor
 #. openerp-web
@@ -341,14 +345,14 @@ msgstr "Zu übersetzender Inhalt"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "Fügen Sie URL oder Einbettungscode hier ein."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:309
 #, python-format
 msgid "Cover"
-msgstr ""
+msgstr "Cover"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_create_uid
@@ -379,7 +383,7 @@ msgstr "Anpassen"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -403,7 +407,7 @@ msgstr "Soll das Hintergrundbild wiederholt werden, und wenn ja, wie"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Delta"
-msgstr ""
+msgstr "Delta"
 
 #. module: web_editor
 #. openerp-web
@@ -417,7 +421,7 @@ msgstr "Beschreibung"
 #: code:addons/web_editor/static/src/xml/editor.xml:34
 #, python-format
 msgid "Description (alt tag)"
-msgstr ""
+msgstr "Beschreibung (alt-Tag)"
 
 #. module: web_editor
 #. openerp-web
@@ -446,21 +450,21 @@ msgstr "Dokument"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:976
 #, python-format
 msgid "Document Style"
-msgstr ""
+msgstr "Dokumentstil"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:860
 #, python-format
 msgid "Double-click to edit"
-msgstr ""
+msgstr "Zum Bearbeiten doppelt klicken"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:903
 #, python-format
 msgid "Drag an image here"
-msgstr ""
+msgstr "Bild hierhin ziehen"
 
 #. module: web_editor
 #. openerp-web
@@ -487,14 +491,14 @@ msgstr "Bearbeiten"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Epsilon"
-msgstr ""
+msgstr "Epsilon"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/ace.js:93
 #, python-format
 msgid "Expected "
-msgstr ""
+msgstr "Erwartet"
 
 #. module: web_editor
 #. openerp-web
@@ -508,42 +512,42 @@ msgstr "Extra Klein"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:895
 #, python-format
 msgid "File / Image"
-msgstr ""
+msgstr "Datei/Bild"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/snippets.xml:12
 #, python-format
 msgid "Fixed size"
-msgstr ""
+msgstr "Feste Größe"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:900
 #, python-format
 msgid "Float Left"
-msgstr ""
+msgstr "Links frei"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:902
 #, python-format
 msgid "Float None"
-msgstr ""
+msgstr "Nicht frei"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901
 #, python-format
 msgid "Float Right"
-msgstr ""
+msgstr "Rechts frei"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:964
 #, python-format
 msgid "Font Color"
-msgstr ""
+msgstr "Schriftfarbe"
 
 #. module: web_editor
 #. openerp-web
@@ -576,32 +580,32 @@ msgstr "Vollbild"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray"
-msgstr ""
+msgstr "Grau"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Dark"
-msgstr ""
+msgstr "Grau dunkel"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Darker"
-msgstr ""
+msgstr "Grau dunkler"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Light"
-msgstr ""
+msgstr "Grau hell"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Gray Lighter"
-msgstr ""
+msgstr "Grau heller"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
@@ -671,42 +675,42 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:219
 #, python-format
 msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "Dailymotion-Logo ausblenden"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:216
 #, python-format
 msgid "Hide Youtube logo"
-msgstr ""
+msgstr "YouTube-Logo ausblenden"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:213
 #, python-format
 msgid "Hide fullscreen button"
-msgstr ""
+msgstr "Vollbild-Schaltfläche ausblenden"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr ""
+msgstr "Spielersteuerung ausblenden"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:222
 #, python-format
 msgid "Hide sharing button"
-msgstr ""
+msgstr "Teilen-Schaltfläche ausblenden"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:367
 #, python-format
 msgid "Horizontal"
-msgstr ""
+msgstr "Horizontal"
 
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_id
@@ -721,6 +725,9 @@ msgid ""
 "If you discard the current edition, all unsaved changes will be lost. You "
 "can cancel to return to the edition mode."
 msgstr ""
+"Wenn Sie die aktuelle Ausgabe verwerfen, gehen alle nicht gespeicherten "
+"Änderungen verloren. Sie können durch Abbrechen in den Erfassungsmodus "
+"kommen."
 
 #. module: web_editor
 #. openerp-web
@@ -730,6 +737,8 @@ msgid ""
 "If you reset this file, all your customizations will be lost as it will be "
 "reverted to the default file."
 msgstr ""
+"Wenn Sie diese Datei zurücksetzen, gehen all Ihre Anpassungen verloren, da "
+"sie zur Standard-Datei zurückgesetzt wird."
 
 #. module: web_editor
 #. openerp-web
@@ -753,27 +762,29 @@ msgid ""
 "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
 "        Each modification on the master page is automatically applied to all translated versions."
 msgstr ""
+"In diesem Modus können Sie nur Texte übersetzen. Um die Struktur der Seite zu ändern, müssen Sie die Master-Seite bearbeiten.\n"
+" Jede Änderung der Master-Seite wird automatisch auf alle übersetzten Versionen angewendet."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
-msgstr ""
+msgstr "Alle LESS-Dateien einschließen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:17
 #, python-format
 msgid "Include Asset Bundles"
-msgstr ""
+msgstr "Asset-Bundle einschließen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954
 #, python-format
 msgid "Indent"
-msgstr ""
+msgstr "Einzug"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -785,7 +796,7 @@ msgstr "Information"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:928
 #, python-format
 msgid "Insert Horizontal Rule"
-msgstr ""
+msgstr "Horizontale Regel einfügen"
 
 #. module: web_editor
 #. openerp-web
@@ -806,14 +817,14 @@ msgstr "Link einfügen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:920
 #, python-format
 msgid "Insert Video"
-msgstr ""
+msgstr "Video einfügen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
 
 #. module: web_editor
 #. openerp-web
@@ -834,21 +845,21 @@ msgstr "Kursiv"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:958
 #, python-format
 msgid "Justify full"
-msgstr ""
+msgstr "Vollständiger Blocksatz"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971
 #, python-format
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Tastaturkürzel"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:11
 #, python-format
 msgid "LESS (CSS)"
-msgstr ""
+msgstr "LESS (CSS)"
 
 #. module: web_editor
 #. openerp-web
@@ -878,14 +889,14 @@ msgstr "Zuletzt aktualisiert am"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
-msgstr ""
+msgstr "LESS-Datei: %s"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:890
 #, python-format
 msgid "Line Height"
-msgstr ""
+msgstr "Linienhöhe"
 
 #. module: web_editor
 #. openerp-web
@@ -913,7 +924,7 @@ msgstr "Link zu"
 #: code:addons/web_editor/static/src/xml/editor.xml:207
 #, python-format
 msgid "Loop"
-msgstr ""
+msgstr "Wiederholen"
 
 #. module: web_editor
 #. openerp-web
@@ -947,7 +958,7 @@ msgstr "Weiter"
 #: code:addons/web_editor/static/src/xml/editor.xml:389
 #, python-format
 msgid "No repeat"
-msgstr ""
+msgstr "Nicht wiederholen"
 
 #. module: web_editor
 #. openerp-web
@@ -977,7 +988,7 @@ msgstr "Ok"
 #: code:addons/web_editor/static/src/js/editor/translator.js:93
 #, python-format
 msgid "Ok, never show me this again"
-msgstr ""
+msgstr "Bitte nicht erneut anzeigen."
 
 #. module: web_editor
 #. openerp-web
@@ -999,21 +1010,21 @@ msgstr "Optionen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:944
 #, python-format
 msgid "Ordered list"
-msgstr ""
+msgstr "Geordnete Liste"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
 #, python-format
 msgid "Outdent"
-msgstr ""
+msgstr "Ausrückung"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:113
 #, python-format
 msgid "Padding"
-msgstr ""
+msgstr "Rand"
 
 #. module: web_editor
 #. openerp-web
@@ -1068,21 +1079,21 @@ msgstr "Zitat"
 #: code:addons/web_editor/static/src/js/editor/rte.js:307
 #, python-format
 msgid "Readonly field"
-msgstr ""
+msgstr "Schreibgeschütztes Feld"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:961
 #, python-format
 msgid "Recent Color"
-msgstr ""
+msgstr "Zuletzt verwendete Farbe"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:980
 #, python-format
 msgid "Redo"
-msgstr ""
+msgstr "Wiederholen"
 
 #. module: web_editor
 #. openerp-web
@@ -1103,7 +1114,7 @@ msgstr "Block entfernen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:889
 #, python-format
 msgid "Remove Font Style"
-msgstr ""
+msgstr "Schriftstil entfernen"
 
 #. module: web_editor
 #. openerp-web
@@ -1124,21 +1135,21 @@ msgstr "Wiederholen"
 #: code:addons/web_editor/static/src/xml/editor.xml:390
 #, python-format
 msgid "Repeat both"
-msgstr ""
+msgstr "Beide wiederholen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:391
 #, python-format
 msgid "Repeat x"
-msgstr ""
+msgstr "x wiederholen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:392
 #, python-format
 msgid "Repeat y"
-msgstr ""
+msgstr "y wiederholen"
 
 #. module: web_editor
 #. openerp-web
@@ -1153,42 +1164,42 @@ msgstr "Zurücksetzen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:968
 #, python-format
 msgid "Reset to default"
-msgstr ""
+msgstr "Auf Standard zurücksetzen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "Das Zurücksetzen der Ansichten wird noch nicht unterstützt."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:897
 #, python-format
 msgid "Resize Full"
-msgstr ""
+msgstr "Vollansicht"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:898
 #, python-format
 msgid "Resize Half"
-msgstr ""
+msgstr "Halbansicht"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:899
 #, python-format
 msgid "Resize Quarter"
-msgstr ""
+msgstr "Viertelansicht"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/snippets.xml:12
 #, python-format
 msgid "Resize to force the height of this block"
-msgstr ""
+msgstr "Größe ändern, damit die Höhe dieses Blocks bestimmt wird."
 
 #. module: web_editor
 #. openerp-web
@@ -1211,14 +1222,14 @@ msgstr "Suchen"
 #: code:addons/web_editor/static/src/xml/snippets.xml:47
 #, python-format
 msgid "Search Contact"
-msgstr ""
+msgstr "Kontakt suchen"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/snippets.xml:17
 #, python-format
 msgid "Select Parent Container"
-msgstr ""
+msgstr "Übergeordneten Behälter auswählen"
 
 #. module: web_editor
 #. openerp-web
@@ -1307,7 +1318,7 @@ msgstr "Drehen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:886
 #, python-format
 msgid "Strikethrough"
-msgstr ""
+msgstr "Durchstreichen"
 
 #. module: web_editor
 #. openerp-web
@@ -1321,7 +1332,7 @@ msgstr "Stil"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:887
 #, python-format
 msgid "Subscript"
-msgstr ""
+msgstr "tiefstellen"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1333,7 +1344,7 @@ msgstr "Erfolgreich"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:888
 #, python-format
 msgid "Superscript"
-msgstr ""
+msgstr "hochstellen"
 
 #. module: web_editor
 #. openerp-web
@@ -1354,14 +1365,14 @@ msgstr "Vorlagen ID: %s"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:973
 #, python-format
 msgid "Text formatting"
-msgstr ""
+msgstr "Textformatierung"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:913
 #, python-format
 msgid "Text to display"
-msgstr ""
+msgstr "Anzuzeigender Text"
 
 #. module: web_editor
 #. openerp-web
@@ -1379,14 +1390,14 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
 msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "Die angegebene URL enthält kein unterstütztes Video."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:865
 #, python-format
 msgid "The provided url is not valid"
-msgstr ""
+msgstr "Die angegebene URL ist ungültig."
 
 #. module: web_editor
 #. openerp-web
@@ -1415,7 +1426,7 @@ msgstr "Wohin soll dieser Link führen?"
 #: code:addons/web_editor/static/src/xml/editor.xml:40
 #, python-format
 msgid "Tooltip"
-msgstr ""
+msgstr "Kurzinfo"
 
 #. module: web_editor
 #. openerp-web
@@ -1436,7 +1447,7 @@ msgstr "Übersetzter Inhalt"
 #: code:addons/web_editor/static/src/js/editor/translator.js:91
 #, python-format
 msgid "Translation Info"
-msgstr ""
+msgstr "Übersetzungs-Info"
 
 #. module: web_editor
 #. openerp-web
@@ -1451,7 +1462,7 @@ msgstr "Transparen"
 #: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
-msgstr ""
+msgstr "URL oder E-Mail"
 
 #. module: web_editor
 #. openerp-web
@@ -1472,7 +1483,7 @@ msgstr "Rückgängig"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:86
 #, python-format
 msgid "Unexpected "
-msgstr ""
+msgstr "Unerwartet"
 
 #. module: web_editor
 #. openerp-web
@@ -1486,14 +1497,14 @@ msgstr "Löschen"
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:943
 #, python-format
 msgid "Unordered list"
-msgstr ""
+msgstr "Nicht geordnete Liste"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:96
 #, python-format
 msgid "Upload an image"
-msgstr ""
+msgstr "Bild hochladen"
 
 #. module: web_editor
 #. openerp-web
@@ -1514,7 +1525,7 @@ msgstr "Hochladen …"
 #: code:addons/web_editor/static/src/xml/editor.xml:376
 #, python-format
 msgid "Vertical"
-msgstr ""
+msgstr "Vertikal"
 
 #. module: web_editor
 #. openerp-web
@@ -1543,21 +1554,21 @@ msgstr "Video-URL?"
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "Video code"
-msgstr ""
+msgstr "Videocode"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1575,14 +1586,14 @@ msgstr "Weiß"
 #: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
 msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:110
 #, python-format
 msgid "Xl"
-msgstr ""
+msgstr "Xl"
 
 #. module: web_editor
 #. openerp-web
@@ -1596,14 +1607,14 @@ msgstr "Sie sind gerade dabei in den Übersetzungsmodus zu wechseln."
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youku"
-msgstr ""
+msgstr "Youku"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youtube"
-msgstr ""
+msgstr "YouTube"
 
 #. module: web_editor
 #. openerp-web
@@ -1620,14 +1631,14 @@ msgstr "und"
 #: code:addons/web_editor/static/src/xml/editor.xml:379
 #, python-format
 msgid "auto"
-msgstr ""
+msgstr "Auto"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:113
 #, python-format
 msgid "https://www.odoo.com/logo.png"
-msgstr ""
+msgstr "https://www.odoo.com/logo.png"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_attachment
@@ -1729,17 +1740,17 @@ msgstr "ir.ui.view"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "videos"
-msgstr ""
+msgstr "Videos"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
 msgid "web_editor.converter.test"
-msgstr ""
+msgstr "web_editor.converter.test"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test_sub
 msgid "web_editor.converter.test.sub"
-msgstr ""
+msgstr "web_editor.converter.test.sub"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/es.po b/addons/web_editor/i18n/es.po
index ceea09aefff..09b9423fe62 100644
--- a/addons/web_editor/i18n/es.po
+++ b/addons/web_editor/i18n/es.po
@@ -3,8 +3,8 @@
 # * web_editor
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
@@ -20,13 +20,14 @@
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # David Arnold <blaggacao@users.noreply.github.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,7 +40,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "(URL or Embed)"
-msgstr ""
+msgstr "(URL o incrustación)"
 
 #. module: web_editor
 #. openerp-web
@@ -91,13 +92,15 @@ msgid ""
 "A server error occured. Please check you correctly signed in and that the "
 "file you are saving is well-formed."
 msgstr ""
+"Se ha producido un error de servidor. Compruebe que ha iniciado sesión "
+"correctamente y que el archivo que está guardando está bien formado."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Accepts"
-msgstr ""
+msgstr "Acepta"
 
 #. module: web_editor
 #. openerp-web
@@ -263,7 +266,7 @@ msgstr "Negrita"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:827
 #, python-format
 msgid "Careful !"
-msgstr ""
+msgstr "¡Precaución!"
 
 #. module: web_editor
 #. openerp-web
@@ -342,7 +345,7 @@ msgstr "Contenido a traducir"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "Copie y pegue su URL o su código de incrustación aquí"
 
 #. module: web_editor
 #. openerp-web
@@ -380,7 +383,7 @@ msgstr "Personalizar"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -418,7 +421,7 @@ msgstr "Descripción"
 #: code:addons/web_editor/static/src/xml/editor.xml:34
 #, python-format
 msgid "Description (alt tag)"
-msgstr ""
+msgstr "Descripción (etiqueta ALT)"
 
 #. module: web_editor
 #. openerp-web
@@ -495,7 +498,7 @@ msgstr "Epsilon"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:93
 #, python-format
 msgid "Expected "
-msgstr ""
+msgstr "Previsto"
 
 #. module: web_editor
 #. openerp-web
@@ -671,35 +674,35 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:219
 #, python-format
 msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "Ocultar logotipo de Dailymotion"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:216
 #, python-format
 msgid "Hide Youtube logo"
-msgstr ""
+msgstr "Ocultar logotipo de Youtube"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:213
 #, python-format
 msgid "Hide fullscreen button"
-msgstr ""
+msgstr "Ocultar botón de pantalla completa"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr ""
+msgstr "Ocultar controles de reproductor"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:222
 #, python-format
 msgid "Hide sharing button"
-msgstr ""
+msgstr "Ocultar botón compartir"
 
 #. module: web_editor
 #. openerp-web
@@ -732,6 +735,8 @@ msgid ""
 "If you reset this file, all your customizations will be lost as it will be "
 "reverted to the default file."
 msgstr ""
+"Si restablece este archivo, todas sus personalizaciones se perderán y la "
+"configuración volverá a ser la predeterminada."
 
 #. module: web_editor
 #. openerp-web
@@ -755,13 +760,15 @@ msgid ""
 "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
 "        Each modification on the master page is automatically applied to all translated versions."
 msgstr ""
+"En este modo, solo puede traducir textos. Para cambiar la estructura de la página, debe editar la página maestra.\n"
+" Las modificaciones de la página maestra se aplicarán automáticamente a todas las versiones traducidas."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
-msgstr ""
+msgstr "Incluir todos los archivos LESS"
 
 #. module: web_editor
 #. openerp-web
@@ -815,7 +822,7 @@ msgstr "Inserta video"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
 
 #. module: web_editor
 #. openerp-web
@@ -850,7 +857,7 @@ msgstr "Atajos de teclado"
 #: code:addons/web_editor/static/src/xml/ace.xml:11
 #, python-format
 msgid "LESS (CSS)"
-msgstr ""
+msgstr "LESS (CSS)"
 
 #. module: web_editor
 #. openerp-web
@@ -880,7 +887,7 @@ msgstr "Última actualización el"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
-msgstr ""
+msgstr "Archivo LESS: %s"
 
 #. module: web_editor
 #. openerp-web
@@ -915,7 +922,7 @@ msgstr "Enlazar con"
 #: code:addons/web_editor/static/src/xml/editor.xml:207
 #, python-format
 msgid "Loop"
-msgstr ""
+msgstr "Bucle"
 
 #. module: web_editor
 #. openerp-web
@@ -979,7 +986,7 @@ msgstr "Aceptar"
 #: code:addons/web_editor/static/src/js/editor/translator.js:93
 #, python-format
 msgid "Ok, never show me this again"
-msgstr ""
+msgstr "De acuerdo, no volver a mostrar esto"
 
 #. module: web_editor
 #. openerp-web
@@ -1162,7 +1169,7 @@ msgstr "Resetear al defecto"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "La función de restablecimiento de vistas aún no es compatible"
 
 #. module: web_editor
 #. openerp-web
@@ -1248,7 +1255,7 @@ msgstr "Seleccione desde archivos"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:567
 #, python-format
 msgid "Server error"
-msgstr ""
+msgstr "Error de servidor"
 
 #. module: web_editor
 #. openerp-web
@@ -1381,14 +1388,14 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
 msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "La URL proporcionada no hace referencia a ningún vídeo admitido"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:865
 #, python-format
 msgid "The provided url is not valid"
-msgstr ""
+msgstr "La URL proporcionada no es válida"
 
 #. module: web_editor
 #. openerp-web
@@ -1438,7 +1445,7 @@ msgstr "Contenido traducido"
 #: code:addons/web_editor/static/src/js/editor/translator.js:91
 #, python-format
 msgid "Translation Info"
-msgstr ""
+msgstr "Información de la traducción"
 
 #. module: web_editor
 #. openerp-web
@@ -1453,7 +1460,7 @@ msgstr "Transparente"
 #: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
-msgstr ""
+msgstr "URL o correo electrónico"
 
 #. module: web_editor
 #. openerp-web
@@ -1474,7 +1481,7 @@ msgstr "Deshacer"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:86
 #, python-format
 msgid "Unexpected "
-msgstr ""
+msgstr "Inesperado"
 
 #. module: web_editor
 #. openerp-web
@@ -1545,21 +1552,21 @@ msgstr "¿URL vídeo?"
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "Video code"
-msgstr ""
+msgstr "Código de vídeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1577,7 +1584,7 @@ msgstr "Blanco"
 #: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
 msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
 
 #. module: web_editor
 #. openerp-web
@@ -1598,14 +1605,14 @@ msgstr "Está a punto de entrar en el modo de traducción."
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youku"
-msgstr ""
+msgstr "Youku"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youtube"
-msgstr ""
+msgstr "Youtube"
 
 #. module: web_editor
 #. openerp-web
@@ -1622,7 +1629,7 @@ msgstr "y"
 #: code:addons/web_editor/static/src/xml/editor.xml:379
 #, python-format
 msgid "auto"
-msgstr ""
+msgstr "automático"
 
 #. module: web_editor
 #. openerp-web
@@ -1731,7 +1738,7 @@ msgstr "ir.ui.view"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "videos"
-msgstr ""
+msgstr "vídeos"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
diff --git a/addons/web_editor/i18n/fr.po b/addons/web_editor/i18n/fr.po
index 028410630d3..718600e927e 100644
--- a/addons/web_editor/i18n/fr.po
+++ b/addons/web_editor/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Loic <loic.richard2@gmail.com>, 2016
@@ -13,27 +13,28 @@
 # Vincent Hammadache <vhammadache@gmail.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Fabri Yohann <psn@fabri.pw>, 2016
-# Fabrice Henrion <fhe@odoo.com>, 2016
+# Fabrice Henrion, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
-# Kévin R. <realrom@hotmail.fr>, 2016
+# Kévin R., 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Fabien Bourgeois <fabien@yaltik.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Hubert TETARD <htetard@apik-conseils.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Olivier Dony <odo@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Olivier Dony <odo@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -46,7 +47,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "(URL or Embed)"
-msgstr ""
+msgstr "(URL ou code incorporé)"
 
 #. module: web_editor
 #. openerp-web
@@ -98,13 +99,15 @@ msgid ""
 "A server error occured. Please check you correctly signed in and that the "
 "file you are saving is well-formed."
 msgstr ""
+"Une erreur de serveur est survenue. Vérifiez que vous êtes bien connecté et "
+"que le fichier que vous sauvegardez est bien mis en forme."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Accepts"
-msgstr ""
+msgstr "Accepte"
 
 #. module: web_editor
 #. openerp-web
@@ -349,7 +352,7 @@ msgstr "Contenu à traduire"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr ""
+msgstr "Copiez-coller votre URL ou votre code incorporé ici"
 
 #. module: web_editor
 #. openerp-web
@@ -387,7 +390,7 @@ msgstr "Personnalisé"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Dailymotion"
-msgstr ""
+msgstr "Dailymotion"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -425,7 +428,7 @@ msgstr "Description"
 #: code:addons/web_editor/static/src/xml/editor.xml:34
 #, python-format
 msgid "Description (alt tag)"
-msgstr ""
+msgstr "Description (balise alt)"
 
 #. module: web_editor
 #. openerp-web
@@ -677,35 +680,35 @@ msgstr "Voici les exemples utilisés pour vous aider à traduire efficacement"
 #: code:addons/web_editor/static/src/xml/editor.xml:219
 #, python-format
 msgid "Hide Dailymotion logo"
-msgstr ""
+msgstr "Masquer le logo Dailymotion"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:216
 #, python-format
 msgid "Hide Youtube logo"
-msgstr ""
+msgstr "Masquer le logo YouTube"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:213
 #, python-format
 msgid "Hide fullscreen button"
-msgstr ""
+msgstr "Masquer le bouton plein écran"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr ""
+msgstr "Masquer les commandes du lecteur"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:222
 #, python-format
 msgid "Hide sharing button"
-msgstr ""
+msgstr "Masquer le bouton de partage"
 
 #. module: web_editor
 #. openerp-web
@@ -738,6 +741,8 @@ msgid ""
 "If you reset this file, all your customizations will be lost as it will be "
 "reverted to the default file."
 msgstr ""
+"Si vous réinitialisez ce fichier, toutes vos personnalisations seront "
+"perdues, car vous retrouverez le fichier par défaut."
 
 #. module: web_editor
 #. openerp-web
@@ -761,13 +766,15 @@ msgid ""
 "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n"
 "        Each modification on the master page is automatically applied to all translated versions."
 msgstr ""
+"Dans ce mode, vous pouvez uniquement traduire des textes. Pour modifier la structure de la page, vous devez modifier la page principale.\n"
+" Chaque modification de la page principale est automatiquement appliquée à toutes les versions traduites."
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/ace.xml:23
 #, python-format
 msgid "Include All LESS Files"
-msgstr ""
+msgstr "Inclure tous les fichiers MOINS"
 
 #. module: web_editor
 #. openerp-web
@@ -821,7 +828,7 @@ msgstr "Insérer une video"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Instagram"
-msgstr ""
+msgstr "Instagram"
 
 #. module: web_editor
 #. openerp-web
@@ -856,7 +863,7 @@ msgstr "Raccourcis clavier"
 #: code:addons/web_editor/static/src/xml/ace.xml:11
 #, python-format
 msgid "LESS (CSS)"
-msgstr ""
+msgstr "MOINS (CSS)"
 
 #. module: web_editor
 #. openerp-web
@@ -886,7 +893,7 @@ msgstr "Dernière mise à jour le"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:360
 #, python-format
 msgid "Less file: %s"
-msgstr ""
+msgstr "Fichier moins : %s"
 
 #. module: web_editor
 #. openerp-web
@@ -921,7 +928,7 @@ msgstr "Lien vers"
 #: code:addons/web_editor/static/src/xml/editor.xml:207
 #, python-format
 msgid "Loop"
-msgstr ""
+msgstr "Boucle"
 
 #. module: web_editor
 #. openerp-web
@@ -985,7 +992,7 @@ msgstr "Ok"
 #: code:addons/web_editor/static/src/js/editor/translator.js:93
 #, python-format
 msgid "Ok, never show me this again"
-msgstr ""
+msgstr "OK, ne plus me montrer cela"
 
 #. module: web_editor
 #. openerp-web
@@ -1168,7 +1175,7 @@ msgstr "Remise par défaut"
 #: code:addons/web_editor/static/src/js/widgets/ace.js:485
 #, python-format
 msgid "Reseting views is not supported yet"
-msgstr ""
+msgstr "La réinitialisation des affichages n'est pas encore possible"
 
 #. module: web_editor
 #. openerp-web
@@ -1387,14 +1394,14 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:871
 #, python-format
 msgid "The provided url does not reference any supported video"
-msgstr ""
+msgstr "L'URL fournie ne renvoie à aucune vidéo compatible"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/widgets/widgets.js:865
 #, python-format
 msgid "The provided url is not valid"
-msgstr ""
+msgstr "L'URL fournie n'est pas valide"
 
 #. module: web_editor
 #. openerp-web
@@ -1444,7 +1451,7 @@ msgstr "Traduire le contenu"
 #: code:addons/web_editor/static/src/js/editor/translator.js:91
 #, python-format
 msgid "Translation Info"
-msgstr ""
+msgstr "Informations de traduction"
 
 #. module: web_editor
 #. openerp-web
@@ -1459,7 +1466,7 @@ msgstr "Transparent"
 #: code:addons/web_editor/static/src/xml/editor.xml:248
 #, python-format
 msgid "URL or Email"
-msgstr ""
+msgstr "URL ou e-mail"
 
 #. module: web_editor
 #. openerp-web
@@ -1551,21 +1558,21 @@ msgstr "Url vidéo?"
 #: code:addons/web_editor/static/src/xml/editor.xml:193
 #, python-format
 msgid "Video code"
-msgstr ""
+msgstr "Code de la vidéo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vimeo"
-msgstr ""
+msgstr "Vimeo"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Vine.co"
-msgstr ""
+msgstr "Vine.co"
 
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
@@ -1583,7 +1590,7 @@ msgstr "Blanc"
 #: code:addons/web_editor/static/src/xml/ace.xml:10
 #, python-format
 msgid "XML (HTML)"
-msgstr ""
+msgstr "XML (HTML)"
 
 #. module: web_editor
 #. openerp-web
@@ -1604,7 +1611,7 @@ msgstr "Vous allez passer en mode traduction."
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "Youku"
-msgstr ""
+msgstr "Youku"
 
 #. module: web_editor
 #. openerp-web
@@ -1737,7 +1744,7 @@ msgstr "ir.ui.view"
 #: code:addons/web_editor/static/src/xml/editor.xml:198
 #, python-format
 msgid "videos"
-msgstr ""
+msgstr "vidéos"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_web_editor_converter_test
diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/fields.js
index b84fcd21c91..d3d601bac73 100644
--- a/addons/web_editor/static/src/js/backend/fields.js
+++ b/addons/web_editor/static/src/js/backend/fields.js
@@ -118,6 +118,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
      */
     _getValue: function () {
         if (this.nodeOptions['style-inline']) {
+            transcoder.linkImgToAttachmentThumbnail(this.$content);
             transcoder.classToStyle(this.$content);
             transcoder.fontToImg(this.$content);
         }
@@ -133,6 +134,8 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
         this.$textarea.summernote(this._getSummernoteConfig());
         this.$content = this.$('.note-editable:first');
         this.$content.html(this._textToHtml(this.value));
+        this.$content.data('oe-id', this.recordData.res_id || this.res_id);
+        this.$content.data('oe-model', this.recordData.model || this.model);
         // trigger a mouseup to refresh the editor toolbar
         this.$content.trigger('mouseup');
         if (this.nodeOptions['style-inline']) {
diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js
index d2613f42635..fb4d6fc7206 100644
--- a/addons/web_editor/static/src/js/editor/rte.summernote.js
+++ b/addons/web_editor/static/src/js/editor/rte.summernote.js
@@ -1084,8 +1084,12 @@ var SummernoteManager = Class.extend(mixins.EventDispatcherMixin, {
             return;
         }
         data.__alreadyDone = true;
+
         var mediaDialog = new weWidgets.MediaDialog(this,
-            data.options || {},
+            _.extend({
+                res_model: data.$editable.data('oe-model'),
+                res_id: data.$editable.data('oe-id'),
+            }, data.options),
             data.$editable,
             data.media
         );
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index 24d9663a058..188b563f238 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -813,9 +813,12 @@ registry.background = SnippetOption.extend({
         // Put fake image in the DOM, edit it and use it as background-image
         var $image = $('<img/>', {class: 'hidden', src: value}).appendTo(this.$target);
 
+        var $editable = this.$target.closest('.o_editable');
         var _editor = new weWidgets.MediaDialog(this, {
             onlyImages: true,
             firstFilters: ['background'],
+            res_model: $editable.data('oe-model'),
+            res_id: $editable.data('oe-id'),            
         }, null, $image[0]).open();
 
         _editor.on('save', this, function () {
diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js
index 59609eab8a5..121a1a6d3d7 100644
--- a/addons/web_editor/static/src/js/editor/summernote.js
+++ b/addons/web_editor/static/src/js/editor/summernote.js
@@ -913,15 +913,21 @@ range.WrappedRange.prototype.deleteContents = function (towrite) {
         return this;
     }
 
-    var prevBP = dom.removeBetween(this.sc, this.so, this.ec, this.eo, towrite);
+    var r;
+    var image = this.isOnImg();
+    if (image) {
+        // If the range matches/is in an image, then the image is to be removed
+        // and the cursor moved to its previous position
+        var parentNode = image.parentNode;
+        var index = _.indexOf(parentNode.childNodes, image);
+        parentNode.removeChild(image);
+        r = new range.WrappedRange(parentNode, index, parentNode, index);
+    } else {
+        r = dom.removeBetween(this.sc, this.so, this.ec, this.eo, towrite);
+    }
 
-    $(dom.node(prevBP.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler
-    return new range.WrappedRange(
-      prevBP.sc,
-      prevBP.so,
-      prevBP.ec,
-      prevBP.eo
-    );
+    $(dom.node(r.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler
+    return new range.WrappedRange(r.sc, r.so, r.ec, r.eo);
 };
 range.WrappedRange.prototype.clean = function (mergeFilter, all) {
     var node = dom.node(this.sc === this.ec ? this.sc : this.commonAncestor());
@@ -1258,7 +1264,7 @@ $.summernote.pluginEvents.visible = function (event, editor, layoutInfo) {
 };
 
 function remove_table_content(r) {
-    var nodes = dom.listBetween(r.sc, r.ec);
+    var nodes = dom.listBetween(r.sc, r.ec, r.so, r.eo);
     if (dom.isText(r.sc)) {
         r.sc.textContent = r.sc.textContent.slice(0, r.so);
     }
diff --git a/addons/web_editor/static/src/js/editor/transcoder.js b/addons/web_editor/static/src/js/editor/transcoder.js
index 058ea8ebcc7..6fd57c0330b 100644
--- a/addons/web_editor/static/src/js/editor/transcoder.js
+++ b/addons/web_editor/static/src/js/editor/transcoder.js
@@ -18,7 +18,7 @@ function getMatchedCSSRules(a) {
         var sheets = document.styleSheets;
         for (i = sheets.length-1 ; i >= 0 ; i--) {
             var rules;
-            if (sheets[i].rules) {
+            if (sheets[i].hasOwnProperty('rules')) {
                 rules = sheets[i].rules;
             } else {
                 // try...catch because Firefox not able to enumerate
@@ -259,10 +259,40 @@ function styleToClass($editable) {
     $c.remove();
 }
 
+/**
+ * Converts css display for attachment link to real image.
+ * Without this post process, the display depends on the css and the picture
+ * does not appear when we use the html without css (to send by email for e.g.)
+ *
+ * @param {jQuery} $editable
+ */
+function attachmentThumbnailToLinkImg($editable) {
+    $editable.find('a[href*="/web/content/"][data-mimetype]:empty').each(function () {
+        var $link = $(this);
+        var $img = $('<img/>')
+            .attr('src', $link.css('background-image').replace(/(^url\(['"])|(['"]\)$)/g, ''))
+            .css('height', Math.max(1, $link.height()) + 'px')
+            .css('width', Math.max(1, $link.width()) + 'px');
+        $link.append($img);
+    });
+}
+
+/**
+ * Revert attachmentThumbnailToLinkImg changes
+ *
+ * @see attachmentThumbnailToLinkImg
+ * @param {jQuery} $editable
+ */
+function linkImgToAttachmentThumbnail($editable) {
+    $editable.find('a[href*="/web/content/"][data-mimetype] > img').remove();
+}
+
 return {
     fontToImg: fontToImg,
     imgToFont: imgToFont,
     classToStyle: classToStyle,
     styleToClass: styleToClass,
+    attachmentThumbnailToLinkImg: attachmentThumbnailToLinkImg,
+    linkImgToAttachmentThumbnail: linkImgToAttachmentThumbnail,
 };
 });
diff --git a/addons/web_editor/static/src/js/iframe.js b/addons/web_editor/static/src/js/iframe.js
index 949a141c333..f2c5e3be661 100644
--- a/addons/web_editor/static/src/js/iframe.js
+++ b/addons/web_editor/static/src/js/iframe.js
@@ -82,7 +82,7 @@ translator.Class.include({
 
 //==============================================================================
 
-odoo.define('web_editor.IframeRoot.instance', function (require) {
+odoo.define('root.widget', function (require) {
 'use strict';
 
 require('web.dom_ready');
diff --git a/addons/web_editor/static/src/js/inline.js b/addons/web_editor/static/src/js/inline.js
index 7480b2228fa..b1de23cb293 100644
--- a/addons/web_editor/static/src/js/inline.js
+++ b/addons/web_editor/static/src/js/inline.js
@@ -53,6 +53,7 @@ snippet_editor.Class.include({
         this._super.apply(this, arguments);
 
         var $editable = $('#editable_area');
+        transcoder.linkImgToAttachmentThumbnail($editable);
         transcoder.fontToImg($editable);
         transcoder.classToStyle($editable);
 
diff --git a/addons/web_editor/static/src/js/widgets/ace.js b/addons/web_editor/static/src/js/widgets/ace.js
index 6c28c1e2332..0a89d0d8ce7 100644
--- a/addons/web_editor/static/src/js/widgets/ace.js
+++ b/addons/web_editor/static/src/js/widgets/ace.js
@@ -742,7 +742,7 @@ var ViewEditor = Widget.extend({
 
             var text = data.text || '';
             if (!isSelected) {
-                text = Array($elem.data('level') + 1).join('-') + ' ' + text;
+                text = Array(($elem.data('level') || 0) + 1).join('-') + ' ' + text;
             }
             var $div = $('<div/>',  {
                 text: text,
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 6791a21f721..c9659e04eab 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -206,13 +206,16 @@ var ImageWidget = MediaWidget.extend({
 
         this.IMAGES_PER_PAGE = this.IMAGES_PER_ROW * this.IMAGES_ROWS;
 
+        this.options = options;
         this.accept = options.accept || (options.document ? '*/*' : 'image/*');
-        this.domain = options.domain
-            || [
-                '|',
-                ['mimetype', '=', false],
-                ['mimetype', options.document ? 'not in' : 'in', ['image/gif', 'image/jpe', 'image/jpeg', 'image/jpg', 'image/gif', 'image/png']]
-            ];
+        if (options.res_id) {
+            this.domain = ['|',
+                '&', ['res_model', '=', options.res_model], ['res_id', '=', options.res_id],
+                ['res_model', '=', 'ir.ui.view']];
+        } else {
+            this.domain = [['res_model', '=', 'ir.ui.view']];
+        }
+
         this.multiImages = options.multiImages;
 
         this.firstFilters = options.firstFilters || [];
@@ -279,32 +282,55 @@ var ImageWidget = MediaWidget.extend({
      * @override
      */
     save: function () {
+        var self = this;
         if (this.multiImages) {
             return this.images;
         }
 
         var img = this.images[0];
-        if (!img.isDocument) {
-            if (!this.$media.is('img')) {
-                this._replaceMedia($('<img/>'));
-            }
-            this.$media.attr('src', img.src);
-        } else {
-            if (!this.$media.is('a')) {
-                $('.note-control-selection').hide();
-                this._replaceMedia($('<a/>'));
-            }
-            this.$media.attr('href', '/web/content/' + img.id + '?unique=' + img.checksum + '&download=true');
-            this.$media.addClass('o_image').attr('title', img.name).attr('data-mimetype', img.mimetype);
+        var def = $.when();
+        if (!img.access_token) {
+            def = this._rpc({
+                model: 'ir.attachment',
+                method: 'generate_access_token',
+                args: [[img.id]]
+            }).then(function (access_token) {
+                img.access_token = access_token[0];
+            });
         }
 
-        this.$media.attr('alt', img.alt);
-        var style = this.style;
-        if (style) {
-            this.$media.css(style);
-        }
+        return def.then(function () {
+            if (!img.isDocument) {
+                if (img.access_token && self.options.res_model !== 'ir.ui.view') {
+                    img.src += _.str.sprintf('?access_token=%s', img.access_token);
+                }
+                if (!self.$media.is('img')) {
+                    self._replaceMedia($('<img/>'));
+                }
+                self.$media.attr('src', img.src);
 
-        return this.media;
+            } else {
+                if (!self.$media.is('a')) {
+                    $('.note-control-selection').hide();
+                    self._replaceMedia($('<a/>'));
+                }
+                var href = '/web/content/' + img.id + '?';
+                if (img.access_token && self.options.res_model !== 'ir.ui.view') {
+                    href += _.str.sprintf('access_token=%s&', img.access_token);
+                }
+                href += 'unique=' + img.checksum + '&download=true';
+                self.$media.attr('href', href);
+                self.$media.addClass('o_image').attr('title', img.name).attr('data-mimetype', img.mimetype);
+            }
+
+            self.$media.attr('alt', img.alt);
+            var style = self.style;
+            if (style) {
+                self.$media.css(style);
+            }
+
+            return self.media;
+        });
     },
     /**
      * @override
@@ -314,7 +340,7 @@ var ImageWidget = MediaWidget.extend({
         if (!noRender) {
             this.$('input.url').val('').trigger('input').trigger('change');
         }
-        var domain = [['res_model', '=', 'ir.ui.view']].concat(this.domain);
+        var domain = this.domain.concat(['|', ['mimetype', '=', false], ['mimetype', this.options.document ? 'not in' : 'in', ['image/gif', 'image/jpe', 'image/jpeg', 'image/jpg', 'image/gif', 'image/png']]]);
         if (needle && needle.length) {
             domain.push('|', ['datas_fname', 'ilike', needle], ['name', 'ilike', needle]);
         }
@@ -324,7 +350,7 @@ var ImageWidget = MediaWidget.extend({
             args: [],
             kwargs: {
                 domain: domain,
-                fields: ['name', 'datas_fname', 'mimetype', 'checksum', 'url', 'type'],
+                fields: ['name', 'datas_fname', 'mimetype', 'checksum', 'url', 'type', 'res_id', 'res_model', 'access_token'],
                 order: [{name: 'id', asc: false}],
                 context: weContext.get(),
             },
@@ -354,7 +380,7 @@ var ImageWidget = MediaWidget.extend({
                 .value();
 
             _.each(self.records, function (record) {
-                record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, record.name); // Name is added for SEO purposes
+                record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, encodeURI(record.name));  // Name is added for SEO purposes
                 record.isDocument = !(/gif|jpe|jpg|png/.test(record.mimetype));
             });
             if (!noRender) {
@@ -1143,11 +1169,15 @@ var MediaDialog = Dialog.extend({
      */
     save: function () {
         var self = this;
+        var args = arguments;
+        var _super = this._super;
         if (this.multiImages) {
             // In the case of multi images selection we suppose this was not to
             // replace an old media, so we only retrieve the images and save.
-            this.final_data = this.active.save();
-            return this._super.apply(this, arguments);
+            return $.when(this.active.save()).then(function (data) {
+                self.final_data = data;
+                return _super.apply(self, args);
+            });
         }
 
         if (this.rte) {
@@ -1164,28 +1194,29 @@ var MediaDialog = Dialog.extend({
                 }
             });
         }
-        var media = this.active.save();
-        if (!this.media) {
-            this.range.insertNode(media, true);
-        }
-        this.media = media;
-        this.$media = $(media);
 
-        this.final_data = this.media;
-        $(this.final_data).trigger('input').trigger('save');
-        $(document.body).trigger("media-saved", this.final_data); // TODO get rid of this
-
-        // Update editor bar after image edition (in case the image change to icon or other)
-        _.defer(function () {
-            if (!self.media.parentNode) {
-                return;
+        return $.when(this.active.save()).then(function (media) {
+            if (!self.media) {
+                self.range.insertNode(media, true);
             }
-            range.createFromNode(self.media).select();
-            simulateMouseEvent(self.media, 'mousedown');
-            simulateMouseEvent(self.media, 'mouseup');
-        });
+            self.media = media;
+            self.$media = $(media);
 
-        return this._super.apply(this, arguments);
+            self.final_data = self.media;
+            $(self.final_data).trigger('input').trigger('save');
+            $(document.body).trigger("media-saved", self.final_data); // TODO get rid of this
+
+            // Update editor bar after image edition (in case the image change to icon or other)
+            _.defer(function () {
+                if (!self.media.parentNode) {
+                    return;
+                }
+                range.createFromNode(self.media).select();
+                simulateMouseEvent(self.media, 'mousedown');
+                simulateMouseEvent(self.media, 'mouseup');
+            });
+            return _super.apply(self, args);
+        });
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 81abb435f2b..425c1bf1bce 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -86,6 +86,8 @@
             target="fileframe">
             <input type="hidden" name="csrf_token" t-att-value="csrf_token"/>
             <input type="hidden" name="filters" t-att-value="widget.firstFilters.join('_')"/>
+            <input t-if="widget.options.res_id" type="hidden" name="res_id" t-att-value="widget.options.res_id"/>
+            <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
             <div class="well">
                 <div class="form-group pull-left">
                     <input type="file" class="hidden" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
@@ -142,8 +144,9 @@
         <div class="existing-attachments">
             <div class="row mt16" t-as="row" t-foreach="rows">
                 <div class="col-sm-2 o_existing_attachment_cell" t-as="attachment" t-foreach="row">
-                    <i class="fa fa-times o_existing_attachment_remove" t-att-data-id="attachment.id"/>
-                    <div class="o_attachment_border"><div t-att-data-src="attachment.src" t-att-data-url="attachment.url" t-att-alt="attachment.name" t-att-title="attachment.name" t-att-data-id="attachment.id" t-att-data-mimetype="attachment.mimetype" class="o_image o_image_loading"/></div>
+                    <i t-if="attachment.res_model === 'ir.ui.view'" class="fa fa-times o_existing_attachment_remove" title="This file is a public view attachment" t-att-data-id="attachment.id"/>
+                    <i t-else="" class="fa fa-times o_existing_attachment_remove" title="This file is attached to the current record" t-att-data-id="attachment.id"/>
+                    <div class="o_attachment_border" t-att-style="attachment.res_model === 'ir.ui.view' ? null : 'border: 1px solid #5cb85c;'"><div t-att-data-src="attachment.src" t-att-data-url="attachment.url" t-att-alt="attachment.name" t-att-title="attachment.name" t-att-data-id="attachment.id" t-att-data-mimetype="attachment.mimetype" class="o_image o_image_loading"/></div>
                 </div>
             </div>
         </div>
diff --git a/addons/web_settings_dashboard/i18n/de.po b/addons/web_settings_dashboard/i18n/de.po
index 374b11b12df..3f76b1fd740 100644
--- a/addons/web_settings_dashboard/i18n/de.po
+++ b/addons/web_settings_dashboard/i18n/de.po
@@ -6,17 +6,18 @@
 # key six <mobile.umts@gmail.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Markus Mattes <mmattes87@gmail.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Thorsten Vocks <thorsten.vocks@openbig.org>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,14 +112,14 @@ msgstr "E-Mail-Adressen eingeben (eine pro Zeile)"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:116
 #, python-format
 msgid "GNU LGPL Licensed"
-msgstr ""
+msgstr "GNU LGPL Lizenz"
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:140
 #, python-format
 msgid "Get more features with the Enterprise Edition!"
-msgstr ""
+msgstr "Weitere Funktionen erhalten Sie mit der Enterprise Edition!"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -221,27 +222,29 @@ msgid ""
 "Send your documents in your partner's language or set up a language for your"
 " users"
 msgstr ""
+"Senden Sie Ihre Dokumente in der Sprache Ihres Partners oder richten Sie "
+"eine Sprache für Ihre Benutzer ein."
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:178
 #, python-format
 msgid "Set Up"
-msgstr ""
+msgstr "Einrichten"
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:173
 #, python-format
 msgid "Set up your company information"
-msgstr ""
+msgstr "Unternehmensinformationen einrichten"
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:91
 #, python-format
 msgid "Share the Love"
-msgstr ""
+msgstr "Freude teilen"
 
 #. module: web_settings_dashboard
 #. openerp-web
diff --git a/addons/web_settings_dashboard/i18n/es.po b/addons/web_settings_dashboard/i18n/es.po
index d6bf0ddfb07..7605151d9d0 100644
--- a/addons/web_settings_dashboard/i18n/es.po
+++ b/addons/web_settings_dashboard/i18n/es.po
@@ -3,23 +3,24 @@
 # * web_settings_dashboard
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # David Arnold <blaggacao@users.noreply.github.com>, 2017
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -114,7 +115,7 @@ msgstr "Introduzca direcciones e-mail (una por línea)"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:116
 #, python-format
 msgid "GNU LGPL Licensed"
-msgstr ""
+msgstr "Con licencia GNU LGPL"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -246,7 +247,7 @@ msgstr "Configurar los datos de la compañía"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:91
 #, python-format
 msgid "Share the Love"
-msgstr ""
+msgstr "Compartir el amor"
 
 #. module: web_settings_dashboard
 #. openerp-web
diff --git a/addons/web_settings_dashboard/i18n/fr.po b/addons/web_settings_dashboard/i18n/fr.po
index a07086cdbfa..901e691698a 100644
--- a/addons/web_settings_dashboard/i18n/fr.po
+++ b/addons/web_settings_dashboard/i18n/fr.po
@@ -6,19 +6,20 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Mensanh Dodji Anani LAWSON <omolowo73@gmail.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -113,7 +114,7 @@ msgstr "Saisir les adressees courriels (une par ligne)"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:116
 #, python-format
 msgid "GNU LGPL Licensed"
-msgstr ""
+msgstr "Licence publique générale limitée GNU"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -221,20 +222,22 @@ msgid ""
 "Send your documents in your partner's language or set up a language for your"
 " users"
 msgstr ""
+"Envoyez vos documents dans la langue de votre partenaire ou configurez une "
+"langue pour vos utilisateurs"
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:178
 #, python-format
 msgid "Set Up"
-msgstr ""
+msgstr "Configurer"
 
 #. module: web_settings_dashboard
 #. openerp-web
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:173
 #, python-format
 msgid "Set up your company information"
-msgstr ""
+msgstr "Configurer les informations de votre entreprise"
 
 #. module: web_settings_dashboard
 #. openerp-web
diff --git a/addons/web_tour/static/src/js/tour_service.js b/addons/web_tour/static/src/js/tour_service.js
index fdfac78f6a9..d1d46625560 100644
--- a/addons/web_tour/static/src/js/tour_service.js
+++ b/addons/web_tour/static/src/js/tour_service.js
@@ -1,13 +1,11 @@
-odoo.define('web_tour.tour', function(require) {
+odoo.define('web_tour.tour', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
-var Class = require('web.Class');
 var config = require('web.config');
 var core = require('web.core');
-var mixins = require('web.mixins');
+var rootWidget = require('root.widget');
 var rpc = require('web.rpc');
-var ServiceProviderMixin = require('web.ServiceProviderMixin');
 var session = require('web.session');
 var TourManager = require('web_tour.TourManager');
 
@@ -17,13 +15,6 @@ if (config.device.isMobile) {
     return $.Deferred().reject();
 }
 
-var CallService = Class.extend(mixins.EventDispatcherMixin, ServiceProviderMixin, {
-    init: function () {
-        mixins.EventDispatcherMixin.init.call(this);
-        ServiceProviderMixin.init.call(this);
-    },
-});
-
 /**
  * @namespace
  * @property {Object} active_tooltips
@@ -48,7 +39,7 @@ return session.is_bound.then(function () {
     }
     return $.when.apply($, defs).then(function (consumed_tours) {
         consumed_tours = session.is_frontend ? consumed_tours : session.web_tours;
-        var tour_manager = new TourManager(new CallService(), consumed_tours);
+        var tour_manager = new TourManager(rootWidget, consumed_tours);
 
         // Use a MutationObserver to detect DOM changes
         var untracked_classnames = ["o_tooltip", "o_tooltip_content", "o_tooltip_overlay"];
@@ -83,8 +74,8 @@ return session.is_bound.then(function () {
                      * Once the DOM is ready, we still have to wait all the modules are loaded before completing the tours
                      * registration and starting listening for DOM mutations.
                      */
-                     $.when(load_def).then(function () {
-                         _.defer(function () {
+                    $.when(load_def).then(function () {
+                        _.defer(function () {
                             tour_manager._register_all(observe);
                             if (observe) {
                                 observer.observe(document.body, {
diff --git a/addons/website/i18n/de.po b/addons/website/i18n/de.po
index 79a6e1a7e88..3e846310b97 100644
--- a/addons/website/i18n/de.po
+++ b/addons/website/i18n/de.po
@@ -4,23 +4,23 @@
 # 
 # Translators:
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Tina Milas <tina@uvid.hr>, 2017
+# Wolfgang Taferner, 2017
+# Tina Milas, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Christian Oechsner <carinachristian@gmail.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Andi, 2017
+# Renzo Meister, 2017
 # aNj <anj2j@yahoo.de>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
@@ -28,13 +28,14 @@
 # Katharina Moritz <kmo@e2f.com>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Mathias Neef <mn@copado.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,14 +48,14 @@ msgstr ""
 #: code:addons/website/static/src/js/editor/snippets.options.js:927
 #, python-format
 msgid " Add Images"
-msgstr ""
+msgstr "Bilder hinzufügen"
 
 #. module: website
 #: code:addons/website/models/website.py:233
 #: code:addons/website/models/website.py:302
 #, python-format
 msgid "%s (id:%s)"
-msgstr ""
+msgstr "%s (id:%s)"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -89,7 +90,7 @@ msgstr "&times;"
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "' did not match any pages."
-msgstr ""
+msgstr "' hat keine Seiten mit einem Treffer gefunden."
 
 #. module: website
 #: code:addons/website/models/website.py:723
@@ -97,14 +98,14 @@ msgstr ""
 #: code:addons/website/models/website.py:743
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(Kopie)"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:29
 #, python-format
 msgid "(could be used in"
-msgstr ""
+msgstr "(könnte verwendet werden in"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout_footer_copyright
@@ -142,11 +143,13 @@ msgid ""
 ".\n"
 "            Changing its name will break these calls."
 msgstr ""
+".\n"
+" Die Änderung des Namens wird diese Anrufe beenden."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.default_csv
 msgid "1,2,3"
-msgstr ""
+msgstr "1,2,3"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -215,6 +218,8 @@ msgid ""
 "<b>Click on a text</b> to start editing it. <i>It's that easy to edit your "
 "content!</i>"
 msgstr ""
+"<b>Klicken Sie auf einen Text,</b> um ihn zu bearbeiten. <i>So einfach ist "
+"das Bearbeiten von Inhalten!</i>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -239,6 +244,12 @@ msgid ""
 "                        quirks like word choices or phrases. Write from your point\n"
 "                        of view, not from someone else's experience."
 msgstr ""
+"<b>Großartige Geschichten haben Persönlichkeit.</b> Denken Sie daran,\n"
+" eine großartige Geschichte mit Persönlichkeit zu erzählen. Eine Geschichte\n"
+" mit Persönlichkeit erleichtert es, mit potentiellen Kunden eine\n"
+" Verbindung herzustellen. Dies zeigt sich in kleinen\n"
+" Besonderheiten wie Wortwahl oder Wendungen. Schreiben Sie von Ihrer Perspektive\n"
+" aus, nicht von der Erfahrung anderer."
 
 #. module: website
 #. openerp-web
@@ -246,6 +257,7 @@ msgstr ""
 #, python-format
 msgid "<b>Install a contact form</b> to improve this page."
 msgstr ""
+"<b>Installieren Sie ein Kontaktformular,</b> um diese Seite zu verbessern."
 
 #. module: website
 #. openerp-web
@@ -255,6 +267,8 @@ msgid ""
 "<b>Install new apps</b> to get more features. Let's install the <i>'Contact "
 "form'</i> app."
 msgstr ""
+"<b>Installieren Sie neue Apps,</b> um mehr Funktionen zu erhalten. "
+"Installieren Sie die App <i>„Kontaktformular“.</i>"
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -284,12 +298,12 @@ msgstr "<i class=\"fa fa-arrows-h\"/>Bildabstand"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Scroll Speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>Scroll Geschwindigkeit"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Slideshow speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>Geschwindigkeit Folienwechsel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -309,7 +323,7 @@ msgstr "<i class=\"fa fa-eyedropper\"/>Boja pozadine"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-eyedropper\"/>Overlay color"
-msgstr ""
+msgstr "<i class=\"fa fa-eyedropper\"/>Overlay-Farbe"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -319,12 +333,12 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-indent\"/> Inner content"
-msgstr ""
+msgstr "<i class=\"fa fa-indent\"/>Innerer Inhalt"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-magic icon-fix\"/> Effect"
-msgstr ""
+msgstr "<i class=\"fa fa-magic icon-fix\"/>Effekt"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -334,12 +348,12 @@ msgstr "<i class=\"fa fa-magic\"/>Modus"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-magnet\"/>Float"
-msgstr ""
+msgstr "<i class=\"fa fa-magnet\"/>Textumlauf"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-paint-brush\"/>Styling"
-msgstr ""
+msgstr "<i class=\"fa fa-paint-brush\"/>Styling"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -368,22 +382,22 @@ msgstr "Bild hinzufügen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-refresh\"/>Re-order"
-msgstr ""
+msgstr "<i class=\"fa fa-refresh\"/>Umstellen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-th\"/>Columns"
-msgstr ""
+msgstr "<i class=\"fa fa-th\"/>Spalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-th-large\"/> Structure"
-msgstr ""
+msgstr "<i class=\"fa fa-th-large\"/>Struktur"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "<i class=\"fa fa-th-large\"/> WEBSITE <b class=\"caret\"/>"
-msgstr ""
+msgstr "<i class=\"fa fa-th-large\"/>Website<b class=\"caret\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -393,12 +407,12 @@ msgstr "<i class=\"fa fa-trash\"/>Alle Bilder löschen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-trash-o\"/>Remove Slide"
-msgstr ""
+msgstr "<i class=\"fa fa-trash-o\"/>Folie entfernen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
-msgstr ""
+msgstr "<i>Sofortiges Einrichtigen, mit Zufriedenheitsgarantie.</i>"
 
 #. module: website
 #. openerp-web
@@ -408,6 +422,9 @@ msgid ""
 "<p><b>That's it.</b> Your homepage is live.</p><p>Continue adding more pages"
 " to your site or edit this page to make it even more awesome.</p>"
 msgstr ""
+"<p><b>Das war's schon.</b> Ihre Homepage ist live. Fügen</p><p> Sie weitere "
+"Seiten hinzu oder Bearbeiten Sie diese Seite, damit sie noch umwerfender "
+"wird.</p>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_floating
@@ -416,6 +433,9 @@ msgid ""
 "to tell a story. Everything you consider writing can be told as a "
 "story.</small>"
 msgstr ""
+"<small class=\"text-muted\">Eine Geschichte ist eine großartige Möglichkeit,"
+" die Aufmerksamkeit Ihrer Leser zu erhalten. Alles, was Sie schreiben "
+"möchten, kann als Geschichte erzählt werden.</small>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_parallax_slider
@@ -433,6 +453,8 @@ msgid ""
 "<span class=\"caret\"/>\n"
 "                            <span class=\"sr-only\">Toggle Dropdown</span>"
 msgstr ""
+"<span class=\"caret\"/>\n"
+" <span class=\"sr-only\">Dropdown-Menü aktivieren</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -458,6 +480,8 @@ msgid ""
 "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
 "plus-circle\"/> Add Images</span>"
 msgstr ""
+"<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
+"plus-circle\"/>Bilder hinzufügen</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
@@ -467,6 +491,10 @@ msgid ""
 "                <span class=\"icon-bar\"/>\n"
 "                <span class=\"icon-bar\"/>"
 msgstr ""
+"<span class=\"sr-only\">Navigationsmenü aktivieren\n"
+"</span> <span class=\"icon-bar\"/>\n"
+" <span class=\"icon-bar\"/>\n"
+"<span class=\"icon-bar\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -475,6 +503,9 @@ msgid ""
 "                                <span class=\"css_publish\">Unpublished</span>\n"
 "                                <span class=\"css_unpublish\">Published</span>"
 msgstr ""
+"<span/>\n"
+" <span class=\"css_publish\">Nichtveröffentlicht\n"
+"</span> <span class=\"css_unpublish\">Veröffentlicht</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -484,12 +515,12 @@ msgstr "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<span>$</span><b style=\"font-size: 60px\">35</b><small>.00</small>"
-msgstr ""
+msgstr "<span>35,00 $</span><b style=\"font-size: 60px\"/><small/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "<span>$</span><b style=\"font-size: 60px\">65</b><small>.00</small>"
-msgstr ""
+msgstr "<span>65,00 $</span><b style=\"font-size: 60px\"/><small/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_button
@@ -497,6 +528,8 @@ msgid ""
 "<span>Contact Us Now</span>\n"
 "                        <i class=\"fa fa-chevron-right\"/>"
 msgstr ""
+"<span>Kontaktieren Sie uns\n"
+"</span><i class=\"fa fa-chevron-right\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_share
@@ -507,11 +540,13 @@ msgstr "<span>Teilen</span>"
 #: model:ir.ui.view,arch_db:website.s_button
 msgid "<strong>50,000+ companies run Odoo to grow their businesses.</strong>"
 msgstr ""
+"<strong>Mehr als 50.000 Unternehmen verwenden Odoo für das Wachstum ihres "
+"Geschäfts.</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
 msgid "<strong>Error message:</strong>"
-msgstr ""
+msgstr "<strong>Fehlermeldung:</strong>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
@@ -519,6 +554,9 @@ msgid ""
 "A CDN helps you serve your website’s content with high availability and high"
 " performance to any visitor wherever they are located."
 msgstr ""
+"Mithilfe eines CDNs sind die Inhalte Ihrer Website für alle Besucher "
+"unabhängig von deren Standort mit hoher Verfügbarkeit und Leistung "
+"erreichbar."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -561,6 +599,8 @@ msgid ""
 "A great way to catch your reader's attention is to tell a story.\n"
 "                        Everything you consider writing can be told as a story."
 msgstr ""
+"Eine Geschichte ist eine großartige Möglichkeit, die Aufmerksamkeit Ihrer Leser zu erhalten.\n"
+" Alles, was Sie schreiben möchten, kann als Geschichte erzählt werden."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_features
@@ -609,6 +649,9 @@ msgid ""
 "                        To duplicate, delete or move columns, select the\n"
 "                        column and use the top icons to perform your action."
 msgstr ""
+"Diese drei Spalten anpassen, um Ihre Designansprüche zu optimieren.\n"
+" Zum Duplizieren, Löschen oder Bewegen von Spalten,\n"
+" wählen Sie diese aus und führen Sie Ihre Aktion mithilfe der Symbole am oberen Rand aus."
 
 #. module: website
 #. openerp-web
@@ -642,11 +685,13 @@ msgstr "Eine Seite in Menü erstellen"
 #, python-format
 msgid "After having checked how it looks on mobile, <b>close the preview</b>."
 msgstr ""
+"Nachdem Sie überprüft <b>haben, wie es auf Mobilgeräten aussieht, können Sie"
+" die Vorschau schließen.</b>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Aline Turner, CTO"
-msgstr ""
+msgstr "Aline Turner, CTO"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -655,6 +700,9 @@ msgid ""
 "                                She mentors 100+ in-house developers and looks after the community of over\n"
 "                                thousands developers."
 msgstr ""
+"Aline ist ein Vorbild, die von sich sagen kann, dass sie liebt, was sie tut.\n"
+" Sie ist Mentorin für mehr als 100 Inhouse-Entwickler und überschaut eine Community von über\n"
+" 1000 Entwicklern."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -672,6 +720,9 @@ msgid ""
 "                                indirectly, implying any approval, association, sponsorship, endorsement, or\n"
 "                                affiliation with any linked website, unless specifically stated herein."
 msgstr ""
+"Obwohl diese Website mit anderen Websites verlinkt sein kann, bedeutet dies weder\n"
+" direkt noch indirekt eine Genehmigung, Verbindung, Sponsoring, Befürwortung oder Zugehörigkeit\n"
+" zu einer verlinkten Website, sofern nicht ausdrücklich anders angegeben."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -713,7 +764,7 @@ msgstr "Arch Dateiname"
 #: code:addons/website/static/src/xml/website.xml:60
 #, python-format
 msgid "Are you sure you want to delete this page ?"
-msgstr ""
+msgstr "Möchten Sie diese Seite wirklich löschen?"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_attachment_website_url
@@ -723,7 +774,7 @@ msgstr "Dateianhang URL"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_auto_redirect_lang
 msgid "Autoredirect Language"
-msgstr ""
+msgstr "Sprache automatisch weiterleiten"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_act_server_website_published
@@ -738,7 +789,7 @@ msgstr "Zurück"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Basic sales &amp; marketing for up to 2 users"
-msgstr ""
+msgstr "Grundlagen für Verkauf und Marketing für bis zu 2 Benutzer"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -748,12 +799,12 @@ msgstr "Anfänger"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Big"
-msgstr ""
+msgstr "Groß"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Building Profile"
-msgstr ""
+msgstr "Profil erstellen"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_url
@@ -804,6 +855,9 @@ msgid ""
 "                        about it. It does not have to be long, but it should\n"
 "                        reinforce your image."
 msgstr ""
+"Wählen Sie ein ansprechendes Bild und schreiben Sie einen\n"
+" inspirierenden Absatz dazu. Kurz und knackig, damit\n"
+" es Ihr Bild hervorhebt."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -838,7 +892,7 @@ msgstr "Client Secret"
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Clone this page"
-msgstr ""
+msgstr "Diese Seite klonen"
 
 #. module: website
 #. openerp-web
@@ -928,7 +982,7 @@ msgstr "Inhalt"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Content Delivery Network (CDN)"
-msgstr ""
+msgstr "Content Delivery Network (CDN)"
 
 #. module: website
 #. openerp-web
@@ -958,12 +1012,12 @@ msgstr "Seite erstellen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
-msgstr ""
+msgstr "Erstellen Sie ein Google-Projekt und einen Schlüssel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Create several versions of your website pages"
-msgstr ""
+msgstr "Erstellen Sie mehrere Versionen Ihrer Website-Seiten"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_create_uid
@@ -984,7 +1038,7 @@ msgstr "Erstellt am"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Cubes"
-msgstr ""
+msgstr "Würfel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -1021,12 +1075,12 @@ msgstr "Standard"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Default Access Rights"
-msgstr ""
+msgstr "Standard-Zugriffsrechte"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_default_lang_id
 msgid "Default Language"
-msgstr ""
+msgstr "Standardsprache"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_default_lang_id
@@ -1044,7 +1098,7 @@ msgstr "Standard Sprachcode"
 #: code:addons/website/static/src/xml/website.seo.xml:41
 #, python-format
 msgid "Define Keywords"
-msgstr ""
+msgstr "Schlüsselwörter definieren"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1065,16 +1119,19 @@ msgid ""
 "                        that illustrates your message. Click on the picture to\n"
 "                        change it's <em>rounded corner</em> style."
 msgstr ""
+"Löschen Sie das obige Bild oder ersetzen Sie es mit einem Bild\n"
+", das Ihre Botschaft verdeutlicht. Klicken Sie auf das Bild, um\n"
+" dessen <em>Stil mit gerundeten Ecken zu</em> ändern."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Delete this page"
-msgstr ""
+msgstr "Diese Seite löschen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_references
 msgid "Demo Logo"
-msgstr ""
+msgstr "Demo-Logo"
 
 #. module: website
 #. openerp-web
@@ -1124,7 +1181,7 @@ msgstr "Anzeigename"
 #: code:addons/website/static/src/js/editor/snippets.options.js:89
 #, python-format
 msgid "Do you want to edit the company data ?"
-msgstr ""
+msgstr "Möchten Sie die Unternehmensdaten bearbeiten?"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
@@ -1136,12 +1193,12 @@ msgstr "Domain"
 #: code:addons/website/static/src/xml/website.xml:35
 #, python-format
 msgid "Don't forget to update all links referring to this page."
-msgstr ""
+msgstr "Denken Sie daran, alle Links zu dieser Seite zu aktualisieren."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Downtown"
-msgstr ""
+msgstr "Innenstadt"
 
 #. module: website
 #. openerp-web
@@ -1155,7 +1212,7 @@ msgstr "Schieben Sie ein Menü nach rechts, um dieses als Submenü einzufügen"
 #: code:addons/website/static/src/js/tours/banner.js:36
 #, python-format
 msgid "Drag another block in your page, below the cover."
-msgstr ""
+msgstr "Ziehen Sie einen weiteren Block auf Ihre Seite, unterhalb des Titels."
 
 #. module: website
 #. openerp-web
@@ -1163,6 +1220,7 @@ msgstr ""
 #, python-format
 msgid "Drag the <i>Cover</i> block and drop it in your page."
 msgstr ""
+"Ziehen Sie den <i>Titelblock</i> und legen Sie ihn auf Ihrer Seite ab."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1195,7 +1253,7 @@ msgstr "Topmenü bearbeiten"
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Edit code in backend"
-msgstr ""
+msgstr "Code im Backend bearbeiten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.publish_management
@@ -1208,7 +1266,7 @@ msgstr "Im Backend bearbeiten"
 #: code:addons/website/static/src/xml/website.backend.xml:28
 #, python-format
 msgid "Edit my Analytics Client ID"
-msgstr ""
+msgstr "Meine Analytics-Kunden-ID bearbeiten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.page_404
@@ -1224,7 +1282,7 @@ msgstr ""
 #: code:addons/website/static/src/js/editor/snippets.options.js:35
 #, python-format
 msgid "Edit the menu"
-msgstr ""
+msgstr "Menü bearbeiten"
 
 #. module: website
 #: model:res.groups,name:website.group_website_designer
@@ -1258,7 +1316,7 @@ msgstr "Events"
 #: code:addons/website/static/src/xml/website.contentMenu.xml:61
 #, python-format
 msgid "Existing Page, URL or Email"
-msgstr ""
+msgstr "Bestehende Seite, URL oder E-Mail-Adresse"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -1351,7 +1409,7 @@ msgstr "Eingeklappte Liste"
 #: code:addons/website/static/src/xml/website.editor.xml:6
 #, python-format
 msgid "Follow all the"
-msgstr ""
+msgstr "Alle folgen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -1360,6 +1418,9 @@ msgid ""
 "                                to keep his hands full by participating in the development of the software,\n"
 "                                marketing and the Customer Experience strategies."
 msgstr ""
+"Als Gründer und Hauptvisionär ist Tony die treibende Kraft des Unternehmens. Er liebt es,\n"
+" alle Hände voll zu haben, indem er sich an der Software-Entwicklung,\n"
+" dem Marketing und den Kundenerfahrungs-Strategien beteiligt."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1373,17 +1434,17 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "General Terms and Conditions / Service Policies"
-msgstr ""
+msgstr "Allgemeine Geschäftsbedingungen und Service-Bestimmungen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Get access to all modules"
-msgstr ""
+msgstr "Zugang zu allen Modulen erhalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Get access to all modules and features"
-msgstr ""
+msgstr "Zugang zu allen Modulen und Funktionen erhalten"
 
 #. module: website
 #. openerp-web
@@ -1393,6 +1454,8 @@ msgid ""
 "Get this page efficiently referenced in search engines to attract more "
 "visitors."
 msgstr ""
+"Lassen Sie diese Seite effizient in Suchmaschinen verweisen, um mehr "
+"Besucher anzusprechen."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_github
@@ -1404,26 +1467,26 @@ msgstr "GitHub Konto"
 #: code:addons/website/static/src/js/menu/content.js:50
 #, python-format
 msgid "Go To Page"
-msgstr ""
+msgstr "Gehe zu Seite"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/js/editor/snippets.options.js:27
 #, python-format
 msgid "Go to Link"
-msgstr ""
+msgstr "Gehe zu Link"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_view_form_extend
 msgid "Go to Page Manager"
-msgstr ""
+msgstr "Gehe zur Seitenverwaltung"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:92
 #, python-format
 msgid "Go to Website"
-msgstr ""
+msgstr "Gehe zur Website"
 
 #. module: website
 #. openerp-web
@@ -1433,6 +1496,8 @@ msgid ""
 "Good Job! You created your first page. Let's check how this page looks like "
 "on <b>mobile devices</b>."
 msgstr ""
+"Gute Arbeit! Sie haben Ihre erste Seite erstellt. Schauen wir uns <b>an, wie"
+" diese Seite auf mobilen Geräten aussieht.</b>"
 
 #. module: website
 #. openerp-web
@@ -1451,7 +1516,7 @@ msgstr "Google Analytics Key"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_has_google_analytics_dashboard
 msgid "Google Analytics in Dashboard"
-msgstr ""
+msgstr "Google Analytics im Dashboard"
 
 #. module: website
 #. openerp-web
@@ -1461,6 +1526,9 @@ msgid ""
 "Google Analytics initialization failed. Maybe this domain is not whitelisted"
 " in your Google Analytics project for this client ID."
 msgstr ""
+"Die Initialisierung von Google Analytics ist fehlgeschlagen. Vielleicht ist "
+"diese Domain in Ihrem Google Analytics-Projekt für diese Kunden-ID nicht "
+"bekannt."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_google_management_client_id
@@ -1478,12 +1546,12 @@ msgstr "Google Client zurück"
 #: model:ir.model.fields,field_description:website.field_res_config_settings_has_google_maps
 #: model:ir.ui.view,arch_db:website.company_description
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Maps"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_google_maps_api_key
 msgid "Google Maps API Key"
-msgstr ""
+msgstr "Google Maps API-Schlüssel"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_googleplus
@@ -1520,7 +1588,7 @@ msgstr "Gruppen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "HTML/CSS Editor"
-msgstr ""
+msgstr "HTML/CSS-Editor"
 
 #. module: website
 #: model:ir.model,name:website.model_ir_http
@@ -1530,7 +1598,7 @@ msgstr "HTTP-Routing"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_cover
 msgid "Headline"
-msgstr ""
+msgstr "Überschrift"
 
 #. module: website
 #. openerp-web
@@ -1544,7 +1612,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.pageProperties.xml:110
 #, python-format
 msgid "Hide this page from search results"
-msgstr ""
+msgstr "Diese Seite in Suchergebnissen verbergen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -1570,7 +1638,7 @@ msgstr "Homepage"
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #, python-format
 msgid "How to get my Client ID"
-msgstr ""
+msgstr "Wie erhalte ich meine Kunden-ID?"
 
 #. module: website
 #. openerp-web
@@ -1578,7 +1646,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #, python-format
 msgid "How to get my Tracking ID"
-msgstr ""
+msgstr "Wie erhalte ich meine Tracking-ID?"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_id
@@ -1634,21 +1702,21 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.seo.xml:68
 #, python-format
 msgid "In description"
-msgstr ""
+msgstr "In Beschreibung"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.seo.xml:69
 #, python-format
 msgid "In page's content"
-msgstr ""
+msgstr "In Seiteninhalten"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.seo.xml:67
 #, python-format
 msgid "In title"
-msgstr ""
+msgstr "In Titel"
 
 #. module: website
 #. openerp-web
@@ -1676,7 +1744,7 @@ msgstr "Sprache installieren"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Install new language"
-msgstr ""
+msgstr "Neue Sprache installieren"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -1698,7 +1766,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Iris Joe, CFO"
-msgstr ""
+msgstr "Iris Joe, CFO"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -1707,18 +1775,21 @@ msgid ""
 "                                improves them. She is determined to drive success and delivers her professional\n"
 "                                acumen to bring Company at the next level."
 msgstr ""
+"Iris hilft uns mit ihrer internationalen Erfahrung, Berechnungen leicht zu verstehen und\n"
+" sie zu verbessern. Sie ist absolut erfolgsorientiert und verwendet ihren professionellen\n"
+" Spürsinn, um das Unternehmen stets einen Schritt weiter zu bringen."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_is_visible
 msgid "Is Visible"
-msgstr ""
+msgstr "Ist sichtbar"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:19
 #, python-format
 msgid "It looks like your file is being called by"
-msgstr ""
+msgstr "Anscheinend wird die Datei aufgerufen von"
 
 #. module: website
 #. openerp-web
@@ -1728,6 +1799,8 @@ msgid ""
 "It might be possible to edit the relevant items or fix the issue in <a "
 "href=\"%s\">the classic Odoo interface</a>"
 msgstr ""
+"Möglicherweise können die relevanten Elemente bearbeitet oder das Problem in"
+" <a href=\"%s\">der klassischen Odoo-Benutzeroberfläche behoben werden.</a>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_button
@@ -1745,7 +1818,7 @@ msgstr "Schlüssel"
 #: code:addons/website/static/src/xml/website.seo.xml:48
 #, python-format
 msgid "Keyword"
-msgstr ""
+msgstr "Schlüsselwort"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_language_ids
@@ -1756,7 +1829,7 @@ msgstr "Sprachen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Languages available on your website"
-msgstr ""
+msgstr "Verfügbare Sprachen auf Ihrer Website"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -1820,7 +1893,7 @@ msgstr "Links"
 #: code:addons/website/static/src/xml/website.seo.xml:65
 #, python-format
 msgid "Legend:"
-msgstr ""
+msgstr "Legende:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
@@ -1832,12 +1905,12 @@ msgstr "Kunden können sich einloggen, um ihre Dokumente zu sehen"
 #: code:addons/website/static/src/xml/website.editor.xml:5
 #, python-format
 msgid "Let's start designing."
-msgstr ""
+msgstr "Fangen wir mit der Gestaltung an."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Limited customization"
-msgstr ""
+msgstr "Beschränkte Anpassung"
 
 #. module: website
 #. openerp-web
@@ -1856,7 +1929,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.backend.xml:36
 #, python-format
 msgid "Link my Analytics Account"
-msgstr ""
+msgstr "Mein Analytics-Konto verknüpfen"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_linkedin
@@ -1866,7 +1939,7 @@ msgstr "LinkedIn Account"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "Links to other websites"
-msgstr ""
+msgstr "Links zu anderen Websites"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1893,22 +1966,22 @@ msgstr "Hauptmenü"
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Manage Pages"
-msgstr ""
+msgstr "Seiten verwalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Manage Your Pages"
-msgstr ""
+msgstr "Ihre Seiten verwalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Manage Your Website Pages"
-msgstr ""
+msgstr "Ihre Website-Seiten verwalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Manage this page"
-msgstr ""
+msgstr "Diese Seite verwalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -1929,7 +2002,7 @@ msgstr "Medium"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Meet the Executive Team"
-msgstr ""
+msgstr "Unser Managementteam"
 
 #. module: website
 #: code:addons/website/models/website.py:241
@@ -1961,7 +2034,7 @@ msgstr "Nachrichten"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Mich Stark, COO"
-msgstr ""
+msgstr "Mich Stark, COO"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -1970,6 +2043,9 @@ msgid ""
 "                                Director in the software industry, Mich has helped Company to get where it\n"
 "                                is today. Mich is among the best minds."
 msgstr ""
+"Mich liebt Herausforderungen. Dank seiner langjährigen Erfahrung als Commercial\n"
+" Directory in der Software-Industrie hat Mich das Unternehmen dahin gebracht, wo es\n"
+" heute ist. Mich gehört zu den besten Köpfen."
 
 #. module: website
 #. openerp-web
@@ -2001,32 +2077,32 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Move to first"
-msgstr ""
+msgstr "Zum ersten verschieben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Move to last"
-msgstr ""
+msgstr "Zum letzten verschieben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Move to next"
-msgstr ""
+msgstr "Zum nächsten verschieben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Move to previous"
-msgstr ""
+msgstr "Zum vorherigen verschieben"
 
 #. module: website
 #: selection:website.redirect,type:0
 msgid "Moved permanently"
-msgstr ""
+msgstr "Dauerhaft verschoben"
 
 #. module: website
 #: selection:website.redirect,type:0
 msgid "Moved temporarily"
-msgstr ""
+msgstr "Vorübergehend verschoben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
@@ -2045,7 +2121,7 @@ msgstr "Name"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Name and favicon of your website"
-msgstr ""
+msgstr "Name und Favicon Ihrer Website"
 
 #. module: website
 #. openerp-web
@@ -2084,7 +2160,7 @@ msgstr "Kein Support"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "No-scroll"
-msgstr ""
+msgstr "Ohne Scrollen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2096,7 +2172,7 @@ msgstr "Keine"
 #: code:addons/website/static/src/xml/website.seo.xml:66
 #, python-format
 msgid "Not used"
-msgstr ""
+msgstr "nicht genutzt"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -2106,7 +2182,7 @@ msgstr "Hinweis: Sie können diese Seite über Anpassen im Topmenü ausblenden."
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_language_count
 msgid "Number of languages"
-msgstr ""
+msgstr "Anzahl der Sprachen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout_footer_copyright
@@ -2116,27 +2192,27 @@ msgstr "Odoo"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_three_columns
 msgid "Odoo - Sample 1 for three columns"
-msgstr ""
+msgstr "Odoo – Beispiel 1 für drei Spalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_three_columns
 msgid "Odoo - Sample 2 for three columns"
-msgstr ""
+msgstr "Odoo – Beispiel 2 für drei Spalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_three_columns
 msgid "Odoo - Sample 3 for three columns"
-msgstr ""
+msgstr "Odoo – Beispiel 3 für drei Spalten"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_big_picture
 msgid "Odoo CMS - a big picture"
-msgstr ""
+msgstr "Odoo CMS – ein umfassendes Bild"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_floating
 msgid "Odoo CMS- Sample image floating"
-msgstr ""
+msgstr "Odoo CMS – Beispielbild variabel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -2146,7 +2222,7 @@ msgstr "Odoo Version"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_text
 msgid "Odoo image and text block"
-msgstr ""
+msgstr "Odoo Bild- und Textblock"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_parallax_slider
@@ -2154,11 +2230,13 @@ msgid ""
 "Odoo provides essential platform for our project management.\n"
 "                                                Things are better organized and more visible with it."
 msgstr ""
+"Odoo bietet für unser Projektmanagement eine wesentliche Plattform.\n"
+" Alle Inhalte sind damit besser organisiert und sichtbarer."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_image
 msgid "Odoo text and image block"
-msgstr ""
+msgstr "Odoo Text- und Bildblock"
 
 #. module: website
 #. openerp-web
@@ -2198,7 +2276,7 @@ msgstr "Open Source eCommerce"
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Optimize SEO"
-msgstr ""
+msgstr "SEO optimieren"
 
 #. module: website
 #. openerp-web
@@ -2247,6 +2325,8 @@ msgid ""
 "Our products are designed for small to medium size companies willing to optimize\n"
 "                                                      their performance."
 msgstr ""
+"Unsere Produkte sind für kleine bis mittlere Unternehmen ausgelegt, die ihre Leistung\n"
+" optimieren möchten."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -2271,25 +2351,25 @@ msgstr "Seite"
 #: code:addons/website/models/website.py:213
 #, python-format
 msgid "Page <b>%s</b> contains a link to this page"
-msgstr ""
+msgstr "Seite <b>%s</b> enthält einen Link zu dieser Seite"
 
 #. module: website
 #: code:addons/website/models/website.py:282
 #, python-format
 msgid "Page <b>%s</b> is calling this file"
-msgstr ""
+msgstr "Seite <b>%s</b> ruft diese Datei auf"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_website_indexed
 msgid "Page Indexed"
-msgstr ""
+msgstr "Seite indexiert"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:46
 #, python-format
 msgid "Page Name"
-msgstr ""
+msgstr "Seitenname"
 
 #. module: website
 #. openerp-web
@@ -2297,7 +2377,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website.user_navbar
 #, python-format
 msgid "Page Properties"
-msgstr ""
+msgstr "Seiteneigenschaften"
 
 #. module: website
 #. openerp-web
@@ -2314,7 +2394,7 @@ msgstr "Seitentitel"
 #: model:ir.model.fields,field_description:website.field_website_page_url
 #, python-format
 msgid "Page URL"
-msgstr ""
+msgstr "Seiten-URL"
 
 #. module: website
 #: code:addons/website/models/website.py:208
@@ -2327,7 +2407,7 @@ msgstr "Seiten"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Panama Sky"
-msgstr ""
+msgstr "Himmel über Panama"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_panel
@@ -2352,7 +2432,7 @@ msgstr "Obermenü"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_parent_right
 msgid "Parent Rigth"
-msgstr ""
+msgstr "Übergeordnete Berechtigung"
 
 #. module: website
 #: model:ir.model.fields,help:website.field_website_partner_id
@@ -2362,7 +2442,7 @@ msgstr "Partnerbezogene Daten des Benutzers"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Peak"
-msgstr ""
+msgstr "Spitze"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2414,7 +2494,7 @@ msgstr "Werbung"
 #: code:addons/website/static/src/js/menu/seo.js:339
 #, python-format
 msgid "Promote Page"
-msgstr ""
+msgstr "Seite bewerben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -2445,6 +2525,8 @@ msgstr "Veröffentlichen"
 #, python-format
 msgid "Publish your page by clicking on the <b>Save</b> button."
 msgstr ""
+"Veröffentlichen Sie Ihre Seite durch Klicken auf die <b>Schaltfläche "
+"„Speichern“.</b>"
 
 #. module: website
 #. openerp-web
@@ -2461,7 +2543,7 @@ msgstr "Veröffentlicht"
 #: model:ir.model.fields,field_description:website.field_website_page_date_publish
 #, python-format
 msgid "Publishing Date"
-msgstr ""
+msgstr "Veröffentlichungsdatum"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
@@ -2471,51 +2553,51 @@ msgstr "QWeb"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_url_from
 msgid "Redirect From"
-msgstr ""
+msgstr "Weitergeleitet von"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:62
 #, python-format
 msgid "Redirect Old URL"
-msgstr ""
+msgstr "Weitergeleitet von alter URL"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_url_to
 msgid "Redirect To"
-msgstr ""
+msgstr "Weiterleiten zu"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_type
 msgid "Redirection Type"
-msgstr ""
+msgstr "Weiterleitungstyp"
 
 #. module: website
 #: model:ir.ui.menu,name:website.menu_website_redirect_list
 msgid "Redirects"
-msgstr ""
+msgstr "Weiterleitungen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_pages_form_view
 msgid "Related Menu Items"
-msgstr ""
+msgstr "Zugehörige Menü-Positionen"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_menu_ids
 msgid "Related Menus"
-msgstr ""
+msgstr "Zugehörige Menüs"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_page_id
 msgid "Related Page"
-msgstr ""
+msgstr "Zugehörige Seite"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.xml:68
 #, python-format
 msgid "Rename Page To:"
-msgstr ""
+msgstr "Seite umbenennen zu:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -2530,7 +2612,7 @@ msgstr "Reset Vorlagen"
 #. module: website
 #: model:res.groups,name:website.group_website_publisher
 msgid "Restricted Editor"
-msgstr ""
+msgstr "Eingeschränkter Editor"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2550,7 +2632,7 @@ msgstr "SEO Metadaten"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Sails"
-msgstr ""
+msgstr "Segel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -2569,7 +2651,7 @@ msgstr "Speichern"
 #. module: website
 #: model:ir.ui.view,arch_db:website.menu_search
 msgid "Search Menus"
-msgstr ""
+msgstr "Menüs durchsuchen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_search_box
@@ -2589,14 +2671,14 @@ msgstr "Zweite Liste"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "See Google Analytics data on your Website Dashboard"
-msgstr ""
+msgstr "Google Analytics-Daten auf Ihrem Website-Dashboard anzeigen"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/js/menu/content.js:391
 #, python-format
 msgid "Select a Menu"
-msgstr ""
+msgstr "Menü auswählen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -2632,12 +2714,12 @@ msgstr "Einstellungen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Shadows"
-msgstr ""
+msgstr "Schatten"
 
 #. module: website
 #: model:ir.model.fields,help:website.field_website_auto_redirect_lang
 msgid "Should users be redirected to their browser's language"
-msgstr ""
+msgstr "Falls Benutzer zur Sprache ihres Browsers weitergeleitet werden"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_ui_view_customize_show
@@ -2657,17 +2739,17 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.pageProperties.xml:86
 #, python-format
 msgid "Show in Top Menu"
-msgstr ""
+msgstr "Im oberen Menü anzeigen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Show your address on a map in the"
-msgstr ""
+msgstr "Ihre Adresse auf einer Karte im anzeigen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Slider Odoo Image"
-msgstr ""
+msgstr "Odoo-Bild für Slider"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2694,13 +2776,13 @@ msgstr "Soziale Medien"
 #: code:addons/website/controllers/main.py:218
 #, python-format
 msgid "Sort by Name"
-msgstr ""
+msgstr "Nach Name sortieren"
 
 #. module: website
 #: code:addons/website/controllers/main.py:217
 #, python-format
 msgid "Sort by Url"
-msgstr ""
+msgstr "Nach URL sortieren"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2714,6 +2796,8 @@ msgid ""
 "Start with the customer – find out what they want\n"
 "                        and give it to them."
 msgstr ""
+"Beginnen Sie beim Kunden – finden Sie heraus, was sie\n"
+" wollen und bieten Sie dies an."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -2725,7 +2809,7 @@ msgstr "Starter Paket"
 #: code:addons/website/static/src/js/editor/snippets.options.js:50
 #, python-format
 msgid "Stay on this page"
-msgstr ""
+msgstr "Auf dieser Seite bleiben"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_custom
@@ -2747,19 +2831,19 @@ msgstr "Untertitel 3"
 #: code:addons/website/static/src/xml/website.seo.xml:58
 #, python-format
 msgid "Suggested"
-msgstr ""
+msgstr "Vorgeschlagen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "TRANSLATE"
-msgstr ""
+msgstr "Übersetzen"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.facebook_page.xml:14
 #, python-format
 msgid "Tabs"
-msgstr ""
+msgstr "Tabs"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -2789,13 +2873,13 @@ msgstr "Vorlage"
 #: code:addons/website/models/website.py:231
 #, python-format
 msgid "Template <b>%s (id:%s)</b> contains a link to this page"
-msgstr ""
+msgstr "Vorlage <b>%s (id:%s)</b> enthält einen Link zu dieser Seite."
 
 #. module: website
 #: code:addons/website/models/website.py:301
 #, python-format
 msgid "Template <b>%s (id:%s)</b> is calling this file"
-msgstr ""
+msgstr "Vorlage <b>%s (id:%s)</b> ruft diese Datei auf."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -2812,7 +2896,7 @@ msgstr "Vorlagen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "Terms of service"
-msgstr ""
+msgstr "Nutzungsbedingungen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
@@ -2875,14 +2959,14 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "There are currently no pages for your website."
-msgstr ""
+msgstr "Derzeit sind keine Seiten für Ihre Website vorhanden."
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:35
 #, python-format
 msgid "There is no data currently available."
-msgstr ""
+msgstr "Derzeit liegen keine Daten vor."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
@@ -2890,6 +2974,8 @@ msgid ""
 "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website\n"
 "                                (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\")."
 msgstr ""
+"Diese Servicebedingungen („Bedingungen“, „Vereinbarung“) sind eine Vereinbarung zwischen der Website\n"
+" („Website-Betreiber“, „uns“, „wir“ oder „unsere“) und Ihnen („Benutzer“, „Sie“ oder „Ihre“)."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_features
@@ -2902,12 +2988,16 @@ msgid ""
 "This Agreement sets forth the general terms and conditions of your use of this website\n"
 "                                and any of its products or services (collectively, \"Website\" or \"Services\")."
 msgstr ""
+"Diese Vereinbarung enthält die Allgemeinen Geschäftsbedingungen für Ihre Nutzung dieser Website\n"
+" und aller ihrer Produkte oder Dienstleistungen (zusammen „Website“ oder „Dienste“)."
 
 #. module: website
 #: model:ir.model.fields,help:website.field_res_config_settings_favicon
 #: model:ir.model.fields,help:website.field_website_favicon
 msgid "This field holds the image used to display a favicon on the website."
 msgstr ""
+"Dieses Feld enthält das Bild, welches als Favicon auf der Website angezeigt "
+"wird."
 
 #. module: website
 #: model:ir.model.fields,help:website.field_res_config_settings_default_lang_code
@@ -2923,17 +3013,19 @@ msgid ""
 "This page does not exist, but you can create it as you are administrator of "
 "this site."
 msgstr ""
+"Diese Seite existiert nicht, Sie können diese allerdings als Administrator "
+"dieser Website erstellen."
 
 #. module: website
 #: code:addons/website/models/website.py:246
 #, python-format
 msgid "This page is in the menu <b>%s</b>"
-msgstr ""
+msgstr "Diese Seite befindet sich im Menü <b>%s.</b>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Thumbnails"
-msgstr ""
+msgstr "Vorschaubilder"
 
 #. module: website
 #. openerp-web
@@ -2950,11 +3042,15 @@ msgid ""
 "                        Then, duplicate one of the column to create a new\n"
 "                        one as a copy."
 msgstr ""
+"Damit eine vierte Spalte hinzugefügt werden kann, reduzieren Sie\n"
+" die Größe dieser drei Spalten mithilfe des Symbols an der rechten Seite jedes Blocks.\n"
+" Duplizieren Sie anschließend eine der Spalten, damit eine neue\n"
+" als Kopie erstellt wird."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Tony Fred, CEO"
-msgstr ""
+msgstr "Tony Fred, CEO"
 
 #. module: website
 #. openerp-web
@@ -2977,19 +3073,19 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Track visits in Google Analytics"
-msgstr ""
+msgstr "Besucherzahlen mit Google Analytics verfolgen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Tracking ID"
-msgstr ""
+msgstr "Tracking-ID"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/js/editor/rte.summernote.js:17
 #, python-format
 msgid "Transform the picture (click twice to reset transformation)"
-msgstr ""
+msgstr "Bild transformieren (Doppelklick zum Zurücksetzen)"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_twitter
@@ -3015,6 +3111,8 @@ msgid ""
 "Type '<i class=\"confirm_word\">yes</i>' in the box below if you want to "
 "confirm."
 msgstr ""
+"Geben Sie <i class=\"confirm_word\">im folgenden Kästchen „Ja“</i> ein, wenn"
+" Sie bestätigen möchten."
 
 #. module: website
 #. openerp-web
@@ -3036,22 +3134,22 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Ultimate package"
-msgstr ""
+msgstr "Ultimatives Paket"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.index_management
 msgid "Unindexed"
-msgstr ""
+msgstr "Unindexiert"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Unlimited CRM power and support"
-msgstr ""
+msgstr "Unbegrenzte CRM-Leistung und -Support"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "Unlimited customization"
-msgstr ""
+msgstr "Unbegrenzte Anpassungsmöglichkeiten"
 
 #. module: website
 #. openerp-web
@@ -3071,7 +3169,7 @@ msgstr "URL"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "Use Of Cookies"
-msgstr ""
+msgstr "Verwendung von Cookies"
 
 #. module: website
 #. openerp-web
@@ -3083,7 +3181,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Use a CDN to optimize the availability of your website's content"
-msgstr ""
+msgstr "Mit einem CDN optimieren Sie die Verfügbarkeit Ihrer Website-Inhalte."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_activated
@@ -3095,7 +3193,7 @@ msgstr "Content-Delivery-Network (CDN) verwenden"
 #: code:addons/website/static/src/xml/website.pageProperties.xml:97
 #, python-format
 msgid "Use as Homepage"
-msgstr ""
+msgstr "Als Homepage verwenden"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.robots
@@ -3103,6 +3201,8 @@ msgid ""
 "User-agent: *\n"
 "Sitemap:"
 msgstr ""
+"Benutzer-Agent: *\n"
+"Sitemap:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -3165,7 +3265,7 @@ msgstr "Sichtbar in Website"
 #: code:addons/website/static/src/xml/website.backend.xml:25
 #, python-format
 msgid "Visits"
-msgstr ""
+msgstr "Besuche"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.aboutus
@@ -3176,6 +3276,9 @@ msgid ""
 "                                                      life through disruptive products. We build great products to solve your\n"
 "                                                      business problems."
 msgstr ""
+"Wir sind ein Team begeisterter Leute mit dem Ziel, das Leben aller Menschen\n"
+" mit disruptiven Produkten zu verbessern. Wir kreieren großartige Produkte, die Ihre\n"
+" Geschäftsprobleme lösen."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -3193,7 +3296,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.xml:37
 #, python-format
 msgid "We found these ones:"
-msgstr ""
+msgstr "Diese haben wir gefunden:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
@@ -3229,7 +3332,7 @@ msgstr "Website Domain"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_favicon
 msgid "Website Favicon"
-msgstr ""
+msgstr "Website-Favicon"
 
 #. module: website
 #: model:ir.actions.act_url,name:website.action_website_homepage
@@ -3251,13 +3354,13 @@ msgstr "Website-Name"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_pages_form_view
 msgid "Website Page Settings"
-msgstr ""
+msgstr "Website-Seiteneinstellungen"
 
 #. module: website
 #: model:ir.actions.act_window,name:website.action_website_pages_list
 #: model:ir.ui.view,arch_db:website.website_pages_tree_view
 msgid "Website Pages"
-msgstr ""
+msgstr "Website-Seiten"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_act_server_website_path
@@ -3267,18 +3370,18 @@ msgstr "Website-Pfad"
 #. module: website
 #: model:ir.model,name:website.model_website_redirect
 msgid "Website Redirect"
-msgstr ""
+msgstr "Website-Weiterleitung"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_redirect_form_view
 msgid "Website Redirect Settings"
-msgstr ""
+msgstr "Website-Weiterleitungsinstellungen"
 
 #. module: website
 #: model:ir.actions.act_window,name:website.action_website_redirect_list
 #: model:ir.ui.view,arch_db:website.website_redirect_tree_view
 msgid "Website Redirects"
-msgstr ""
+msgstr "Website-Weiterleitungen"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
@@ -3293,7 +3396,7 @@ msgstr "Website Design"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Website Title"
-msgstr ""
+msgstr "Website-Titel"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_blog_post_website_url
@@ -3326,6 +3429,9 @@ msgid ""
 "                                User by this site. The User may configure his / her browser to notify and\n"
 "                                reject the installation of the cookies sent by us."
 msgstr ""
+"Website kann Cookies verwenden, um die Navigation des\n"
+" Benutzers auf dieser Website zu personalisieren und zu vereinfachen. Der Benutzer kann den Browser so einstellen, dass er/sie über\n"
+" das Installieren von Cookies benachrichtigt wird und dies ablehnen kann."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.menu_tree
@@ -3401,7 +3507,7 @@ msgstr "Website Meta-Titel"
 #. module: website
 #: model:ir.actions.server,name:website.ir_actions_server_website_dashboard
 msgid "Website: Dashboard"
-msgstr ""
+msgstr "Website: Dashboard"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_website_ids
@@ -3419,19 +3525,19 @@ msgstr "Zu übersetzende Websites"
 #: code:addons/website/static/src/xml/website.editor.xml:4
 #, python-format
 msgid "Welcome to your"
-msgstr ""
+msgstr "Willkommen zu Ihrer"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.editor.xml:10
 #, python-format
 msgid "What do you want to do?"
-msgstr ""
+msgstr "Was möchten Sie tun?"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_cover
 msgid "With a great subtitle"
-msgstr ""
+msgstr "Mit einem großartigen Untertitel"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_parallax_slider
@@ -3439,6 +3545,8 @@ msgid ""
 "Write a quote here from one of your customers. Quotes are a\n"
 "                                                great way to build confidence in your products or services."
 msgstr ""
+"Schreiben Sie hier ein Zitat eines Kundes. Zitate sind eine\n"
+" großartige Möglichkeit, Vertrauen in Ihre Produkte oder Dienste zu schaffen."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_image
@@ -3447,6 +3555,9 @@ msgid ""
 "                        services.<br/>To be successful your content needs to be\n"
 "                        useful to your readers."
 msgstr ""
+"Schreiben Sie ein oder zwei Absätze, die Produkte bzw.\n"
+" Dienste beschreiben.<br/> Um erfolgreich zu sein, müssen Ihre Inhalte\n"
+" nützlich für Ihre Leser sein."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_text
@@ -3455,6 +3566,9 @@ msgid ""
 "                        services or a specific feature. To be successful\n"
 "                        your content needs to be useful to your readers."
 msgstr ""
+"Schreiben Sie ein oder zwei Absätze, die Produkte,\n"
+" Dienste oder spezifische Funktionen beschreiben. Um erfolgreich zu\n"
+" sein, müssen Ihre Inhalte nützlich für Ihre Leser sein."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_cover
@@ -3462,6 +3576,8 @@ msgid ""
 "Write one or two paragraphs describing your product, services or a specific "
 "feature. To be successful your content needs to be useful to your readers."
 msgstr ""
+"Schreiben Sie ein oder zwei Absätze, die Produkte,\n"
+" Dienste oder spezifische Funktionen beschreiben. Um erfolgreich zu sein, müssen Ihre Inhalte nützlich für Ihre Leser sein."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_big_message
@@ -3483,13 +3599,14 @@ msgstr ""
 #, python-format
 msgid "You do not seem to have access to this Analytics Account."
 msgstr ""
+"Anscheinend verfügen Sie über keinen Zugang auf dieses Analytics-Konto."
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:46
 #, python-format
 msgid "You need to log in to your Google Account before:"
-msgstr ""
+msgstr "Zunächst müssen Sie sich bei Ihrem Google-Konto anmelden:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
@@ -3498,6 +3615,9 @@ msgid ""
 "                                any website which you access through a link from this Website. Your linking to\n"
 "                                any other off-site pages or other websites is at your own risk."
 msgstr ""
+"Sie sollten die rechtlichen Hinweise und sonstigen Nutzungsbedingungen für jede Website,\n"
+" auf die Sie über einen Link von dieser Website zugreifen, sorgfältig prüfen. Ihre Verknüpfung auf\n"
+" andere Seiten oder Websites erfolgt auf eigenes Risiko."
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -3510,19 +3630,19 @@ msgstr "Sie sollten andere Suchkriterien versuchen."
 #: code:addons/website/static/src/xml/website.backend.xml:56
 #, python-format
 msgid "Your Client ID:"
-msgstr ""
+msgstr "Ihre Kunden-ID:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Your Slide Title"
-msgstr ""
+msgstr "Ihr Folientitel"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:51
 #, python-format
 msgid "Your Tracking ID:"
-msgstr ""
+msgstr "Ihre Tracking-ID:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_title
@@ -3534,12 +3654,12 @@ msgstr "Titel Ihrer Website"
 #: code:addons/website/static/src/xml/website.editor.xml:11
 #, python-format
 msgid "Your current changes will be saved automatically."
-msgstr ""
+msgstr "Ihre aktuellen Änderungen werden automatisch gespeichert."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Your search '"
-msgstr ""
+msgstr "Ihre „Suche“"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_youtube
@@ -3563,14 +3683,14 @@ msgstr "beschreibt Ihren Seiteninhalt"
 #: code:addons/website/static/src/xml/website.xml:70
 #, python-format
 msgid "e.g. About Us"
-msgstr ""
+msgstr "z. B. Kurzinfo"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.xml:41
 #, python-format
 msgid "found(s)"
-msgstr ""
+msgstr "gefunden"
 
 #. module: website
 #. openerp-web
@@ -3597,12 +3717,12 @@ msgstr "https://www.facebook.com/odoo"
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "https://www.linkedin.com/company/odoo"
-msgstr ""
+msgstr "https://www.linkedin.com/company/odoo"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
 msgid "https://www.youtube.com/user/OpenERPonline"
-msgstr ""
+msgstr "https://www.youtube.com/user/OpenERPonline"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
@@ -3659,7 +3779,7 @@ msgstr "res.config.settings"
 #: code:addons/website/static/src/xml/website.editor.xml:6
 #, python-format
 msgid "signs to get your website ready in no time."
-msgstr ""
+msgstr "Zeichen, um Ihre Website in kürzester Zeit fertig zu stellen."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.robots
@@ -3669,12 +3789,12 @@ msgstr "sitemap.xml"
 #. module: website
 #: model:ir.ui.view,arch_db:website.menu_search
 msgid "url"
-msgstr ""
+msgstr "URL"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
 msgid "user / month (billed annually)"
-msgstr ""
+msgstr "Nutzer/Monat (jährliche Rechnung)"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_website_id
@@ -3685,7 +3805,7 @@ msgstr "Website"
 #. module: website
 #: model:ir.model,name:website.model_website_published_mixin
 msgid "website.published.mixin"
-msgstr ""
+msgstr "Website.veröffentlicht.mixin"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
diff --git a/addons/website/i18n/es.po b/addons/website/i18n/es.po
index 283390faf5c..f2122399e0d 100644
--- a/addons/website/i18n/es.po
+++ b/addons/website/i18n/es.po
@@ -3,11 +3,11 @@
 # * website
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2016
 # David Sanchez <david.sanchez@jarsa.com.mx>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Andrés Felipe Casas Palomino <afcasas@nubark.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
@@ -33,13 +33,14 @@
 # Jorge <jcamacho@trey.es>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Pierre-Antoine Magnet <pma@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Pierre-Antoine Magnet <pma@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -701,6 +702,9 @@ msgid ""
 "                                She mentors 100+ in-house developers and looks after the community of over\n"
 "                                thousands developers."
 msgstr ""
+"Aline es de esas personas loables que pueden decir que adoran lo que hacen.\n"
+" Dirige un equipo de más de 100 desarrolladores internos, y supervisa una comunidad\n"
+" compuesta por miles de desarrolladores."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -718,6 +722,9 @@ msgid ""
 "                                indirectly, implying any approval, association, sponsorship, endorsement, or\n"
 "                                affiliation with any linked website, unless specifically stated herein."
 msgstr ""
+"Aunque este portal puede estar vinculado a otras páginas, ello no implica,\n"
+" ya sea directa o indirectamente, la aprobación, asociación, patrocinio, respaldo o\n"
+" afiliación por nuestra parte a dichas páginas salvo que se indique específicamente en este escrito."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -1414,6 +1421,9 @@ msgid ""
 "                                to keep his hands full by participating in the development of the software,\n"
 "                                marketing and the Customer Experience strategies."
 msgstr ""
+"Tony, fundador y líder visionario del proyecto, es la fuerza motriz que impulsa la empresa. Le encanta\n"
+" andar ocupado participando en el desarrollo de estrategias de software\n"
+", marketing y experiencia del consumidor."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1519,6 +1529,9 @@ msgid ""
 "Google Analytics initialization failed. Maybe this domain is not whitelisted"
 " in your Google Analytics project for this client ID."
 msgstr ""
+"Error al inicializar Google Analytics. Puede que este dominio no forme parte"
+" de la lista blanca de su proyecto de Google Analytics para este "
+"identificador de cliente."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_google_management_client_id
@@ -1764,6 +1777,9 @@ msgid ""
 "                                improves them. She is determined to drive success and delivers her professional\n"
 "                                acumen to bring Company at the next level."
 msgstr ""
+"Iris, con su experiencia internacional, nos ayuda a entender con facilidad los números\n"
+" y los mejora. Su determinación por lograr el éxito colectivo es firme, y ofrece\n"
+"su agudeza profesional para llevar la empresa a nuevos niveles y horizontes."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_is_visible
@@ -2018,7 +2034,7 @@ msgstr "Mensajes"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Mich Stark, COO"
-msgstr ""
+msgstr "Mich Stark, director de operaciones"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -2027,6 +2043,10 @@ msgid ""
 "                                Director in the software industry, Mich has helped Company to get where it\n"
 "                                is today. Mich is among the best minds."
 msgstr ""
+"A Mich le encanta afrontar desafíos. La dilatada experiencia que Mich "
+"atesora como director comercial en la industria del software ha posibilitado"
+" que la empresa goce de la posición que ostenta actualmente. Mich es, simple"
+" y llanamente, uno de nuestros mejores avales."
 
 #. module: website
 #. openerp-web
@@ -2308,6 +2328,8 @@ msgid ""
 "Our products are designed for small to medium size companies willing to optimize\n"
 "                                                      their performance."
 msgstr ""
+"Nuestros productos van destinados a pequeñas y medianas empresas que tienen\n"
+" el deseo de optimizar su rendimiento."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -2728,7 +2750,7 @@ msgstr "Mostrar su dirección en un mapa de la"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Slider Odoo Image"
-msgstr ""
+msgstr "Imagen de Odoo deslizante"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2954,6 +2976,8 @@ msgid ""
 "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website\n"
 "                                (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\")."
 msgstr ""
+"Estas condiciones de servicio (\"Condiciones\", \"Acuerdo\") conforman un acuerdo entre el sitio web\n"
+" (\"Operador de sitio web\", \"nosotros\", \"nuestro\", \"nuestra\") y usted (\"Usuario\", \"usted\", \"su\", \"sus\")."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_features
@@ -2966,6 +2990,8 @@ msgid ""
 "This Agreement sets forth the general terms and conditions of your use of this website\n"
 "                                and any of its products or services (collectively, \"Website\" or \"Services\")."
 msgstr ""
+"Este Acuerdo expone los términos y condiciones de uso del presente sitio web\n"
+" y de cualquiera de sus productos o servicios (colectivamente: \"Sitio web\" o \"Servicios\")."
 
 #. module: website
 #: model:ir.model.fields,help:website.field_res_config_settings_favicon
@@ -2987,6 +3013,8 @@ msgid ""
 "This page does not exist, but you can create it as you are administrator of "
 "this site."
 msgstr ""
+"Esta página no existe, pero puede crearla al ser administrador de este "
+"sitio."
 
 #. module: website
 #: code:addons/website/models/website.py:246
@@ -3022,7 +3050,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Tony Fred, CEO"
-msgstr ""
+msgstr "Tony Fred, director general"
 
 #. module: website
 #. openerp-web
@@ -3250,6 +3278,9 @@ msgid ""
 "                                                      life through disruptive products. We build great products to solve your\n"
 "                                                      business problems."
 msgstr ""
+"Somos un equipo de apasionados con un objetivo común: mejorar la vida\n"
+" de todo el mundo con productos disruptivos. Desarrollamos grandes productos que\n"
+"tienen como fin resolver los problemas de su negocio."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -3267,7 +3298,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.xml:37
 #, python-format
 msgid "We found these ones:"
-msgstr ""
+msgstr "Hemos encontrado estos:"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
@@ -3340,18 +3371,18 @@ msgstr "Ruta del sitio web"
 #. module: website
 #: model:ir.model,name:website.model_website_redirect
 msgid "Website Redirect"
-msgstr ""
+msgstr "Redirección del sitio web"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_redirect_form_view
 msgid "Website Redirect Settings"
-msgstr ""
+msgstr "Ajustes de redirección del sitio web"
 
 #. module: website
 #: model:ir.actions.act_window,name:website.action_website_redirect_list
 #: model:ir.ui.view,arch_db:website.website_redirect_tree_view
 msgid "Website Redirects"
-msgstr ""
+msgstr "Redirecciones del sitio web"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
@@ -3399,6 +3430,9 @@ msgid ""
 "                                User by this site. The User may configure his / her browser to notify and\n"
 "                                reject the installation of the cookies sent by us."
 msgstr ""
+"El Sitio web puede utilizar cookies para personalizar y facilitar la navegación plena del\n"
+" Usuario en el mismo. El Usuario puede configurar su navegador para notificar y\n"
+" rechazar la instalación de las cookies enviadas por nosotros."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.menu_tree
@@ -3578,6 +3612,9 @@ msgid ""
 "                                any website which you access through a link from this Website. Your linking to\n"
 "                                any other off-site pages or other websites is at your own risk."
 msgstr ""
+"Revise cuidadosamente las cláusulas legales y otras condiciones de uso de\n"
+" las páginas web a las que acceda mediante enlaces encontrados en este Sitio web. Su vinculación con\n"
+" otros portales o páginas web externas queda bajo su propia cuenta y riesgo."
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -3595,7 +3632,7 @@ msgstr "Su ID de cliente:"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Your Slide Title"
-msgstr ""
+msgstr "Su título deslizante"
 
 #. module: website
 #. openerp-web
@@ -3619,7 +3656,7 @@ msgstr "Tus cambios serán guardados de forma automática."
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Your search '"
-msgstr ""
+msgstr "Su búsqueda \""
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_youtube
@@ -3727,7 +3764,7 @@ msgstr "o edite el maestro"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "page"
-msgstr ""
+msgstr "página"
 
 #. module: website
 #: model:ir.model,name:website.model_res_config_settings
diff --git a/addons/website/i18n/fr.po b/addons/website/i18n/fr.po
index faaa6cf1185..acb5c7e26ba 100644
--- a/addons/website/i18n/fr.po
+++ b/addons/website/i18n/fr.po
@@ -66,7 +66,7 @@ msgstr "Ajouter des images"
 #: code:addons/website/models/website.py:302
 #, python-format
 msgid "%s (id:%s)"
-msgstr ""
+msgstr "%s (id:%s)"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -101,7 +101,7 @@ msgstr "&times;"
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "' did not match any pages."
-msgstr ""
+msgstr "' ne correspond à aucune page."
 
 #. module: website
 #: code:addons/website/models/website.py:723
@@ -116,7 +116,7 @@ msgstr " (copie)"
 #: code:addons/website/static/src/xml/website.pageProperties.xml:29
 #, python-format
 msgid "(could be used in"
-msgstr ""
+msgstr "(peut être utilisé dans"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout_footer_copyright
@@ -154,6 +154,8 @@ msgid ""
 ".\n"
 "            Changing its name will break these calls."
 msgstr ""
+".\n"
+" Modifiez son nom pour remédier à ces problèmes."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.default_csv
@@ -253,6 +255,10 @@ msgid ""
 "                        quirks like word choices or phrases. Write from your point\n"
 "                        of view, not from someone else's experience."
 msgstr ""
+"<b>Les belles histoires ont du caractère.</b> Considérez que raconter\n"
+" une belle histoire donne du caractère. Écrire une histoire avec du caractère pour vos clients potentiels va aider à\n"
+" créer une relation. Cela se voit dans les petits\n"
+" détails comme le choix des mots ou des pquirks like word choices or phrases. Écrivez avec votre point de vue, pas avec l'expérience de quelqu'un d'autre."
 
 #. module: website
 #. openerp-web
@@ -269,6 +275,8 @@ msgid ""
 "<b>Install new apps</b> to get more features. Let's install the <i>'Contact "
 "form'</i> app."
 msgstr ""
+"<b>Installez de nouvelles applications</b> pour obtenir davantage de "
+"fonctionnalités. Installez l'application <i>« Formulaire de contact »</i>."
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -293,7 +301,7 @@ msgstr "Dimensionnement de l'image d'arrière plan"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-arrows-h\"/>Images spacing"
-msgstr ""
+msgstr "<i class=\"fa fa-arrows-h\"/>Espacement de l'image"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -303,7 +311,7 @@ msgstr "Vitesse de défilement"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Slideshow speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>Vitesse du diaporama"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -333,7 +341,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-indent\"/> Inner content"
-msgstr ""
+msgstr "<i class=\"fa fa-indent\"/>Contenu intérieur"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -348,12 +356,12 @@ msgstr "<i class=\"fa fa-magic\"/>Mode"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-magnet\"/>Float"
-msgstr ""
+msgstr "<i class=\"fa fa-magnet\"/>Flottant"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-paint-brush\"/>Styling"
-msgstr ""
+msgstr "<i class=\"fa fa-paint-brush\"/>Styling"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -382,7 +390,7 @@ msgstr "<i class=\"fa fa-plus-circle\"/>Ajouter des images"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-refresh\"/>Re-order"
-msgstr ""
+msgstr "<i class=\"fa fa-refresh\"/>Re-commander"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -453,6 +461,8 @@ msgid ""
 "<span class=\"caret\"/>\n"
 "                            <span class=\"sr-only\">Toggle Dropdown</span>"
 msgstr ""
+"<span class=\"caret\"/>\n"
+" <span class=\"sr-only\">Activer/désactiver la liste déroulante</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -478,6 +488,8 @@ msgid ""
 "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
 "plus-circle\"/> Add Images</span>"
 msgstr ""
+"<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
+"plus-circle\"/>Ajouter des images</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
@@ -487,6 +499,9 @@ msgid ""
 "                <span class=\"icon-bar\"/>\n"
 "                <span class=\"icon-bar\"/>"
 msgstr ""
+"<span class=\"sr-only\">Activer/désactiver la navigation</span><span class=\"icon-bar\"/><span class=\"icon-bar\"/>\n"
+"<span class=\"icon-bar\"/> \n"
+" \n"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -495,6 +510,9 @@ msgid ""
 "                                <span class=\"css_publish\">Unpublished</span>\n"
 "                                <span class=\"css_unpublish\">Published</span>"
 msgstr ""
+"<span/>\n"
+" <span class=\"css_publish\">Non publié</span>\n"
+" <span class=\"css_unpublish\">Publié</span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -543,6 +561,8 @@ msgid ""
 "A CDN helps you serve your website’s content with high availability and high"
 " performance to any visitor wherever they are located."
 msgstr ""
+"Un CDN vous permet de proposer le contenu de votre site Web avec une haute "
+"disponibilité et une haute performance à tout visiteur, où qu'il se trouve."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -679,6 +699,9 @@ msgid ""
 "                                She mentors 100+ in-house developers and looks after the community of over\n"
 "                                thousands developers."
 msgstr ""
+"Aline est l'une des personnes qui reflètent celles qui peuvent dire qu'elles aiment ce qu'elles font dans la vie.\n"
+" Elle encadre plus de 100 développeurs internes et s'occupe d'une communauté de développeurs qui compte\n"
+" des milliers de membres."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -696,6 +719,9 @@ msgid ""
 "                                indirectly, implying any approval, association, sponsorship, endorsement, or\n"
 "                                affiliation with any linked website, unless specifically stated herein."
 msgstr ""
+"Bien que ce site Web puisse être associé à d'autres sites Web, cela n'implique en aucune façon, directement ou\n"
+" indirectement, notre approbation, notre association, notre parrainage, notre cautionnement ni\n"
+" notre affiliation, sauf indication contraire dans les présentes."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -737,7 +763,7 @@ msgstr "Nom de fichier Arch (???)"
 #: code:addons/website/static/src/xml/website.xml:60
 #, python-format
 msgid "Are you sure you want to delete this page ?"
-msgstr ""
+msgstr "Voulez-vous vraiment supprimer cette page ?"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_attachment_website_url
@@ -747,7 +773,7 @@ msgstr "Lien de la pièce jointe"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_auto_redirect_lang
 msgid "Autoredirect Language"
-msgstr ""
+msgstr "Langue de redirection automatique"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_act_server_website_published
@@ -777,7 +803,7 @@ msgstr "Grand"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Building Profile"
-msgstr ""
+msgstr "Création d'un profil"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_url
@@ -956,7 +982,7 @@ msgstr "Contenu"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Content Delivery Network (CDN)"
-msgstr ""
+msgstr "Content Delivery Network (CDN)"
 
 #. module: website
 #. openerp-web
@@ -986,7 +1012,7 @@ msgstr "Créer une page"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
-msgstr ""
+msgstr "Créer un projet Google et obtenir une clé"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
@@ -1168,11 +1194,12 @@ msgstr "Domaine"
 #, python-format
 msgid "Don't forget to update all links referring to this page."
 msgstr ""
+"N'oubliez pas de mettre à jour tous les liens se référant à cette page."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Downtown"
-msgstr ""
+msgstr "Centre ville"
 
 #. module: website
 #. openerp-web
@@ -1226,7 +1253,7 @@ msgstr "Modifier le menu principal"
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Edit code in backend"
-msgstr ""
+msgstr "Modifier le code dans le serveur dorsal"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.publish_management
@@ -1239,7 +1266,7 @@ msgstr "Editer dans le serveurdorsal"
 #: code:addons/website/static/src/xml/website.backend.xml:28
 #, python-format
 msgid "Edit my Analytics Client ID"
-msgstr ""
+msgstr "Modifier mon identifiant client Analytics"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.page_404
@@ -1289,7 +1316,7 @@ msgstr "Évènements"
 #: code:addons/website/static/src/xml/website.contentMenu.xml:61
 #, python-format
 msgid "Existing Page, URL or Email"
-msgstr ""
+msgstr "Page, URL ou adresse-email existante"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -1391,6 +1418,9 @@ msgid ""
 "                                to keep his hands full by participating in the development of the software,\n"
 "                                marketing and the Customer Experience strategies."
 msgstr ""
+"Tony, fondateur et chef visionnaire, est la force tranquille derrière l'entreprise. Il touche\n"
+" à tout : aux développements du logiciel,\n"
+" au marketing jusqu'aux stratégies liées à l'expérience client."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1404,7 +1434,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "General Terms and Conditions / Service Policies"
-msgstr ""
+msgstr "Conditions générales/Politiques de service"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -1424,6 +1454,8 @@ msgid ""
 "Get this page efficiently referenced in search engines to attract more "
 "visitors."
 msgstr ""
+"Faites que cette page soit efficacement référencée dans les moteurs de "
+"recherche pour attirer plus de visiteurs."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_github
@@ -1447,7 +1479,7 @@ msgstr "Aller au lien"
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_view_form_extend
 msgid "Go to Page Manager"
-msgstr ""
+msgstr "Accéder au gestionnaire de page"
 
 #. module: website
 #. openerp-web
@@ -1494,6 +1526,9 @@ msgid ""
 "Google Analytics initialization failed. Maybe this domain is not whitelisted"
 " in your Google Analytics project for this client ID."
 msgstr ""
+"Échec de l'initialisation de Google Analytics. Ce domaine ne figure peut-"
+"être pas dans la liste blanche de votre projet Google Analytics pour cet "
+"identifiant de client."
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_google_management_client_id
@@ -1516,7 +1551,7 @@ msgstr "Google Maps"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_google_maps_api_key
 msgid "Google Maps API Key"
-msgstr ""
+msgstr "Clé d'API Google Maps"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_googleplus
@@ -1577,7 +1612,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.pageProperties.xml:110
 #, python-format
 msgid "Hide this page from search results"
-msgstr ""
+msgstr "Masquer cette page des résultats de recherche"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -1611,7 +1646,7 @@ msgstr "Comment obtenir mon identifiant client"
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 #, python-format
 msgid "How to get my Tracking ID"
-msgstr ""
+msgstr "Comment obtenir mon identifiant de suivi"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_id
@@ -1665,21 +1700,21 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.seo.xml:68
 #, python-format
 msgid "In description"
-msgstr ""
+msgstr "Dans la description"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.seo.xml:69
 #, python-format
 msgid "In page's content"
-msgstr ""
+msgstr "Dans le contenu de la page"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.seo.xml:67
 #, python-format
 msgid "In title"
-msgstr ""
+msgstr "Dans le titre"
 
 #. module: website
 #. openerp-web
@@ -1738,18 +1773,20 @@ msgid ""
 "                                improves them. She is determined to drive success and delivers her professional\n"
 "                                acumen to bring Company at the next level."
 msgstr ""
+"Iris, grâce à son expérience internationale, nous aide à with her international experience, helps us easily understand the numbers and\n"
+" improves them. "
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_is_visible
 msgid "Is Visible"
-msgstr ""
+msgstr "Est visible"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:19
 #, python-format
 msgid "It looks like your file is being called by"
-msgstr ""
+msgstr "Il semble que votre fichier a été appelé par"
 
 #. module: website
 #. openerp-web
@@ -1758,7 +1795,7 @@ msgstr ""
 msgid ""
 "It might be possible to edit the relevant items or fix the issue in <a "
 "href=\"%s\">the classic Odoo interface</a>"
-msgstr ""
+msgstr "<a href=\"%s\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_button
@@ -1924,22 +1961,22 @@ msgstr "Menu principal"
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Manage Pages"
-msgstr ""
+msgstr "Gérer les pages"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Manage Your Pages"
-msgstr ""
+msgstr "Gérer vos pages"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
 msgid "Manage Your Website Pages"
-msgstr ""
+msgstr "Gérer les pages de votre site Web"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Manage this page"
-msgstr ""
+msgstr "Gérer cette page"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -1959,7 +1996,7 @@ msgstr "Moyen"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
 msgid "Meet the Executive Team"
-msgstr ""
+msgstr "Rencontrez l'équipe de Direction"
 
 #. module: website
 #: code:addons/website/models/website.py:241
@@ -2000,6 +2037,9 @@ msgid ""
 "                                Director in the software industry, Mich has helped Company to get where it\n"
 "                                is today. Mich is among the best minds."
 msgstr ""
+"Mich aime relever les défis. Grâce à son expérience de plusieurs années en tant que directeur\n"
+" commercial dans le secteur des logiciels, Mich a contribué au statut actuel\n"
+" de son entreprise. Mich figure parmi les plus brillants de sa génération."
 
 #. module: website
 #. openerp-web
@@ -2050,12 +2090,12 @@ msgstr "Déplacer au précédent"
 #. module: website
 #: selection:website.redirect,type:0
 msgid "Moved permanently"
-msgstr ""
+msgstr "Déplacé définitivement"
 
 #. module: website
 #: selection:website.redirect,type:0
 msgid "Moved temporarily"
-msgstr ""
+msgstr "Déplacé temporairement"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
@@ -2125,7 +2165,7 @@ msgstr "Aucun"
 #: code:addons/website/static/src/xml/website.seo.xml:66
 #, python-format
 msgid "Not used"
-msgstr ""
+msgstr "inutilisé"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
@@ -2278,6 +2318,8 @@ msgid ""
 "Our products are designed for small to medium size companies willing to optimize\n"
 "                                                      their performance."
 msgstr ""
+"Nos produits sont conçus pour les petites et moyennes entreprises qui souhaitent optimiser\n"
+" leurs performances."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -2308,7 +2350,7 @@ msgstr "La page <b>%s</b> contient un lien vers cette page "
 #: code:addons/website/models/website.py:282
 #, python-format
 msgid "Page <b>%s</b> is calling this file"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_website_indexed
@@ -2358,7 +2400,7 @@ msgstr "Pages"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Panama Sky"
-msgstr ""
+msgstr "Panama Sky"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_panel
@@ -2382,7 +2424,7 @@ msgstr "Menu parent"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_parent_right
 msgid "Parent Rigth"
-msgstr ""
+msgstr "Droit parent"
 
 #. module: website
 #: model:ir.model.fields,help:website.field_website_partner_id
@@ -2392,7 +2434,7 @@ msgstr "Données du partenaire lié à l'utilisateur"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Peak"
-msgstr ""
+msgstr "Peak"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2444,7 +2486,7 @@ msgstr "Promouvoir"
 #: code:addons/website/static/src/js/menu/seo.js:339
 #, python-format
 msgid "Promote Page"
-msgstr ""
+msgstr "Promouvoir la page"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -2491,7 +2533,7 @@ msgstr "Publié"
 #: model:ir.model.fields,field_description:website.field_website_page_date_publish
 #, python-format
 msgid "Publishing Date"
-msgstr ""
+msgstr "Date de publication"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
@@ -2501,44 +2543,44 @@ msgstr "QWeb"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_url_from
 msgid "Redirect From"
-msgstr ""
+msgstr "Rediriger à partir de"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.pageProperties.xml:62
 #, python-format
 msgid "Redirect Old URL"
-msgstr ""
+msgstr "Rediriger vers l'ancienne URL"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_url_to
 msgid "Redirect To"
-msgstr ""
+msgstr "Rediriger vers"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_redirect_type
 msgid "Redirection Type"
-msgstr ""
+msgstr "Type de redirection"
 
 #. module: website
 #: model:ir.ui.menu,name:website.menu_website_redirect_list
 msgid "Redirects"
-msgstr ""
+msgstr "Redirections"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_pages_form_view
 msgid "Related Menu Items"
-msgstr ""
+msgstr "Éléments de menu associés"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_menu_ids
 msgid "Related Menus"
-msgstr ""
+msgstr "Menus associés"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_menu_page_id
 msgid "Related Page"
-msgstr ""
+msgstr "Page associée"
 
 #. module: website
 #. openerp-web
@@ -2560,7 +2602,7 @@ msgstr "Réinitialiser les modèles"
 #. module: website
 #: model:res.groups,name:website.group_website_publisher
 msgid "Restricted Editor"
-msgstr ""
+msgstr "Éditeur limité"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2580,7 +2622,7 @@ msgstr "Métadonnées SEO"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "Sails"
-msgstr ""
+msgstr "Sails"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -2669,6 +2711,8 @@ msgstr "Ombres"
 #: model:ir.model.fields,help:website.field_website_auto_redirect_lang
 msgid "Should users be redirected to their browser's language"
 msgstr ""
+"Les utilisateurs doivent-ils être redirigés vers la langue de leur "
+"navigateur"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_ir_ui_view_customize_show
@@ -2688,17 +2732,17 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.pageProperties.xml:86
 #, python-format
 msgid "Show in Top Menu"
-msgstr ""
+msgstr "Afficher dans le menu supérieur"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Show your address on a map in the"
-msgstr ""
+msgstr "Afficher votre adresse sur une carte dans le"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Slider Odoo Image"
-msgstr ""
+msgstr "Image du curseur Odoo"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2725,13 +2769,13 @@ msgstr "Médias sociaux"
 #: code:addons/website/controllers/main.py:218
 #, python-format
 msgid "Sort by Name"
-msgstr ""
+msgstr "Trier par nom"
 
 #. module: website
 #: code:addons/website/controllers/main.py:217
 #, python-format
 msgid "Sort by Url"
-msgstr ""
+msgstr "Trier par URL"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -2780,7 +2824,7 @@ msgstr "Sous-titre 3"
 #: code:addons/website/static/src/xml/website.seo.xml:58
 #, python-format
 msgid "Suggested"
-msgstr ""
+msgstr "Suggéré"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -2823,13 +2867,13 @@ msgstr "Modèle"
 #: code:addons/website/models/website.py:231
 #, python-format
 msgid "Template <b>%s (id:%s)</b> contains a link to this page"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: code:addons/website/models/website.py:301
 #, python-format
 msgid "Template <b>%s (id:%s)</b> is calling this file"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -2846,7 +2890,7 @@ msgstr "Modèles"
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_faq_collapse
 msgid "Terms of service"
-msgstr ""
+msgstr "Conditions d'utilisation"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.http_error_debug
@@ -2906,7 +2950,7 @@ msgstr "Les modèles délectionné seront réinitialisés aux paramètres d'usin
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "There are currently no pages for your website."
-msgstr ""
+msgstr "Il n'existe actuellement aucune page pour votre site Web."
 
 #. module: website
 #. openerp-web
@@ -2921,6 +2965,8 @@ msgid ""
 "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website\n"
 "                                (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\")."
 msgstr ""
+"Les présentes conditions d'utilisation (« Conditions », « Accord ») représentent un accord entre le site Web\n"
+" (« Opérateur de site Web », « nous », « notre » ou « nos ») et vous (« Utilisateur », « vous », « votre » ou « vos »)."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_features
@@ -2933,6 +2979,8 @@ msgid ""
 "This Agreement sets forth the general terms and conditions of your use of this website\n"
 "                                and any of its products or services (collectively, \"Website\" or \"Services\")."
 msgstr ""
+"Le présent accord définit les conditions générales qui régissent votre utilisation de ce site Web\n"
+" et tout produit ou service qui y est inclus (collectivement, « Site Web » ou « Services »)."
 
 #. module: website
 #: model:ir.model.fields,help:website.field_res_config_settings_favicon
@@ -2952,6 +3000,8 @@ msgid ""
 "This page does not exist, but you can create it as you are administrator of "
 "this site."
 msgstr ""
+"Cette page n'existe pas, mais vous pouvez la créer vu que vous êtes "
+"l'administrateur de ce site."
 
 #. module: website
 #: code:addons/website/models/website.py:246
@@ -3015,7 +3065,7 @@ msgstr "Suivez les visites via Google Analytics"
 #. module: website
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Tracking ID"
-msgstr ""
+msgstr "Identifiant de suivi"
 
 #. module: website
 #. openerp-web
@@ -3023,6 +3073,7 @@ msgstr ""
 #, python-format
 msgid "Transform the picture (click twice to reset transformation)"
 msgstr ""
+"Transformer l'image (cliquer deux fois pour réinitialiser la transformation)"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_twitter
@@ -3076,7 +3127,7 @@ msgstr "Pack illimité"
 #. module: website
 #: model:ir.ui.view,arch_db:website.index_management
 msgid "Unindexed"
-msgstr ""
+msgstr "Non indexé"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -3119,6 +3170,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website.res_config_settings_view_form
 msgid "Use a CDN to optimize the availability of your website's content"
 msgstr ""
+"Utiliser un CDN pour optimiser la disponibilité du contenu de votre site Web"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_cdn_activated
@@ -3213,6 +3265,9 @@ msgid ""
 "                                                      life through disruptive products. We build great products to solve your\n"
 "                                                      business problems."
 msgstr ""
+"Nous sommes une équipe de gens passionnés dont l'objectif est d'améliorer le quotidien de chacun\n"
+" à l'aide de produits innovants. Nous créons des produits remarquables pour résoudre les\n"
+" problèmes de votre entreprise."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.footer_default
@@ -3230,7 +3285,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.xml:37
 #, python-format
 msgid "We found these ones:"
-msgstr ""
+msgstr "Nous avons trouvé les éléments suivants :"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.contactus
@@ -3289,7 +3344,7 @@ msgstr "Nom du site web"
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_pages_form_view
 msgid "Website Page Settings"
-msgstr ""
+msgstr "Paramètres de page de site Web"
 
 #. module: website
 #: model:ir.actions.act_window,name:website.action_website_pages_list
@@ -3305,18 +3360,18 @@ msgstr "Chemin du site web"
 #. module: website
 #: model:ir.model,name:website.model_website_redirect
 msgid "Website Redirect"
-msgstr ""
+msgstr "Redirection du site Web"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.website_redirect_form_view
 msgid "Website Redirect Settings"
-msgstr ""
+msgstr "Paramètres de redirection de site Web"
 
 #. module: website
 #: model:ir.actions.act_window,name:website.action_website_redirect_list
 #: model:ir.ui.view,arch_db:website.website_redirect_tree_view
 msgid "Website Redirects"
-msgstr ""
+msgstr "Redirections de site Web"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.view_website_form
@@ -3364,6 +3419,9 @@ msgid ""
 "                                User by this site. The User may configure his / her browser to notify and\n"
 "                                reject the installation of the cookies sent by us."
 msgstr ""
+"Le Site Web peut utiliser des cookies pour personnaliser et faciliter au maximum la navigation sur ce site\n"
+" par l'Utilisateur. L'Utilisateur peut configurer son navigateur pour notifier et\n"
+" refuser l'installation des cookies que nous envoyons."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.menu_tree
@@ -3546,6 +3604,9 @@ msgid ""
 "                                any website which you access through a link from this Website. Your linking to\n"
 "                                any other off-site pages or other websites is at your own risk."
 msgstr ""
+"Vous devez examiner soigneusement les déclarations juridiques et les autres conditions d'utilisation de\n"
+" tout site Web auquel vous accédez par l'intermédiaire d'un lien de ce Site Web. Si vous accédez à\n"
+" toute autre page en dehors du Site ou à tout autre site Web, vous le faites à vos propres risques."
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -3558,19 +3619,19 @@ msgstr "Essayez d'autres critères de recherche."
 #: code:addons/website/static/src/xml/website.backend.xml:56
 #, python-format
 msgid "Your Client ID:"
-msgstr ""
+msgstr "Votre identifiant client :"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_banner
 msgid "Your Slide Title"
-msgstr ""
+msgstr "Titre de votre diapositive"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/xml/website.backend.xml:51
 #, python-format
 msgid "Your Tracking ID:"
-msgstr ""
+msgstr "Votre identifiant de suivi :"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_title
@@ -3587,7 +3648,7 @@ msgstr "Vos changements seront sauvegardés automatiquement "
 #. module: website
 #: model:ir.ui.view,arch_db:website.edit_website_pages
 msgid "Your search '"
-msgstr ""
+msgstr "Votre recherche «"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_social_youtube
@@ -3618,7 +3679,7 @@ msgstr "e.g. A propos de nous "
 #: code:addons/website/static/src/xml/website.xml:41
 #, python-format
 msgid "found(s)"
-msgstr ""
+msgstr "trouvé(s)"
 
 #. module: website
 #. openerp-web
@@ -3707,7 +3768,7 @@ msgstr "res.config.settings"
 #: code:addons/website/static/src/xml/website.editor.xml:6
 #, python-format
 msgid "signs to get your website ready in no time."
-msgstr ""
+msgstr "connectez-vous pour configurer rapidement votre site Web."
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.robots
diff --git a/addons/website/i18n/zh_CN.po b/addons/website/i18n/zh_CN.po
index 817970d6731..4fa71332ad8 100644
--- a/addons/website/i18n/zh_CN.po
+++ b/addons/website/i18n/zh_CN.po
@@ -212,7 +212,7 @@ msgstr "<b>点击 编辑</b> 开始设计你的主页."
 msgid ""
 "<b>Click on a text</b> to start editing it. <i>It's that easy to edit your "
 "content!</i>"
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -233,14 +233,14 @@ msgid ""
 "                        making a relationship connection. This shows up in small\n"
 "                        quirks like word choices or phrases. Write from your point\n"
 "                        of view, not from someone else's experience."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #. openerp-web
 #: code:addons/website/static/src/js/tours/banner.js:74
 #, python-format
 msgid "<b>Install a contact form</b> to improve this page."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #. openerp-web
@@ -249,7 +249,7 @@ msgstr ""
 msgid ""
 "<b>Install new apps</b> to get more features. Let's install the <i>'Contact "
 "form'</i> app."
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: website
 #: model:ir.actions.act_window,help:website.action_module_theme
@@ -269,17 +269,17 @@ msgstr "<b>设定自定义图像...</b>"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-arrows\"/>Background Image Sizing"
-msgstr ""
+msgstr "<i class=\"fa fa-arrows\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-arrows-h\"/>Images spacing"
-msgstr ""
+msgstr "<i class=\"fa fa-arrows-h\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-clock-o\"/>Scroll Speed"
-msgstr ""
+msgstr "<i class=\"fa fa-clock-o\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -294,7 +294,7 @@ msgstr "特征"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-expand\"/>Margin"
-msgstr ""
+msgstr "<i class=\"fa fa-expand\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -304,7 +304,7 @@ msgstr "<i class=\"fa fa-eyedropper\"/>背景颜色"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-eyedropper\"/>Overlay color"
-msgstr ""
+msgstr "<i class=\"fa fa-eyedropper\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -314,7 +314,7 @@ msgstr ""
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
 msgid "<i class=\"fa fa-indent\"/> Inner content"
-msgstr ""
+msgstr "<i class=\"fa fa-indent\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -324,17 +324,17 @@ msgstr "<i class=\"fa fa-magic icon-fix\"/> 特效"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-magic\"/>Mode"
-msgstr ""
+msgstr "<i class=\"fa fa-magic\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-magnet\"/>Float"
-msgstr ""
+msgstr "<i class=\"fa fa-magnet\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-paint-brush\"/>Styling"
-msgstr ""
+msgstr "<i class=\"fa fa-paint-brush\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -363,12 +363,12 @@ msgstr "<i class=\"fa fa-plus-circle\"/>添加图像"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-refresh\"/>Re-order"
-msgstr ""
+msgstr "<i class=\"fa fa-refresh\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-th\"/>Columns"
-msgstr ""
+msgstr "<i class=\"fa fa-th\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -383,7 +383,7 @@ msgstr "<i class=\"fa fa-th-large\"/> 网站 <b class=\"caret\"/>"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-trash\"/>Remove all images"
-msgstr ""
+msgstr "<i class=\"fa fa-trash\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -402,7 +402,7 @@ msgstr "<I>即时安装，满意或报销。</I>"
 msgid ""
 "<p><b>That's it.</b> Your homepage is live.</p><p>Continue adding more pages"
 " to your site or edit this page to make it even more awesome.</p>"
-msgstr ""
+msgstr "<p><b/></p><p/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_floating
@@ -429,7 +429,7 @@ msgstr "<small>John Doe, CEO</small>"
 msgid ""
 "<span class=\"caret\"/>\n"
 "                            <span class=\"sr-only\">Toggle Dropdown</span>"
-msgstr ""
+msgstr "<span class=\"caret\"/><span class=\"sr-only\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -455,6 +455,8 @@ msgid ""
 "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
 "plus-circle\"/> Add Images</span>"
 msgstr ""
+"<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-"
+"plus-circle\"/></span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.layout
@@ -464,6 +466,8 @@ msgid ""
 "                <span class=\"icon-bar\"/>\n"
 "                <span class=\"icon-bar\"/>"
 msgstr ""
+"<span class=\"sr-only\"/><span class=\"icon-bar\"/><span class=\"icon-"
+"bar\"/><span class=\"icon-bar\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.user_navbar
@@ -471,7 +475,7 @@ msgid ""
 "<span/>\n"
 "                                <span class=\"css_publish\">Unpublished</span>\n"
 "                                <span class=\"css_unpublish\">Published</span>"
-msgstr ""
+msgstr "<span/><span class=\"css_publish\"/><span class=\"css_unpublish\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_comparisons
@@ -493,7 +497,7 @@ msgstr "<span>$</span><b style=\"font-size: 60px\">65</b><small>.00</small>"
 msgid ""
 "<span>Contact Us Now</span>\n"
 "                        <i class=\"fa fa-chevron-right\"/>"
-msgstr ""
+msgstr "<span/><i class=\"fa fa-chevron-right\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_share
@@ -632,7 +636,7 @@ msgstr "在菜单添加页面"
 #: code:addons/website/static/src/js/tours/banner.js:50
 #, python-format
 msgid "After having checked how it looks on mobile, <b>close the preview</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -1148,7 +1152,7 @@ msgstr ""
 #: code:addons/website/static/src/js/tours/banner.js:20
 #, python-format
 msgid "Drag the <i>Cover</i> block and drop it in your page."
-msgstr ""
+msgstr "<i/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_feature_grid
@@ -1412,7 +1416,7 @@ msgstr ""
 msgid ""
 "Good Job! You created your first page. Let's check how this page looks like "
 "on <b>mobile devices</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #. openerp-web
@@ -1699,7 +1703,7 @@ msgstr ""
 msgid ""
 "It might be possible to edit the relevant items or fix the issue in <a "
 "href=\"%s\">the classic Odoo interface</a>"
-msgstr ""
+msgstr "<a href=\"%s\"/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_button
@@ -2233,13 +2237,13 @@ msgstr "网页"
 #: code:addons/website/models/website.py:213
 #, python-format
 msgid "Page <b>%s</b> contains a link to this page"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: code:addons/website/models/website.py:282
 #, python-format
 msgid "Page <b>%s</b> is calling this file"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.model.fields,field_description:website.field_website_page_website_indexed
@@ -2403,7 +2407,7 @@ msgstr "发布"
 #: code:addons/website/static/src/js/tours/banner.js:42
 #, python-format
 msgid "Publish your page by clicking on the <b>Save</b> button."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #. openerp-web
@@ -2747,13 +2751,13 @@ msgstr "模板"
 #: code:addons/website/models/website.py:231
 #, python-format
 msgid "Template <b>%s (id:%s)</b> contains a link to this page"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: code:addons/website/models/website.py:301
 #, python-format
 msgid "Template <b>%s (id:%s)</b> is calling this file"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.500
@@ -2878,7 +2882,7 @@ msgstr ""
 #: code:addons/website/models/website.py:246
 #, python-format
 msgid "This page is in the menu <b>%s</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -3395,7 +3399,7 @@ msgid ""
 "Write one or two paragraphs describing your product or\n"
 "                        services.<br/>To be successful your content needs to be\n"
 "                        useful to your readers."
-msgstr ""
+msgstr "<br/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_text
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index a20db972c0b..943a603d211 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -26,7 +26,7 @@ class QWeb(models.AbstractModel):
     def _get_asset(self, xmlid, options, css=True, js=True, debug=False, async=False, values=None):
         website = getattr(request, 'website', None) if request else None
         if website and website.cdn_activated:
-            values = dict(values, url_for=website.get_cdn_url)
+            values = dict(values or {}, url_for=website.get_cdn_url)
         return super(QWeb, self)._get_asset(xmlid, options, css, js, debug, async, values)
 
     def _website_build_attribute(self, tagName, name, value, options, values):
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js
index fbe839365ae..336ea822902 100644
--- a/addons/website/static/src/js/content/website_root.js
+++ b/addons/website/static/src/js/content/website_root.js
@@ -1,4 +1,4 @@
-odoo.define('website.WebsiteRoot.instance', function (require) {
+odoo.define('root.widget', function (require) {
 'use strict';
 
 require('web.dom_ready');
diff --git a/addons/website_blog/i18n/de.po b/addons/website_blog/i18n/de.po
index 348cc60c89b..8422b6ad78a 100644
--- a/addons/website_blog/i18n/de.po
+++ b/addons/website_blog/i18n/de.po
@@ -4,28 +4,29 @@
 # 
 # Translators:
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Torsten Wichmann <t.wichmann@intero-technologies.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Mathias Neef <mn@copado.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +41,9 @@ msgid ""
 "                        It will now be the turn of the big players to catch up to\n"
 "                        the superior technologies of the SME.\""
 msgstr ""
+"„Endlich werden Innovationen für ein breiteres Publikum zugänglich.\n"
+" Nun sind die führenden Marktsegmente an der Reihe,\n"
+" sich die überlegenen Technologien des KMU anzueignen.“"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -53,6 +57,14 @@ msgid ""
 "                    compete at this level due to the technology currently\n"
 "                    employed by most industry providers.\""
 msgstr ""
+"„Odoo steht in vielen Bereichen ohne große Konkurrenz da,\n"
+" welche sie von der Spitze vertreiben könnte.\n"
+" Mit der Einführung ihrer integrierten CMS- und E-Commerce-Systeme\n"
+" baut es weiter ihre Position als eine der führenden\n"
+" Kräfte in der Open-Source-Revolution aus. Es wird aufgrund der\n"
+" derzeit von den meisten Branchenanbietern verwendeten Technologie mindestens\n"
+" 5 Jahre dauern, bis ein anderer ERP- oder CMS-Anbieter auf diesem Niveau\n"
+" mithalten kann.“"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -66,6 +78,14 @@ msgid ""
 "                    enterprise to compete at a level of functionality and\n"
 "                    performance previously reserved for the big IT investors.\""
 msgstr ""
+"„Mit der neuesten Veröffentlichung von Odoo kann sich ein Unternehmen schneller als je zuvor vom Start\n"
+" bis zum Online-Handel entwickeln.“, teilt Stuart Mackintosh mit,\n"
+" MD des Open-Source-Spezialisten und Odoo-Integrationspartner,\n"
+" OpusVL. „Die erforderlichen Investitionen\n"
+" für ein voll automatisiertes Unternehmenssystem sind drastisch reduziert,\n"
+" wodurch kleine und mittlere Unternehmen\n"
+" hinsichtlich Funktionalität und Leistung\n"
+" auf dem Niveau großer IT-Investoren mithalten können.“"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -75,11 +95,15 @@ msgid ""
 "                    take another look at the value they are providing to ensure\n"
 "                    that their 'solutions' can still compete.\""
 msgstr ""
+"„Dies ist ein weiterer äußerst smarter und disruptiver Zug\n"
+" von Odoo, der andere Technologieanbieter dazu zwingt,\n"
+" sich die eigenen Angebote genauer anzusehen,\n"
+" damit deren 'Lösungen' weiter mithalten können.“"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "&amp;mdash;"
-msgstr ""
+msgstr "&mdash;"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -97,13 +121,15 @@ msgid ""
 "(Un)archiving a blog automatically (un)archives its posts. Do you want to "
 "proceed?"
 msgstr ""
+"Das (Un-)Archivieren eines Blogs (un-)archiviert automatisch auch dessen "
+"Beiträge. Möchten Sie fortfahren?"
 
 #. module: website_blog
 #. openerp-web
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:53
 #, python-format
 msgid "<b>Click on Save</b> to record your changes."
-msgstr ""
+msgstr "<b>Klicken Sie auf „Speichern“,</b> um Ihre Änderungen aufzuzeichnen."
 
 #. module: website_blog
 #. openerp-web
@@ -111,6 +137,8 @@ msgstr ""
 #, python-format
 msgid "<b>Publish your blog post</b> to make it visible to your visitors."
 msgstr ""
+"<b>Veröffentlichen Sie Ihren Blog-Beitrag,</b> damit er für Ihre Besucher "
+"sichtbar wird."
 
 #. module: website_blog
 #. openerp-web
@@ -120,6 +148,8 @@ msgid ""
 "<b>That's it, your blog post is published!</b> Discover more features "
 "through the <i>Customize</i> menu."
 msgstr ""
+"<b>Das ist alles, Ihr Blog-Beitrag ist veröffentlicht!</b> Entdecken Sie "
+"mehr Funktionen im <i>Menü „Anpassen“.</i>"
 
 #. module: website_blog
 #. openerp-web
@@ -130,6 +160,10 @@ msgid ""
 " image or table, set bold or italic, etc. Drag and drop building blocks for "
 "more graphical blogs."
 msgstr ""
+"<b>Schreiben Sie hier Ihre Geschichte.</b> Mit der Werkzeugleiste, oben "
+"gestalten Sie Ihren Text stilvoll: Fügen Sie ein Bild oder eine Tabelle "
+"hinzu, aktivieren Sie Fett- oder Kursivschreibung und mehr. Ziehen Sie "
+"Bausteine nach Wunsch, damit Sie grafischere Blog-Beiträge erhälten."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -138,6 +172,9 @@ msgid ""
 "                        are victims of what others decide to push to them.\n"
 "                        Odoo differentiates:"
 msgstr ""
+"Eine Mischung von Push- und Pull-Faktoren: Heutzutage werden viele Menschen\n"
+" Opfer dessen, was andere für sie beschließen.\n"
+" Odoo unterscheidet:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
@@ -152,7 +189,7 @@ msgstr "Über uns"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "Access post"
-msgstr ""
+msgstr "Auf Beitrag zugreifen"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_active
@@ -163,7 +200,7 @@ msgstr "Aktiv"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "Adding to industry leading technology"
-msgstr ""
+msgstr "Zu branchenführender Technologie beitragen"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
@@ -185,6 +222,11 @@ msgid ""
 "                    integrated with many web tools and works across all devices\n"
 "                    by default."
 msgstr ""
+"Es gibt jetzt eine Standard-Website, die auf Bootstrap 3 basiert,\n"
+" dem neuesten Branchenstandard für die schnelle Entwicklung von\n"
+" Multi-Device-Websites, unterstützt von Twitter. So können\n"
+" viele Web-Tools direkt integriert werden und es funktioniert standardmäßig\n"
+" auf allen Geräte."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -194,6 +236,10 @@ msgid ""
 "                    the biggest wastes of time in companies, we have to fix\n"
 "                    this."
 msgstr ""
+"Wir bei Odoo entwickeln Tools für höhere Produktivität von\n"
+" Unternehmen. Da E-Mail- und Informationsströme zu\n"
+" den zeitintensivsten Aspekten von Unternehmen gehören, kümmern\n"
+" wir uns darum."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -245,7 +291,7 @@ msgstr "Blogeintrag"
 #: code:addons/website_blog/models/website.py:53
 #, python-format
 msgid "Blog Post <b>%s</b> seems to be calling this file !"
-msgstr ""
+msgstr "Blog-Beitrag <b>%s</b> scheint diese Datei aufzurufen!"
 
 #. module: website_blog
 #: code:addons/website_blog/models/website.py:28
@@ -326,13 +372,15 @@ msgstr "Wählen Sie ein Bild aus der Bibliothek."
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:30
 #, python-format
 msgid "Click here to change your post cover."
-msgstr ""
+msgstr "Klicken Sie hier, um den Titel Ihres Beitrags zu ändern."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid ""
 "Click on \"New Page\" in the top-right corner to write your first blog post."
 msgstr ""
+"Klicken Sie in der Ecke oben rechts auf „Neue Seite“, um Ihren ersten Blog-"
+"Beitrag zu schreiben."
 
 #. module: website_blog
 #. openerp-web
@@ -340,11 +388,12 @@ msgstr ""
 #, python-format
 msgid "Click on <b>Save</b> to set the picture as cover."
 msgstr ""
+"Klicken Sie auf <b>„Speichern“,</b> um das Bild als Titelbild festzulegen."
 
 #. module: website_blog
 #: model:ir.actions.act_window,help:website_blog.action_blog_post
 msgid "Click to create a new blog post."
-msgstr ""
+msgstr "Klicken Sie, um einen neuen Blog-Beitrag zu erstellen."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_content
@@ -355,7 +404,7 @@ msgstr "Inhalt"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_cover_properties
 msgid "Cover Properties"
-msgstr ""
+msgstr "Titelbild-Eigenschaften"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_create_uid
@@ -394,7 +443,7 @@ msgstr "Duplizieren"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Emails are broken."
-msgstr ""
+msgstr "E-Mails sind fehlerhaft."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -404,16 +453,21 @@ msgid ""
 "                    it's incredible it's still one of the only software\n"
 "                    areas that did not evolve in the past 20 years!"
 msgstr ""
+"E-Mails verschwenden meine Zeit. Aber ich bin auf sie angewiesen.\n"
+" Angesichts der Bedeutung, die E-Mails in unserem Leben haben,\n"
+" gehört es leider immer noch zu den wenigen\n"
+" Software-Bereichen, die sich in den vergangenen 20 Jahren,\n"
+" die sich nicht weiterentwickelt haben!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Color"
-msgstr ""
+msgstr "Filterfarbe"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Intensity"
-msgstr ""
+msgstr "Filterintensität"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -425,6 +479,12 @@ msgid ""
 "                        (signatures are on the profile of a contact, not in\n"
 "                        every message)"
 msgstr ""
+"Auf Inhalte konzentrieren: Alles\n"
+" ist hier auf das Wesentliche reduziert, damit die Botschaft im Fokus steht. Keine\n"
+" Willkommensnachrichten, Grüße, Signaturen oder rechtlichen\n"
+" Hinweise. Wir standardisieren das Layout jeder Nachricht.\n"
+" (Signaturen befinden sich auf dem Profil eines Kontakts,\n"
+" nicht in jeder Mitteilung.)"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -435,6 +495,11 @@ msgid ""
 "                        created with one click. Every group should have it's\n"
 "                        own email address."
 msgstr ""
+"Ordner und Mailinglisten sind großartige Tools,\n"
+" jedoch zu komplex für herkömmliche E-Mail-Clients. Bei Odoo\n"
+" kann eine Gruppe von Kontakten für eine Diskussion mit einem Klick\n"
+" erstellt werden. Jede Gruppe sollte eine eigene\n"
+" E-Mail-Adresse haben."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -450,6 +515,11 @@ msgid ""
 "                        actions. Every inbox should be empty after having\n"
 "                        been processed; no more overload of information."
 msgstr ""
+"Dinge erledigen: Ihr Posteingang ist eine\n"
+" To-Do-Liste. Sie sollten in der Lage sein, den Posteingang zu verarbeiten (und nicht nur\n"
+" zu lesen) und müheles Mitteilungen für zukünftige\n"
+" Aktionen zu markieren. Jeder Posteingang sollte nach der Verarbeitung leer sein.\n"
+" So umgehen Sie die Informationsflut."
 
 #. module: website_blog
 #: model:blog.blog,subtitle:website_blog.blog_blog_1
@@ -470,6 +540,7 @@ msgstr "Gruppieren nach"
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Here are the ideas behind the Odoo communication tools:"
 msgstr ""
+"Hier sind die Ideen, die hinter den Kommunikationstools von Odoo stehen:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -485,6 +556,11 @@ msgid ""
 "                    it updates the product database in real time, providing a\n"
 "                    true self-service window into the business."
 msgstr ""
+"Im Gegensatz zu anderen Managementsystemen für Web-Inhalte,\n"
+" ist es vollständig in die Backend-Datenbank integriert. Das bedeutet,\n"
+" dass es beim Bearbeiten einer Produktbeschreibung, eines Bildes oder Preises\n"
+" die Produktdatenbank in Echtzeit aktualisiert und\n"
+" so einen spielend leichten Zugang zu Unternehmensvorgängen bietet."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_id
@@ -496,7 +572,7 @@ msgstr "ID"
 #. module: website_blog
 #: model:blog.post,subtitle:website_blog.blog_post_1
 msgid "Ideas behind the Odoo communication tools."
-msgstr ""
+msgstr "Ideen hinter den Kommunikationstools von Odoo."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -516,6 +592,9 @@ msgid ""
 "                        should follow/unfollow any kind of information in one\n"
 "                        click."
 msgstr ""
+"Behalten Sie im Blick, was Sie erhalten möchten oder\n"
+" nicht erhalten möchten. Niemand sollte Spam erhalten. Sie\n"
+" sollten mit einem Klick allen Informationen folgen oder nicht mehr folgen können."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_write_uid
@@ -555,6 +634,9 @@ msgid ""
 "                    content in-line, enabling you to see exactly what you are\n"
 "                    changing and ensure your changes suit the context."
 msgstr ""
+"Wie viele moderne Website-Editoren bietet Odoo die Möglichkeit zum Inline-Bearbeiten von Inhalten.\n"
+" So können Sie genau sehen, was Sie ändern\n"
+" und sichergehen, dass Ihre Änderungen dem Kontext entsprechen."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -580,6 +662,11 @@ msgid ""
 "                                of your daily emails. Use the \"To: me\" menu\n"
 "                                for these."
 msgstr ""
+"Nachrichten „für Aktionen“: Sie\n"
+" verlangen Ihre sofortige Aufmerksamkeit und müssen von\n"
+" Ihnen vollständig bearbeitet werden.\n"
+" Dies umfasst etwa 10 % des täglichen Umfangs an E-Mails. Verwenden Sie dafür das\n"
+" Menü „Zu: mir“."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -591,11 +678,17 @@ msgid ""
 "                                to follow.This accounts for 90% of your daily\n"
 "                                emails.Use the \"Inbox\" menu for these."
 msgstr ""
+"Nachrichten „für Informationen“:\n"
+" Diese können Sie heranziehen, wenn Sie bestimmten\n"
+" Informationen benötigen. Sie müssen nicht täglich gelesen werden.\n"
+" Sie erhalten nur das, wo Sie folgen.\n"
+" Dies umfasst etwa 90 % des täglichen E-Mail-Umgangs.\n"
+" Verwenden Sie dafür das Menü „Posteingang“."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Mid screen"
-msgstr ""
+msgstr "Mid-Screen"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_tag_name
@@ -618,7 +711,7 @@ msgstr "Neue Blognachricht"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "New Features Launched"
-msgstr ""
+msgstr "Neue Funktionen gestartet"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.header_footer_custom
@@ -628,7 +721,7 @@ msgstr "Neuigkeiten"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "No Cover"
-msgstr ""
+msgstr "Kein Titelbild"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -657,6 +750,8 @@ msgid ""
 "                    building your company's website and selling your products\n"
 "                    online easy'. So how true is this statement?"
 msgstr ""
+"Odoo beansprucht, „die Open-Source-Software zu sein,\n"
+" mit der das Erstellen einer Unternehmens-Website und der Online-Verkauf von Produkten im Handumdrehen erfolgt“. Wie wahr ist diese Aussage?"
 
 #. module: website_blog
 #: model:blog.post,website_meta_keywords:website_blog.blog_post_1
@@ -669,11 +764,13 @@ msgstr "Odoo, E-Mail"
 #, python-format
 msgid "Once you have reviewed the content on mobile, close the preview."
 msgstr ""
+"Sobald Sie die Inhalte auf dem Mobilgerät überprüft haben, können Sie die "
+"Vorschau schließen."
 
 #. module: website_blog
 #: model:blog.blog,name:website_blog.blog_blog_1
 msgid "Our Blog"
-msgstr ""
+msgstr "Unser Blog"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_blogs
@@ -698,12 +795,17 @@ msgid ""
 "                        to read a thread. Reading a full thread, replying,\n"
 "                        attaching documents is super fast."
 msgstr ""
+"Produktivität ist wesentlich: Unsere intelligente Benutzeroberfläche\n"
+" erfordert nicht das Klicken auf alle E-Mails,\n"
+" um einen Thread zu lesen. Das Lesen eines vollständigen Threads, Antworten und\n"
+" Anhängen von Dokumenten gelingt im Handumdrehen."
 
 #. module: website_blog
 #: code:addons/website_blog/controllers/main.py:270
 #, python-format
 msgid "Public user cannot post comments on blog post."
 msgstr ""
+"Der öffentliche Benutzer kann keine Kommentare zum Blog-Beitrag erstellen."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
@@ -713,7 +815,7 @@ msgstr "Veröffentlicht"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_published_date
 msgid "Published Date"
-msgstr ""
+msgstr "Veröffentlichungsdatum"
 
 #. module: website_blog
 #: model:mail.message.subtype,description:website_blog.mt_blog_blog_published
@@ -724,12 +826,12 @@ msgstr "Veröffentlichte Beiträge"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
 msgid "Publishing Options"
-msgstr ""
+msgstr "Veröffentlichungsoptionen"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
 msgid "Publishing date"
-msgstr ""
+msgstr "Veröffentlichungsdatum"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -744,7 +846,7 @@ msgstr "Rangliste"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_read_next
 msgid "Read Next <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Nächste<span class=\"fa fa-long-arrow-right\"/> lesen"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -758,6 +860,13 @@ msgid ""
 "                    answer from me. With a good tool, I could have done\n"
 "                    my job in 10 minutes!"
 msgstr ""
+"Das Lesen meines Posteingangs ist die unproduktivste Aufgabe,\n"
+" die ich täglich verrichte. Ich verbringe täglich eine ganze Stunde\n"
+" mit dem Verarbeiten meiner E-Mails. Alle Inhalte sind im gleichen Posteingang:\n"
+" Spam, nebensächliche Informationen,\n"
+" zitierte Antworten auf zitierte Antworten usw. Am Ende\n"
+" dieser Stunde haben nur zehn E-Mails eine Antwort von mir verlangt. Mit einem guten Tool könnte ich\n"
+" die gleiche Arbeit in nur zehn Minuten erledigen!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -776,7 +885,7 @@ msgstr "Wählen Sie dieses Menü zur Erstellung einer neuen Blognachricht"
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:26
 #, python-format
 msgid "Set a blog post <b>cover</b>."
-msgstr ""
+msgstr "Ein <b>Titelbild für den Blog-Beitrag festlegen.</b>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -800,7 +909,7 @@ msgstr ""
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:52
 #, python-format
 msgid "Start writing here..."
-msgstr ""
+msgstr "Hier schreiben …"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
@@ -810,7 +919,7 @@ msgstr "Status"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
 msgid "Stay updated :"
-msgstr ""
+msgstr "Bleiben Sie auf dem Laufenden."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_subtitle
@@ -847,12 +956,12 @@ msgstr "Stichwörter"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser
 msgid "Teaser"
-msgstr ""
+msgstr "Teaser"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser_manual
 msgid "Teaser Content"
-msgstr ""
+msgstr "Teaser-Inhalt"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
@@ -862,7 +971,7 @@ msgstr "Technisch"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "The Communication Mechanism of Odoo"
-msgstr ""
+msgstr "Der Kommunikationsmechanismus von Odoo"
 
 #. module: website_blog
 #: model:blog.post,name:website_blog.blog_post_1
@@ -876,6 +985,8 @@ msgid ""
 "The blog post will be visible for your visitors as of this date on the "
 "website if it is set as published."
 msgstr ""
+"Der Blog-Beitrag ist ab diesem Datum für Ihre Besucher auf der Website "
+"sichtbar, wenn er als veröffentlicht festgelegt wird."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -883,6 +994,8 @@ msgid ""
 "This page is great to improve your <strong>Search Engine Optimization</strong>;\n"
 "                   You can review titles, keywords and descriptions of all blogs at once."
 msgstr ""
+"Diese Seite ist großartig, um Ihre <strong>Suchmaschinenoptimierung zu verbessern.\n"
+"</strong> Sie können Titel, Schlüsselwörter und die Beschreibungen aller Blogs auf einmal überprüfen."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -891,6 +1004,9 @@ msgid ""
 "                    removes the need to create offline synchronisation between\n"
 "                    website and product database."
 msgstr ""
+"Dadurch erhalten Sie eine einzige Datenquelle für Ihr Unternehmen und\n"
+" umgeht die Offline-Synchronisierung zwischen\n"
+" Website und Produkt-Datenbank."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_name
@@ -904,6 +1020,8 @@ msgid ""
 "                features, a website content management system (CMS or WMS) has been developed and a beta release is\n"
 "                available from today, 31st January 2014."
 msgstr ""
+"Um den bereits umfassenden Katalog an Odoo-Funktionen\n"
+" zu erweitern, wurde ein Content-Management-System für Websites (CMS oder WMS) entwickelt und eine Beta-Version ab dem 31. Januar 2018 zur Verfügung gestellt."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -911,6 +1029,8 @@ msgid ""
 "To disrupt emails, you need more than just another user\n"
 "                    interface. We need to rethink the whole communication flow."
 msgstr ""
+"Disruptive Technologien für E-Mails benötigen mehr als noch eine weitere\n"
+" Benutzeroberfläche. Wir müssen den gesamten Kommunikationsfluss überdenken."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
@@ -920,7 +1040,7 @@ msgstr "Unveröffentlicht"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "Untitled Post"
-msgstr ""
+msgstr "Unbenannter Beitrag"
 
 #. module: website_blog
 #. openerp-web
@@ -928,6 +1048,8 @@ msgstr ""
 #, python-format
 msgid "Use this icon to preview your blog post on <b>mobile devices</b>."
 msgstr ""
+"Mit diesem Symbol können Sie eine Vorschau Ihres <b>Blog-Beitrags auf "
+"Mobilgeräten anzeigen.</b>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_tag_form
@@ -976,13 +1098,15 @@ msgid ""
 "Write a small text here for when <b>new visitors</b> find your website\n"
 "            through your <b>blog entries</b>, referenced in Google."
 msgstr ""
+"Schreiben <b>Sie hier einen knappen Text für den Fall, dass neue Besucher</b> Ihre Website\n"
+" über Ihre <b>Blog-Einträge finden,</b> die in Google angegeben sind."
 
 #. module: website_blog
 #. openerp-web
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:20
 #, python-format
 msgid "Write a title, the subtitle is optional."
-msgstr ""
+msgstr "Schreiben Sie einen Titel, der Untertitel ist optional."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -995,11 +1119,13 @@ msgid ""
 "You should <strong>add a banner on the top</strong> as it is a frequent landing page for new visitors.\n"
 "                   <span class=\"text-muted\">This box will not be visible to your visitors.</span>"
 msgstr ""
+"<strong>Fügen Sie oben ein Banner hinzu,</strong> da es sich um eine häufige Landeseite für neue Besucher handelt.\n"
+" <span class=\"text-muted\">Dieses Feld ist für Ihre Besucher nicht sichtbar.</span>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "blog. Click here to access the blog :"
-msgstr ""
+msgstr "Blog. Klicken Sie hier, um auf den Blog zuzugreifen:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -1016,12 +1142,12 @@ msgstr "Kommentare"
 #. module: website_blog
 #: model:blog.tag,name:website_blog.blog_tag_1
 msgid "functional"
-msgstr ""
+msgstr "funktional"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "has been published on the"
-msgstr ""
+msgstr "wurde veröffentlicht im"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -1032,12 +1158,12 @@ msgstr "nach rechts verschieben"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "unpublished"
-msgstr ""
+msgstr "unveröffentlicht"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "view"
-msgstr ""
+msgstr "Ansicht"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
diff --git a/addons/website_blog/i18n/es.po b/addons/website_blog/i18n/es.po
index 01320ff6c4b..c64af26558c 100644
--- a/addons/website_blog/i18n/es.po
+++ b/addons/website_blog/i18n/es.po
@@ -3,11 +3,11 @@
 # * website_blog
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
@@ -22,13 +22,14 @@
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: David Vidal <david.vidal@trespinos.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -43,6 +44,9 @@ msgid ""
 "                        It will now be the turn of the big players to catch up to\n"
 "                        the superior technologies of the SME.\""
 msgstr ""
+"\"La vanguardia, por fin, está llegando a las masas.\n"
+" Los grandes protagonistas tienen ahora la responsabilidad de ponerse al día\n"
+" con las tecnologías superiores de las PYME\"."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -56,6 +60,13 @@ msgid ""
 "                    compete at this level due to the technology currently\n"
 "                    employed by most industry providers.\""
 msgstr ""
+"\"Odoo compite ahora en multitud de frentes, sin una\n"
+" competencia real para fijar objetivos de destronamiento.\n"
+" Con el lanzamiento de los sistemas integrados de CMS y comercio electrónico\n"
+", su posición como referente en la revolución del código abierto no hace sino afianzarse aún más. Tendrán que pasar\n"
+" como poco 5 años para que otro proveedor de ERP o CMS\n"
+" sea capaz de competir a este nivel debido a la tecnología\n"
+" que la mayoría de los proveedores de la industria emplea actualmente."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -69,6 +80,15 @@ msgid ""
 "                    enterprise to compete at a level of functionality and\n"
 "                    performance previously reserved for the big IT investors.\""
 msgstr ""
+"\"El nuevo lanzamiento de Odoo permitirá a un negocio\n"
+" partir de la nada y operar en línea en menos tiempo que nunca antes\",\n"
+" explica Stuart Mackintosh, director de marketing de OpusVL, una empresa\n"
+"especialista en software libre y que es, a su vez, socio de integraciones de Odoo. \"La inversión\n"
+" necesaria para poner en marcha un sistema de negocio plenamente automatizado\n"
+" se ha visto drásticamente reducida, permitiendo así\n"
+" a las pequeñas y medianas empresas competir a un nivel\n"
+" de funcionalidad y rendimiento que solo estaba al alcance\n"
+" de grandes inversores en TI\"."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -78,11 +98,15 @@ msgid ""
 "                    take another look at the value they are providing to ensure\n"
 "                    that their 'solutions' can still compete.\""
 msgstr ""
+"\"Se trata, por tanto, de otro movimiento inteligente y altamente disruptivo\n"
+" por parte de Odoo, que obliga de esta manera a otros proveedores de servicios\n"
+" a mirar de otro modo el valor de lo que ofertan\n"
+" para asegurarse de que sus soluciones siguen siendo competentes\"."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "&amp;mdash;"
-msgstr ""
+msgstr "&mdash;"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -100,6 +124,8 @@ msgid ""
 "(Un)archiving a blog automatically (un)archives its posts. Do you want to "
 "proceed?"
 msgstr ""
+"Al (des)archivar un blog, sus publicaciones se (des)archivan "
+"automáticamente. ¿Desea continuar?"
 
 #. module: website_blog
 #. openerp-web
@@ -135,7 +161,7 @@ msgid ""
 "<b>Write your story here.</b> Use the top toolbar to style your text: add an"
 " image or table, set bold or italic, etc. Drag and drop building blocks for "
 "more graphical blogs."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -144,11 +170,14 @@ msgid ""
 "                        are victims of what others decide to push to them.\n"
 "                        Odoo differentiates:"
 msgstr ""
+"Una mezcla de atracción y empuje: la gente\n"
+" hoy día es víctima de lo que los demás deciden imponer.\n"
+" Odoo diferencia:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "A new post"
-msgstr ""
+msgstr "Una nueva publicación"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
@@ -158,7 +187,7 @@ msgstr "Acerca de"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "Access post"
-msgstr ""
+msgstr "Puesto de acceso"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_active
@@ -169,7 +198,7 @@ msgstr "Activo"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "Adding to industry leading technology"
-msgstr ""
+msgstr "Sumando a la tecnología líder de la industria"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
@@ -191,6 +220,11 @@ msgid ""
 "                    integrated with many web tools and works across all devices\n"
 "                    by default."
 msgstr ""
+"Tal cual, existe un sitio web predeterminado basado en Bootstrap\n"
+" 3, el último estándar de la industria para el rápido\n"
+" desarrollo de sitios web multidispositivo respaldado por Twitter, por lo que se puede\n"
+" integrar directamente con diversas herramientas web y funciones en todos los dispositivos\n"
+" por defecto."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -200,6 +234,11 @@ msgid ""
 "                    the biggest wastes of time in companies, we have to fix\n"
 "                    this."
 msgstr ""
+"En Odoo, desarrollamos herramientas para implantar\n"
+" la productividad en las empresas. Como los correos electrónicos y los flujos de información\n"
+" son algunas de las mayores pérdidas de tiempo en las empresas,\n"
+" debemos encontrar una solución a\n"
+" esto."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -251,7 +290,7 @@ msgstr "Entrada del blog"
 #: code:addons/website_blog/models/website.py:53
 #, python-format
 msgid "Blog Post <b>%s</b> seems to be calling this file !"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: code:addons/website_blog/models/website.py:28
@@ -333,20 +372,22 @@ msgstr "Escoja una imagen de la colección."
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:30
 #, python-format
 msgid "Click here to change your post cover."
-msgstr ""
+msgstr "Haga clic aquí para cambiar la portada de su entrada."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid ""
 "Click on \"New Page\" in the top-right corner to write your first blog post."
 msgstr ""
+"Haga clic en la opción \"Página nueva\" de la esquina superior derecha para "
+"escribir su primera entrada del blog."
 
 #. module: website_blog
 #. openerp-web
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:40
 #, python-format
 msgid "Click on <b>Save</b> to set the picture as cover."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.actions.act_window,help:website_blog.action_blog_post
@@ -401,7 +442,7 @@ msgstr "Duplicar"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Emails are broken."
-msgstr ""
+msgstr "Los correos electrónicos están rotos."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -411,16 +452,20 @@ msgid ""
 "                    it's incredible it's still one of the only software\n"
 "                    areas that did not evolve in the past 20 years!"
 msgstr ""
+"Los correos electrónicos me hacen perder el tiempo. Pero los necesito.\n"
+" Dada la importancia que tiene en nuestras vidas,\n"
+" ¡resulta increíble que sea uno de los pocos\n"
+" ámbitos de software que no ha evolucionado en los últimos 20 años!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Color"
-msgstr ""
+msgstr "Filtrar color"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Filter Intensity"
-msgstr ""
+msgstr "Filtrar intensidad"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -432,6 +477,12 @@ msgid ""
 "                        (signatures are on the profile of a contact, not in\n"
 "                        every message)"
 msgstr ""
+"Céntrese en el contenido: todo está\n"
+" desmenuzado para hacer destacar el mensaje real. Se acabaron\n"
+" los mensajes de bienvenida, los saludos, las formas y los\n"
+" avisos legales. Hemos estandarizado el diseño de cada mensaje\n"
+" (las firmas aparecen en el perfil de un contacto,\n"
+" no en todos los mensajes)."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -442,6 +493,11 @@ msgid ""
 "                        created with one click. Every group should have it's\n"
 "                        own email address."
 msgstr ""
+"Las carpetas y las listas de correo son buenas herramientas,\n"
+" pero se presentan demasiado complejas en clientes tradicionales de mensajería electrónica. En Odoo, es\n"
+" posible crear con un solo clic un grupo de contactos\n"
+" que comparten un mismo tema de discusión. Cada grupo debe tener su\n"
+" propia dirección de correo electrónico."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -457,6 +513,11 @@ msgid ""
 "                        actions. Every inbox should be empty after having\n"
 "                        been processed; no more overload of information."
 msgstr ""
+"Haga lo que necesita hacer:\n"
+" bandeja de entrada es una lista de tareas pendientes. Ha de ser capaz de procesar (no solo\n"
+" leer) la bandeja de entrada y marcar mensajes con facilidad\n"
+" para acciones futuras. Todas las bandejas de entrada han de quedar\n"
+" vacías una vez procesadas; se acabaron las sobrecargas de información."
 
 #. module: website_blog
 #: model:blog.blog,subtitle:website_blog.blog_blog_1
@@ -477,6 +538,7 @@ msgstr "Agrupar por"
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Here are the ideas behind the Odoo communication tools:"
 msgstr ""
+"Estas son las ideas que manejan las herramientas de comunicación de Odoo:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -492,6 +554,11 @@ msgid ""
 "                    it updates the product database in real time, providing a\n"
 "                    true self-service window into the business."
 msgstr ""
+"No obstante, a diferencia de otros sistemas de gestión de contenidos web,\n"
+" se integra plenamente en la base de datos de respaldo. Esto significa\n"
+" que, al editar una descripción, una imagen o el precio de un producto\n"
+", el sistema actualiza la base de datos del producto en tiempo real,\n"
+" ofreciendo una verdadera ventana de autoservicio al negocio."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_id
@@ -523,6 +590,10 @@ msgid ""
 "                        should follow/unfollow any kind of information in one\n"
 "                        click."
 msgstr ""
+"Mantenga el control de lo que desea recibir\n"
+" y de lo que no. La gente no debería recibir nunca correo no deseado. Debería\n"
+" poder seguir o dejar de seguir cualquier tipo de\n"
+" información con un solo clic."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_write_uid
@@ -562,6 +633,9 @@ msgid ""
 "                    content in-line, enabling you to see exactly what you are\n"
 "                    changing and ensure your changes suit the context."
 msgstr ""
+"Al igual que muchos editores web modernos, con Odoo puede editar\n"
+" contenidos en línea y ver en todo momento lo\n"
+" que está modificando para asegurarse de que tales cambios son los deseados."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -587,6 +661,11 @@ msgid ""
 "                                of your daily emails. Use the \"To: me\" menu\n"
 "                                for these."
 msgstr ""
+"Mensajes \"de acción\":\n"
+" requieren su inmediata atención, y debe procesarlos\n"
+"todos. Este tipo de mensajes conforma el 10%\n"
+" de los correos electrónicos diarios. Use el menú \"Para: mí\"\n"
+" para ellos."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -598,11 +677,17 @@ msgid ""
 "                                to follow.This accounts for 90% of your daily\n"
 "                                emails.Use the \"Inbox\" menu for these."
 msgstr ""
+"Mensajes \"de información\":\n"
+" puedes recurrir a ellos si necesita información\n"
+" específica; no es obligatorio leerlos cada día.\n"
+" Solo recibe aquello que ha decidido seguir.\n"
+" Estos mensajes conforman el 90% de sus correos electrónicos diarios.\n"
+"Use el menú \"Bandeja de entrada\" para ellos."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
 msgid "Mid screen"
-msgstr ""
+msgstr "Pantalla mediana"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_tag_name
@@ -625,7 +710,7 @@ msgstr "Nueva entrada del blog"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "New Features Launched"
-msgstr ""
+msgstr "Nuevas funciones lanzadas"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.header_footer_custom
@@ -664,6 +749,8 @@ msgid ""
 "                    building your company's website and selling your products\n"
 "                    online easy'. So how true is this statement?"
 msgstr ""
+"Odoo afirma ser el \"software de código abierto que facilita\n"
+" el desarrollo de la página web de su empresa "
 
 #. module: website_blog
 #: model:blog.post,website_meta_keywords:website_blog.blog_post_1
@@ -676,6 +763,7 @@ msgstr "Odoo, correo electrónico"
 #, python-format
 msgid "Once you have reviewed the content on mobile, close the preview."
 msgstr ""
+"Una vez haya revisado los contenidos en el móvil, cierre la vista previa."
 
 #. module: website_blog
 #: model:blog.blog,name:website_blog.blog_blog_1
@@ -705,6 +793,10 @@ msgid ""
 "                        to read a thread. Reading a full thread, replying,\n"
 "                        attaching documents is super fast."
 msgstr ""
+"La productividad es la clave: nuestra\n"
+" inteligente interfaz de usuario no exige que pinches en cada\n"
+" correo electrónico para leer un hilo. Leer un hilo completo, responder\n"
+" o adjuntar documentos son cosas posibles en un abrir y cerrar de ojos."
 
 #. module: website_blog
 #: code:addons/website_blog/controllers/main.py:270
@@ -720,7 +812,7 @@ msgstr "Publicado"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_published_date
 msgid "Published Date"
-msgstr ""
+msgstr "Fecha publicada"
 
 #. module: website_blog
 #: model:mail.message.subtype,description:website_blog.mt_blog_blog_published
@@ -731,12 +823,12 @@ msgstr "Entrada publicada"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
 msgid "Publishing Options"
-msgstr ""
+msgstr "Opciones de publicación"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
 msgid "Publishing date"
-msgstr ""
+msgstr "Fecha de publicación"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -765,6 +857,14 @@ msgid ""
 "                    answer from me. With a good tool, I could have done\n"
 "                    my job in 10 minutes!"
 msgstr ""
+"Leer mi bandeja de entrada es la tarea menos productiva\n"
+" que hago a diario. Tengo que dedicar una hora entera\n"
+" al día para procesar mis correos electrónicos. Todo la chatarra acaba\n"
+" en la misma bandeja de entrada: correos no deseados, información\n"
+" que no importa, respuestas citadas a otras respuestas citadas, etc.\n"
+" Tras una hora entera perdida, solo 10 mensajes precisaban\n"
+" una respuesta por mi parte. ¡Con una buena herramienta, habría\n"
+" hecho esta labor en 10 minutos!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -784,7 +884,7 @@ msgstr ""
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:26
 #, python-format
 msgid "Set a blog post <b>cover</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -818,7 +918,7 @@ msgstr "Estado"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
 msgid "Stay updated :"
-msgstr ""
+msgstr "Estese actualizado:"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_subtitle
@@ -855,12 +955,12 @@ msgstr "Etiquetas"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser
 msgid "Teaser"
-msgstr ""
+msgstr "Avance"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser_manual
 msgid "Teaser Content"
-msgstr ""
+msgstr "Contenido del avance"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
@@ -870,7 +970,7 @@ msgstr "Técnico"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "The Communication Mechanism of Odoo"
-msgstr ""
+msgstr "El mecanismo de comunicación de Odoo"
 
 #. module: website_blog
 #: model:blog.post,name:website_blog.blog_post_1
@@ -884,6 +984,8 @@ msgid ""
 "The blog post will be visible for your visitors as of this date on the "
 "website if it is set as published."
 msgstr ""
+"La entrada de blog será visible para sus visitantes en la fecha indicada en "
+"el sitio web si se fija como publicada."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -901,6 +1003,9 @@ msgid ""
 "                    removes the need to create offline synchronisation between\n"
 "                    website and product database."
 msgstr ""
+"Esto proporciona una única fuente de datos para su empresa\n"
+" y prescinde de la necesidad de crear una sincronización sin conexión\n"
+" entre el sitio web y la base de datos de productos."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_name
@@ -914,6 +1019,9 @@ msgid ""
 "                features, a website content management system (CMS or WMS) has been developed and a beta release is\n"
 "                available from today, 31st January 2014."
 msgstr ""
+"Como añadido al ya de por sí amplio conjunto de funciones\n"
+" de Odoo, hemos desarrollado un sistema de gestión de contenidos web (CMS o WMS) cuya versión\n"
+" beta estará disponible a partir de hoy 31 de enero de 2014."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -921,6 +1029,8 @@ msgid ""
 "To disrupt emails, you need more than just another user\n"
 "                    interface. We need to rethink the whole communication flow."
 msgstr ""
+"Para alterar correos electrónicos, necesita algo diferente a una simple\n"
+" interfaz de usuario. Necesitamos replantear todo el flujo de comunicación."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
@@ -937,7 +1047,7 @@ msgstr "Post sin título"
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:58
 #, python-format
 msgid "Use this icon to preview your blog post on <b>mobile devices</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_tag_form
@@ -1013,7 +1123,7 @@ msgstr ""
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "blog. Click here to access the blog :"
-msgstr ""
+msgstr "blog. Haga clic aquí para acceder al blog:"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -1030,12 +1140,12 @@ msgstr "comentarios"
 #. module: website_blog
 #: model:blog.tag,name:website_blog.blog_tag_1
 msgid "functional"
-msgstr ""
+msgstr "funcional"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "has been published on the"
-msgstr ""
+msgstr "ha sido publicado en la"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
diff --git a/addons/website_blog/i18n/fr.po b/addons/website_blog/i18n/fr.po
index 9e945a5df3e..e9ef8786b25 100644
--- a/addons/website_blog/i18n/fr.po
+++ b/addons/website_blog/i18n/fr.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
 # Fabien Bourgeois <fabien@yaltik.com>, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
@@ -20,13 +20,15 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
+# fr trans <e2ftrans1@yahoo.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2018\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"
@@ -54,6 +56,14 @@ msgid ""
 "                    compete at this level due to the technology currently\n"
 "                    employed by most industry providers.\""
 msgstr ""
+"« Odoo se lance désormais sur de nombreux fronts, sans rencontrer une véritable\n"
+"                    concurrence capable de le détrôner.\n"
+"                    Le lancement de ses systèmes intégrés de CMS et d'ecommerce,\n"
+"                    conforte davantage sa position en tant qu'un des précurseurs de la révolution\n"
+"                    de solutions open source. Il nous faudra attendre au moins\n"
+"                    5 ans avant qu'un autre fournisseur de solutions ERP ou CMS dispose de la capacité\n"
+"                    de faire concurrence à ce stade en raison de la technologie actuellement\n"
+"                    utilisée par la plupart des fournisseurs du secteur. »"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -67,6 +77,14 @@ msgid ""
 "                    enterprise to compete at a level of functionality and\n"
 "                    performance previously reserved for the big IT investors.\""
 msgstr ""
+"« La dernière solution lancée par Odoo permettra à une entreprise partant de zéro de se lancer\n"
+"                    plus rapidement que jamais dans la vente ligne », explique\n"
+"                    Stuart Mackintosh de OpusVL, spécialiste de l'open source et\n"
+"                    partenaire d'intégration d'Odoo. « L'investissement\n"
+"                    nécessaire à un système de commerce entièrement automatisé est\n"
+"                    considérablement réduit, ce qui permet aux petites et moyennes entreprises\n"
+"                    de se lancer dans la course à un niveau de fonctionnalité et de\n"
+"                    performance auparavant réservé aux gros investisseurs en informatique. »"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
@@ -76,11 +94,15 @@ msgid ""
 "                    take another look at the value they are providing to ensure\n"
 "                    that their 'solutions' can still compete.\""
 msgstr ""
+"« Il s'agit encore d'un coup ingénieux et perturbateur de la part\n"
+"                    d'Odoo, ce qui obligera les autres fournisseurs en technologies à\n"
+"                    réévaluer la qualité de leurs services pour s'assurer\n"
+"                    que les \"solutions\" qu'ils fournissent sont toujours à la hauteur. »"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
 msgid "&amp;mdash;"
-msgstr ""
+msgstr "&amp;mdash;"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -135,7 +157,7 @@ msgid ""
 "<b>Write your story here.</b> Use the top toolbar to style your text: add an"
 " image or table, set bold or italic, etc. Drag and drop building blocks for "
 "more graphical blogs."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -144,6 +166,9 @@ msgid ""
 "                        are victims of what others decide to push to them.\n"
 "                        Odoo differentiates:"
 msgstr ""
+"Un mélange de forces contradictoires : les gens sont actuellement\n"
+"                        victimes des décisions que d'autres leur imposent.\n"
+"                        Odoo est différent :"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
@@ -158,7 +183,7 @@ msgstr "À propos de nous"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
 msgid "Access post"
-msgstr ""
+msgstr "Accéder à l'article"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_active
@@ -169,7 +194,7 @@ msgstr "Actif"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "Adding to industry leading technology"
-msgstr ""
+msgstr "Une amélioration des technologies de pointe"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
@@ -191,6 +216,11 @@ msgid ""
 "                    integrated with many web tools and works across all devices\n"
 "                    by default."
 msgstr ""
+"Un des sites Web par défaut utilise Bootstrap 3,\n"
+"                    qui est devenu une norme du secteur pour le développement efficaces de\n"
+"                    sites Web adaptés à plusieurs appareils et soutenu par Twitter. Il est ainsi\n"
+"                    possible de l'intégrer directement à de nombreux outils Web et est compatible\n"
+"                    par défaut avec tous les appareils."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -200,6 +230,10 @@ msgid ""
 "                    the biggest wastes of time in companies, we have to fix\n"
 "                    this."
 msgstr ""
+"Chez Odoo, nous créons des outils axés sur la productivité des\n"
+"                    entreprises. Étant donné que les flux d'e-mails et d'informations représentent\n"
+"                    l'une des plus grandes pertes de temps dans les entreprises, nous devons régler\n"
+"                    ce problème."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -251,7 +285,7 @@ msgstr "Article de blog"
 #: code:addons/website_blog/models/website.py:53
 #, python-format
 msgid "Blog Post <b>%s</b> seems to be calling this file !"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: code:addons/website_blog/models/website.py:28
@@ -333,7 +367,7 @@ msgstr "Choisir une image depuis la librairie."
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:30
 #, python-format
 msgid "Click here to change your post cover."
-msgstr ""
+msgstr "Cliquez ici pour modifier la couverture de votre message."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_short
@@ -405,7 +439,7 @@ msgstr "Dupliquer"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Emails are broken."
-msgstr ""
+msgstr "Les e-mails sont cassés."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -415,6 +449,10 @@ msgid ""
 "                    it's incredible it's still one of the only software\n"
 "                    areas that did not evolve in the past 20 years!"
 msgstr ""
+"Les e-mails me font perdre du temps, mais j'en ai besoin.\n"
+"                    Étant donné l'importance des e-mails dans nos vies,\n"
+"                    c'est incroyable que ce soit un des secteurs du logiciel\n"
+"                    qui n'ait pas évolué depuis les 20 dernières années!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -436,6 +474,12 @@ msgid ""
 "                        (signatures are on the profile of a contact, not in\n"
 "                        every message)"
 msgstr ""
+"Mettez l'accent sur le contenu : Tout est\n"
+"                        épuré pour mettre l'emphase sur le vrai message. Plus\n"
+"                        d'introduction polie, de salutations, de signatures ni de notes\n"
+"                        légales. Nous avons défini une mise en forme standard pour chaque message.\n"
+"                        (les signatures sont dans le profil d'un contact, pas\n"
+"                        dans chaque message)"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -446,6 +490,11 @@ msgid ""
 "                        created with one click. Every group should have it's\n"
 "                        own email address."
 msgstr ""
+"Les répertoires et les listes de diffusion sont des outils fantastiques, mais\n"
+"                        trop complexes dans les logiciels d'e-mails traditionnels. Dans Odoo, un\n"
+"                        groupe de contacts qui partagent une discussion peut être\n"
+"                        créé en un clic. Chaque groupe doit avoir sa\n"
+"                        propre adresse e-mail."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -461,6 +510,11 @@ msgid ""
 "                        actions. Every inbox should be empty after having\n"
 "                        been processed; no more overload of information."
 msgstr ""
+"Réalisez vos tâches : Votre boîte de réception constitue une\n"
+"                        liste de tâches à faire. Vous devez être en mesure de traiter (pas seulement\n"
+"                        lire) les messages de votre boîte de réception et identifier facilement ceux qui\n"
+"                        demandent un suivi. Chaque boîte de réception doit être vide après avoir\n"
+"                        été traitée ; oubliez les surcharges d'informations."
 
 #. module: website_blog
 #: model:blog.blog,subtitle:website_blog.blog_blog_1
@@ -480,7 +534,7 @@ msgstr "Regrouper par"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "Here are the ideas behind the Odoo communication tools:"
-msgstr ""
+msgstr "Voici les idées guidant les outils de communisation d'Odoo :"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -496,6 +550,11 @@ msgid ""
 "                    it updates the product database in real time, providing a\n"
 "                    true self-service window into the business."
 msgstr ""
+"Cependant, contrairement aux autres systèmes de gestion de contenu Web, il\n"
+"                    est entièrement intégré au système de base de données principale. Cela signifie\n"
+"                    que lorsque vous modifiez la description, l'image ou le prix d'un produit,\n"
+"                    la base de données du produit est également mise à jour en temps réel, ce qui vous procure\n"
+"                    une véritable visibilité sur votre entreprise."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_blog_id
@@ -529,6 +588,10 @@ msgid ""
 "                        should follow/unfollow any kind of information in one\n"
 "                        click."
 msgstr ""
+"Gardez le contrôle sur les éléments que vous souhaitez recevoir ou\n"
+"                        pas. Personne ne devrait recevoir de spam. Vous\n"
+"                        devez être en mesure de suivre ou de désactiver ces informations en un\n"
+"                        clic."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_write_uid
@@ -568,6 +631,9 @@ msgid ""
 "                    content in-line, enabling you to see exactly what you are\n"
 "                    changing and ensure your changes suit the context."
 msgstr ""
+"Comme la plupart des éditeurs de site Web modernes, Odoo vous permet de modifier\n"
+"                    du contenu de façon dynamique. Vous pouvez ainsi voir avec précision ce que vous\n"
+"                    êtes en train de modifier et vous assurer que tout est adapté au contexte."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -593,6 +659,11 @@ msgid ""
 "                                of your daily emails. Use the \"To: me\" menu\n"
 "                                for these."
 msgstr ""
+"Messages « de suivi » : ils demandent\n"
+"                                vote attention immédiate et vous devez\n"
+"                                tous les traiter. Ceci représente 10%\n"
+"                                de vos e-mails quotidiens. Utilisez le menu « Pour: moi »\n"
+"                                pour ceux-ci."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -604,6 +675,12 @@ msgid ""
 "                                to follow.This accounts for 90% of your daily\n"
 "                                emails.Use the \"Inbox\" menu for these."
 msgstr ""
+"Messages « pour votre information » :\n"
+"                                vous pouvez les consulter lorsque vous avez besoin d'une\n"
+"                                information spécifique. Vous n'avez pas besoin de les lire\n"
+"                                tous les jours. Vous ne recevez que ce que vous décidez\n"
+"                                de suivre. Ceci représente 90 % de vos e-mails\n"
+"                                quotidiens. Utilisez le menu « Boîte de réception » pour ceux-ci."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -631,7 +708,7 @@ msgstr "Nouvel article de blog"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_2
 msgid "New Features Launched"
-msgstr ""
+msgstr "Lancement de nouvelles fonctionnalités"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.header_footer_custom
@@ -670,6 +747,9 @@ msgid ""
 "                    building your company's website and selling your products\n"
 "                    online easy'. So how true is this statement?"
 msgstr ""
+"Odoo affirme être « le logiciel open source qui facilite\n"
+"                    la création du site Web de votre entreprise et la vente de vos produits\n"
+"                    en ligne ». Peut-on dire que cette déclaration est exacte ?"
 
 #. module: website_blog
 #: model:blog.post,website_meta_keywords:website_blog.blog_post_1
@@ -713,6 +793,10 @@ msgid ""
 "                        to read a thread. Reading a full thread, replying,\n"
 "                        attaching documents is super fast."
 msgstr ""
+"La productivité est la clé : grâce à notre interface utilisateur\n"
+"                        intelligente, vous n'avez pas à cliquer sur chaque e-mail\n"
+"                        pour lire un fil de conversation. Vous pouvez rapidement lire un fil de conversation\n"
+"                        complet, envoyer des réponses et ajouter des documents en pièce jointe."
 
 #. module: website_blog
 #: code:addons/website_blog/controllers/main.py:270
@@ -730,7 +814,7 @@ msgstr "Publié"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_published_date
 msgid "Published Date"
-msgstr ""
+msgstr "Date de publication"
 
 #. module: website_blog
 #: model:mail.message.subtype,description:website_blog.mt_blog_blog_published
@@ -741,12 +825,12 @@ msgstr "Article publié"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
 msgid "Publishing Options"
-msgstr ""
+msgstr "Options de publication"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
 msgid "Publishing date"
-msgstr ""
+msgstr "Date de publication"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -775,6 +859,14 @@ msgid ""
 "                    answer from me. With a good tool, I could have done\n"
 "                    my job in 10 minutes!"
 msgstr ""
+"La lecture des messages de ma boîte de réception est la tâche la moins productive que je fais\n"
+"                    quotidiennement. Je consacre une heure entière par\n"
+"                    jour au traitement de mes e-mails. Tous les courriers indésirables sont\n"
+"                    acheminés dans la même boîte de réception, spams, informations sans importance,\n"
+"                    réponses de réponses, etc. À la fin\n"
+"                    de l'heure, seulement 10 e-mails nécessitaient une\n"
+"                    réponse de ma part. Avec un bon outil, j'aurais pu faire\n"
+"                    mon travail en 10 minutes!"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -794,7 +886,7 @@ msgstr ""
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:26
 #, python-format
 msgid "Set a blog post <b>cover</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -828,7 +920,7 @@ msgstr "Statut"
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
 msgid "Stay updated :"
-msgstr ""
+msgstr "Restez informé :"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_subtitle
@@ -865,12 +957,12 @@ msgstr "Étiquettes"
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser
 msgid "Teaser"
-msgstr ""
+msgstr "Teaser"
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser_manual
 msgid "Teaser Content"
-msgstr ""
+msgstr "Contenu du teaser"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
@@ -880,7 +972,7 @@ msgstr "Technique"
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
 msgid "The Communication Mechanism of Odoo"
-msgstr ""
+msgstr "Le mécanisme de communication d'Odoo"
 
 #. module: website_blog
 #: model:blog.post,name:website_blog.blog_post_1
@@ -894,6 +986,8 @@ msgid ""
 "The blog post will be visible for your visitors as of this date on the "
 "website if it is set as published."
 msgstr ""
+"Si l'article de blog est défini comme étant publié, vos visiteurs pourront "
+"le consulter à compter de cette date de publication."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -911,6 +1005,9 @@ msgid ""
 "                    removes the need to create offline synchronisation between\n"
 "                    website and product database."
 msgstr ""
+"Vous obtenez une source unique de données pour votre entreprise et\n"
+"                    n'avez plus besoin d'une synchronisation hors connexion entre\n"
+"                    le site Web et la base de données du produit."
 
 #. module: website_blog
 #: model:ir.model.fields,field_description:website_blog.field_blog_post_name
@@ -924,6 +1021,9 @@ msgid ""
 "                features, a website content management system (CMS or WMS) has been developed and a beta release is\n"
 "                available from today, 31st January 2014."
 msgstr ""
+"S'ajoutant à un ensemble déjà exhaustif de fonctionnalités Odoo,\n"
+"                un système de gestion de contenu de site Web (CMS ou WMS) a été mis au point et une version bêta est\n"
+"                disponible depuis le 31 janvier 2014."
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -931,6 +1031,8 @@ msgid ""
 "To disrupt emails, you need more than just another user\n"
 "                    interface. We need to rethink the whole communication flow."
 msgstr ""
+"Pour révolutionner les e-mails, il faut bien plus qu'une autre interface\n"
+"                    utilisateur. Nous devons repenser tout le flux de communication."
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
@@ -1042,7 +1144,7 @@ msgstr "commentaires"
 #. module: website_blog
 #: model:blog.tag,name:website_blog.blog_tag_1
 msgid "functional"
-msgstr ""
+msgstr "fonctionnel"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
diff --git a/addons/website_blog/i18n/zh_CN.po b/addons/website_blog/i18n/zh_CN.po
index 9bb211d3142..de9e9381a05 100644
--- a/addons/website_blog/i18n/zh_CN.po
+++ b/addons/website_blog/i18n/zh_CN.po
@@ -17,13 +17,14 @@
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # THL <wt39181819@gmail.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -101,14 +102,14 @@ msgstr ""
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:53
 #, python-format
 msgid "<b>Click on Save</b> to record your changes."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #. openerp-web
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:69
 #, python-format
 msgid "<b>Publish your blog post</b> to make it visible to your visitors."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #. openerp-web
@@ -117,7 +118,7 @@ msgstr ""
 msgid ""
 "<b>That's it, your blog post is published!</b> Discover more features "
 "through the <i>Customize</i> menu."
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: website_blog
 #. openerp-web
@@ -127,7 +128,7 @@ msgid ""
 "<b>Write your story here.</b> Use the top toolbar to style your text: add an"
 " image or table, set bold or italic, etc. Drag and drop building blocks for "
 "more graphical blogs."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:blog.post,content:website_blog.blog_post_1
@@ -243,7 +244,7 @@ msgstr "博文"
 #: code:addons/website_blog/models/website.py:53
 #, python-format
 msgid "Blog Post <b>%s</b> seems to be calling this file !"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: code:addons/website_blog/models/website.py:28
@@ -336,7 +337,7 @@ msgstr ""
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:40
 #, python-format
 msgid "Click on <b>Save</b> to set the picture as cover."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.actions.act_window,help:website_blog.action_blog_post
@@ -773,7 +774,7 @@ msgstr "选择此菜单项新建一篇博文"
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:26
 #, python-format
 msgid "Set a blog post <b>cover</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -921,7 +922,7 @@ msgstr "无标题发表"
 #: code:addons/website_blog/static/src/js/website.tour.blog.js:58
 #, python-format
 msgid "Use this icon to preview your blog post on <b>mobile devices</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_blog
 #: model:ir.ui.view,arch_db:website_blog.blog_tag_form
diff --git a/addons/website_crm/i18n/de.po b/addons/website_crm/i18n/de.po
index f43b97d4a4a..dd7f2fef1fc 100644
--- a/addons/website_crm/i18n/de.po
+++ b/addons/website_crm/i18n/de.po
@@ -5,23 +5,24 @@
 # Translators:
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Torsten Wichmann <t.wichmann@intero-technologies.de>, 2017
-# Tina Rittmüller <tr@ife.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
+# Wolfgang Taferner, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
+# Tina Rittmüller <tr@ife.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: AppleMentalist <felix.schnatbaum@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,11 +43,13 @@ msgid ""
 "<span class=\"btn btn-primary btn-lg o_website_form_send\">Send</span>\n"
 "                                <span id=\"o_website_form_result\"/>"
 msgstr ""
+"<span class=\"btn btn-primary btn-lg o_website_form_send\">Senden\n"
+"</span><span id=\"o_website_form_result\"/>"
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "Add a contact form in the"
-msgstr ""
+msgstr "Ein Kontaktformular hinzufügen in der"
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
@@ -66,12 +69,12 @@ msgstr "Kontakt"
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_team_id
 msgid "Default Sales Channel"
-msgstr ""
+msgstr "Standard-Verkaufskanal"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_website_crm_default_team_id
 msgid "Default Sales Channels"
-msgstr ""
+msgstr "Standard-Verkaufskanäle"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_user_id
@@ -85,12 +88,16 @@ msgstr "Standard Verkäufer"
 msgid ""
 "Default sales channel for new leads created through the Contact Us form."
 msgstr ""
+"Standard-Verkaufskanal für neue Leads, die über das Kontaktformular erstellt"
+" werden."
 
 #. module: website_crm
 #: model:ir.model.fields,help:website_crm.field_res_config_settings_crm_default_user_id
 #: model:ir.model.fields,help:website_crm.field_website_crm_default_user_id
 msgid "Default salesperson for new leads created through the Contact Us form."
 msgstr ""
+"Standard-Verkäufer für neue Leads, die über das Kontaktformular erstellt "
+"werden."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
@@ -114,6 +121,8 @@ msgstr "Interessent / Chance"
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "New messages are managed as leads or opportunities in your CRM app."
 msgstr ""
+"Neue Nachrichten werden als Leads oder Gelegenheiten in Ihrer CRM-App "
+"verwaltet."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
diff --git a/addons/website_crm/i18n/es.po b/addons/website_crm/i18n/es.po
index 64a37477999..94d20913bf2 100644
--- a/addons/website_crm/i18n/es.po
+++ b/addons/website_crm/i18n/es.po
@@ -3,23 +3,24 @@
 # * website_crm
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2016
 # Eric Antones <eantones@users.noreply.github.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2017
 # maitaoriana <maitaoriana@gmail.com>, 2017
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 # Nhomar Hernández [Vauxoo] <nhomar@vauxoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Nhomar Hernández [Vauxoo] <nhomar@vauxoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -66,12 +67,12 @@ msgstr "Contáctenos"
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_team_id
 msgid "Default Sales Channel"
-msgstr ""
+msgstr "Canal de ventas predeterminado"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_website_crm_default_team_id
 msgid "Default Sales Channels"
-msgstr ""
+msgstr "Canales de ventas predeterminados"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_user_id
@@ -85,12 +86,16 @@ msgstr "Vendedor Predeterminado"
 msgid ""
 "Default sales channel for new leads created through the Contact Us form."
 msgstr ""
+"Canal de ventas predeterminado para nuevas iniciativas creadas a través del "
+"formulario \"Contacte con nosotros\"."
 
 #. module: website_crm
 #: model:ir.model.fields,help:website_crm.field_res_config_settings_crm_default_user_id
 #: model:ir.model.fields,help:website_crm.field_website_crm_default_user_id
 msgid "Default salesperson for new leads created through the Contact Us form."
 msgstr ""
+"Vendedor predeterminado para nuevas iniciativas creadas a través del "
+"formulario \"Contacte con nosotros\"."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
@@ -113,6 +118,8 @@ msgstr "Iniciativa/Oportunidad"
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "New messages are managed as leads or opportunities in your CRM app."
 msgstr ""
+"Los mensajes nuevos son gestionados a modo de iniciativas u oportunidades en"
+" su aplicación de CRM."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
@@ -183,7 +190,7 @@ msgstr "Su mensaje se ha enviado correctamente."
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "page"
-msgstr ""
+msgstr "página"
 
 #. module: website_crm
 #: model:ir.model,name:website_crm.model_res_config_settings
diff --git a/addons/website_crm/i18n/fr.po b/addons/website_crm/i18n/fr.po
index 44a61e3e628..7d968768581 100644
--- a/addons/website_crm/i18n/fr.po
+++ b/addons/website_crm/i18n/fr.po
@@ -7,8 +7,8 @@
 # Xavier Symons <xsy@openerp.com>, 2016
 # Stephane DAGUET <stephane@darbtech.net>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Florian Hatat, 2016
+# Martin Trigaux, 2016
 # Lucas Deliege <lud@odoo.com>, 2017
 # lucasdeliege <deliegelucas@gmail.com>, 2017
 # Clo <clo@odoo.com>, 2017
@@ -18,13 +18,14 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: fr trans <e2ftrans1@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -71,12 +72,12 @@ msgstr "Contactez-nous"
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_team_id
 msgid "Default Sales Channel"
-msgstr ""
+msgstr "Canal de vente par défaut"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_website_crm_default_team_id
 msgid "Default Sales Channels"
-msgstr ""
+msgstr "Canaux de vente par défaut"
 
 #. module: website_crm
 #: model:ir.model.fields,field_description:website_crm.field_res_config_settings_crm_default_user_id
@@ -90,12 +91,16 @@ msgstr "Commercial par défaut"
 msgid ""
 "Default sales channel for new leads created through the Contact Us form."
 msgstr ""
+"Canal de vente par défaut pour les nouveaux leads créés via le formulaire de"
+" contact."
 
 #. module: website_crm
 #: model:ir.model.fields,help:website_crm.field_res_config_settings_crm_default_user_id
 #: model:ir.model.fields,help:website_crm.field_website_crm_default_user_id
 msgid "Default salesperson for new leads created through the Contact Us form."
 msgstr ""
+"Vendeur par défaut pour les nouveaux leads créés via le formulaire de "
+"contact."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
@@ -118,6 +123,8 @@ msgstr "Piste/opportunité"
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
 msgid "New messages are managed as leads or opportunities in your CRM app."
 msgstr ""
+"Les nouveaux messages sont gérés comme des leads et opportunités dans votre "
+"application CRM."
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.contactus_form
diff --git a/addons/website_crm/i18n/zh_CN.po b/addons/website_crm/i18n/zh_CN.po
index 07ed303991b..affd3937ee5 100644
--- a/addons/website_crm/i18n/zh_CN.po
+++ b/addons/website_crm/i18n/zh_CN.po
@@ -3,22 +3,23 @@
 # * website_crm
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # xiaobin wu <bd5dml@gmail.com>, 2016
 # Wei "oldrev" Li <liwei@sandwych.com>, 2016
 # mrshelly <mrshelly@hotmail.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Talway <9010446@qq.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2017
+# fausthuang, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,6 +40,8 @@ msgid ""
 "<span class=\"btn btn-primary btn-lg o_website_form_send\">Send</span>\n"
 "                                <span id=\"o_website_form_result\"/>"
 msgstr ""
+"<span class=\"btn btn-primary btn-lg o_website_form_send\"/><span "
+"id=\"o_website_form_result\"/>"
 
 #. module: website_crm
 #: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
diff --git a/addons/website_crm_partner_assign/i18n/de.po b/addons/website_crm_partner_assign/i18n/de.po
index c8b0096cedf..034bb1f11d5 100644
--- a/addons/website_crm_partner_assign/i18n/de.po
+++ b/addons/website_crm_partner_assign/i18n/de.po
@@ -3,30 +3,31 @@
 # * website_crm_partner_assign
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Malte Jansen <work@maltejansen.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,6 +69,36 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"<p>Hallo,</p>\n"
+"\n"
+"\n"
+"<p>Wir wurden von Interessenten aus Ihrer Region kontaktiert. Daher wurden die folgenden Leads an ${ctx['partner_id'].name}:</p>\n"
+"\n"
+"<ol>\n"
+"% für Lead in ctx['partner_leads']:\n"
+"     <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li><br/>\n"
+"% endfor\n"
+"</ol>\n"
+"\n"
+"% if ctx.get('partner_in_portal'):\n"
+"<p>Details erhalten Sie über Ihr<a href=\"${object.get_portal_url()}\">Partner Portal.</a> Bei jedem Lead befinden sich in der Ecke oben links zwei Schaltflächen, auf die Sie nach dem Kontaktieren des Leads klicken: „Ich bin interessiert“ und „Ich bin nicht interessiert“.</p>\n"
+"% else:\n"
+"<p>\n"
+"    Sie verfügen noch nicht über einen Portal-Zugang zu unserer Datenbank. Bitte kontaktieren Sie \n"
+"    ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email und 'your account manager  %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) oder 'us'}.\n"
+"</p>\n"
+"% endif\n"
+"<p>Der Lead wird an einen anderen Partner gesendet, wenn Sie den Lead nicht innerhalb von 20 Tagen kontaktieren.</p>\n"
+"\n"
+"<p> Vielen Dank,</p>\n"
+"\n"
+"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
+"\n"
+"% if not ctx['partner_id'].user_id:\n"
+"PS: Anscheinend wurde Ihnen kein Kontomanager zugewiesen. Bitte kontaktieren Sie uns.\n"
+"% endif\n"
+"            "
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_nbr_cases
@@ -94,7 +125,7 @@ msgstr ""
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
 msgid "<i class=\"fa fa-fw fa-times\"/> I'm not interested"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-times\"/>Ich bin nicht interessiert"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:191
@@ -131,6 +162,9 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_desinterested\" "
+"style=\"display:none;\">Sie müssen die nächste Aktion ausfüllen und den "
+"Kunden vor Akzeptieren des Leads kontaktieren.</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
@@ -139,11 +173,14 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_interested\" "
+"style=\"display:none;\">Sie müssen die nächste Aktion ausfüllen und den "
+"Kunden vor Akzeptieren des Leads kontaktieren.</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "<span>at </span>"
-msgstr ""
+msgstr "<span>zu </span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
@@ -190,7 +227,7 @@ msgstr "Alle Länder"
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:262
 #, python-format
 msgid "All fields are required !"
-msgstr ""
+msgstr "Alle Felder sind erforderlich!"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_date_assign
@@ -312,7 +349,7 @@ msgstr "Einen Reseller kontaktieren"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "Contact name"
-msgstr ""
+msgstr "Kontaktname"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_body
@@ -322,7 +359,7 @@ msgstr "Inhalte"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Countries..."
-msgstr ""
+msgstr "Länder …"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_country_id
@@ -347,7 +384,7 @@ msgstr "Erstellt von"
 #. module: website_crm_partner_assign
 #: model:crm.lead.tag,name:website_crm_partner_assign.tag_portal_lead_own_opp
 msgid "Created by Partner"
-msgstr ""
+msgstr "Erstellt von Partner"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_create_date
@@ -360,7 +397,7 @@ msgstr "Erstellt am"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "Current stage of the opp"
-msgstr ""
+msgstr "Aktueller Status der Opp"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_partner_id
@@ -413,7 +450,7 @@ msgstr "Beschreibung"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Details Next Activity"
-msgstr ""
+msgstr "Details zur nächsten Aktion"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_display_name
@@ -433,12 +470,12 @@ msgstr "Haben Sie den Kunden kontaktiert?"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Edit Contact"
-msgstr ""
+msgstr "Kontakt bearbeiten"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Edit Opportunity"
-msgstr ""
+msgstr "Opportunity bearbeiten"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
@@ -463,7 +500,7 @@ msgstr "Erwartetes Abschlussdatum"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Expected Closing:"
-msgstr ""
+msgstr "Erwarteter Abschluss:"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:112
@@ -559,12 +596,15 @@ msgstr "Hoch"
 #, python-format
 msgid "I am not interested by this lead. I contacted the lead."
 msgstr ""
+"Ich bin an diesem Lead nicht interessiert. Ich habe den Lead kontaktiert."
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:203
 #, python-format
 msgid "I am not interested by this lead. I have not contacted the lead."
 msgstr ""
+"Ich bin an diesem Lead nicht interessiert. Ich habe den Lead nicht "
+"kontaktiert."
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_id
@@ -586,7 +626,7 @@ msgstr "Implementierungsreferenzen"
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_count
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_implemented_count
 msgid "Implemented Count"
-msgstr ""
+msgstr "Zähler implementiert"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_assigned_partner_id
@@ -646,7 +686,7 @@ msgstr "Interessent"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
 msgid "Lead -"
-msgstr ""
+msgstr "Lead -"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_graph
@@ -667,7 +707,7 @@ msgstr "Standort des Interessenten"
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_link
 msgid "Lead Single Links"
-msgstr ""
+msgstr "Lead einfache Links"
 
 #. module: website_crm_partner_assign
 #: model:ir.model,name:website_crm_partner_assign.model_crm_lead
@@ -790,7 +830,7 @@ msgstr "Nächste Partnerbewertung"
 #. module: website_crm_partner_assign
 #: model:crm.lead.tag,name:website_crm_partner_assign.tag_portal_lead_partner_unavailable
 msgid "No more partner available"
-msgstr ""
+msgstr "Kein Partner verfügbar"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.index
@@ -820,7 +860,7 @@ msgstr "Eröffnungsdatum"
 #. module: website_crm_partner_assign
 #: model:ir.ui.menu,name:website_crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment"
-msgstr ""
+msgstr "Opp. Aufgbe"
 
 #. module: website_crm_partner_assign
 #: model:ir.actions.act_window,name:website_crm_partner_assign.action_report_crm_opportunity_assign
@@ -840,7 +880,7 @@ msgstr "Chance"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Opportunity -"
-msgstr ""
+msgstr "Opportunity -"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.partner
@@ -909,7 +949,7 @@ msgstr "Partnerzuteilungs-Analyse"
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_declined_ids
 msgid "Partner not interested"
-msgstr ""
+msgstr "Partner nicht interessiert"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_partner_assigned_id
@@ -952,7 +992,7 @@ msgstr "Geplanter Umsatz"
 #. module: website_crm_partner_assign
 #: model:res.partner.grade,name:website_crm_partner_assign.res_partner_grade_platinium
 msgid "Platinum"
-msgstr ""
+msgstr "Platin"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_priority
@@ -962,7 +1002,7 @@ msgstr "Priorität"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Priority:"
-msgstr ""
+msgstr "Priorität:"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:113
@@ -1059,7 +1099,7 @@ msgstr "Silber"
 #. module: website_crm_partner_assign
 #: model:crm.lead.tag,name:website_crm_partner_assign.tag_portal_lead_is_spam
 msgid "Spam"
-msgstr ""
+msgstr "Spam"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:114
@@ -1071,7 +1111,7 @@ msgstr "Stufe"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "States..."
-msgstr ""
+msgstr "Status …"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
@@ -1098,12 +1138,12 @@ msgstr "Die Weiterleitungs-Email-Vorlage ist nicht in der Datenbank"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
 msgid "There are no leads."
-msgstr ""
+msgstr "Es gibt keine Leads."
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "There are no opportunities."
-msgstr ""
+msgstr "Es gibt keine Opportunities."
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:102
@@ -1114,7 +1154,7 @@ msgstr "Aktivitäten dieser Woche"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
 msgid "This lead is a spam"
-msgstr ""
+msgstr "Dieser Lead ist Spam."
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
@@ -1184,7 +1224,7 @@ msgstr "Weltkarte"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "YYYY-MM-DD"
-msgstr ""
+msgstr "JJJJ-MM-TT"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
diff --git a/addons/website_crm_partner_assign/i18n/es.po b/addons/website_crm_partner_assign/i18n/es.po
index e6e16314c3c..657027da207 100644
--- a/addons/website_crm_partner_assign/i18n/es.po
+++ b/addons/website_crm_partner_assign/i18n/es.po
@@ -3,8 +3,8 @@
 # * website_crm_partner_assign
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Antonio Trueba, 2016
+# Martin Trigaux, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
@@ -23,13 +23,14 @@
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # maitaoriana <maitaoriana@gmail.com>, 2017
 # Gelo Joga Landoo <gj@landoo.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Gelo Joga Landoo <gj@landoo.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -71,6 +72,8 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"<p/><p/><ol><li><a href=\"${lead.lead_link}\"/></li><br/></ol><p><a "
+"href=\"${object.get_portal_url()}\"/></p><p/><p/><p/>"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_nbr_cases
@@ -199,7 +202,7 @@ msgstr "Todos los países"
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:262
 #, python-format
 msgid "All fields are required !"
-msgstr ""
+msgstr "¡Todos los campos son obligatorios!"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_date_assign
@@ -321,7 +324,7 @@ msgstr "Contactar con un distribuidor"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "Contact name"
-msgstr ""
+msgstr "Nombre del contacto"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_body
@@ -356,7 +359,7 @@ msgstr "Creado por"
 #. module: website_crm_partner_assign
 #: model:crm.lead.tag,name:website_crm_partner_assign.tag_portal_lead_own_opp
 msgid "Created by Partner"
-msgstr ""
+msgstr "Creado por socio"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_create_date
@@ -472,7 +475,7 @@ msgstr "Cierre previsto"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Expected Closing:"
-msgstr ""
+msgstr "Cierre previsto:"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:112
@@ -569,13 +572,13 @@ msgstr "Alta"
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:201
 #, python-format
 msgid "I am not interested by this lead. I contacted the lead."
-msgstr ""
+msgstr "No me interesa esta iniciativa. He contactado con la iniciativa."
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:203
 #, python-format
 msgid "I am not interested by this lead. I have not contacted the lead."
-msgstr ""
+msgstr "No me interesa esta iniciativa. No he contactado con la iniciativa."
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_id
@@ -597,7 +600,7 @@ msgstr "Referencia de implementación"
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_count
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_implemented_count
 msgid "Implemented Count"
-msgstr ""
+msgstr "Recuento implementado"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_assigned_partner_id
@@ -678,7 +681,7 @@ msgstr "Ubicación de la iniciativa"
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_link
 msgid "Lead Single Links"
-msgstr ""
+msgstr "Enlaces unitarios de iniciativas"
 
 #. module: website_crm_partner_assign
 #: model:ir.model,name:website_crm_partner_assign.model_crm_lead
@@ -963,7 +966,7 @@ msgstr "Ingreso previsto"
 #. module: website_crm_partner_assign
 #: model:res.partner.grade,name:website_crm_partner_assign.res_partner_grade_platinium
 msgid "Platinum"
-msgstr ""
+msgstr "Platino"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_priority
@@ -1082,7 +1085,7 @@ msgstr "Etapa"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "States..."
-msgstr ""
+msgstr "Estados..."
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
diff --git a/addons/website_crm_partner_assign/i18n/fr.po b/addons/website_crm_partner_assign/i18n/fr.po
index d21e522c9dc..b02ad58c2cb 100644
--- a/addons/website_crm_partner_assign/i18n/fr.po
+++ b/addons/website_crm_partner_assign/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Loic <loic.richard2@gmail.com>, 2016
@@ -19,7 +19,7 @@
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Simona Busalacchi <simobusalacchi.sb@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
@@ -27,13 +27,14 @@
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Lucas Deliege <lud@openerp.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -75,6 +76,30 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\\<p>nBonjour,</p>\n"
+"\n"
+"\\<p>nNous avons été contactés par ces prospects de votre région. Ainsi, les leads suivants ont été attribués à ${ctx['partner_id'].name}:</p>\n"
+"\n"
+"<ol>\n"
+"% for lead in ctx['partner_leads']:\n"
+" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''}</li> <br/>\n"
+"% endfor\n"
+"\n"
+"</ol>\n"
+"% if ctx.get('partner_in_portal'):\\<p>nConnectez-vous à votre <a href=\"${object.get_portal_url()}\">Portail Partenaires</a> pour plus d'informations. Pour chaque lead, vous trouverez deux boutons en haut à gauche sur lesquels il vous faut appuyer après avoir contacté le lead : « Je suis intéressé » et « Je ne suis pas intéressé ».</p><p>\n"
+"% else:\n"
+"\n"
+" Vous ne pouvez pas encore accéder à notre base de données via le portail. Contactez \n"
+" ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.</p>\\<p>n\n"
+"% endif\n"
+"Le lead sera transféré à un autre partenaire si vous ne le contactez pas sous 20 jours.</p>\n"
+"\\<p>nMerci,</p>\n"
+"\n"
+"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
+"\n"
+"% if not ctx['partner_id'].user_id:\n"
+"P. S : Il semble que vous n'ayez pas de gestionnaire de compte attribué. Contactez-nous.\n"
+"% endif\n"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_nbr_cases
@@ -138,6 +163,9 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_desinterested\" "
+"style=\"display:none;\">Vous devez effectuer la prochaine action et "
+"contacter le client avant d'accepter le lead</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
@@ -146,11 +174,14 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_interested\" "
+"style=\"display:none;\">Vous devez effectuer la prochaine action et "
+"contacter le client avant d'accepter le lead</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "<span>at </span>"
-msgstr ""
+msgstr "<span>à</span>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
@@ -367,7 +398,7 @@ msgstr "Créé le"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
 msgid "Current stage of the opp"
-msgstr ""
+msgstr "Statut actuel de l'opportunité"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_partner_id
@@ -470,7 +501,7 @@ msgstr "Date de fermeture prévue"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Expected Closing:"
-msgstr ""
+msgstr "Clôture estimée :"
 
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/controllers/main.py:112
@@ -595,7 +626,7 @@ msgstr "Références d'implémentations"
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_count
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users_implemented_count
 msgid "Implemented Count"
-msgstr ""
+msgstr "Nombre d'implémentations"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_assigned_partner_id
@@ -677,7 +708,7 @@ msgstr "Emplacement de la piste"
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_link
 msgid "Lead Single Links"
-msgstr ""
+msgstr "Liens uniques de leads"
 
 #. module: website_crm_partner_assign
 #: model:ir.model,name:website_crm_partner_assign.model_crm_lead
@@ -919,7 +950,7 @@ msgstr "Analyse du partenaire attribué"
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_declined_ids
 msgid "Partner not interested"
-msgstr ""
+msgstr "Partenaire pas intéressé"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_partner_assigned_id
@@ -962,7 +993,7 @@ msgstr "Chiffre d'affaires prévu"
 #. module: website_crm_partner_assign
 #: model:res.partner.grade,name:website_crm_partner_assign.res_partner_grade_platinium
 msgid "Platinum"
-msgstr ""
+msgstr "Platine"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_priority
@@ -1081,7 +1112,7 @@ msgstr "Étape"
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "States..."
-msgstr ""
+msgstr "Indique…"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
diff --git a/addons/website_crm_partner_assign/i18n/zh_CN.po b/addons/website_crm_partner_assign/i18n/zh_CN.po
index 957aee5b7ae..ac0a0e0a5e6 100644
--- a/addons/website_crm_partner_assign/i18n/zh_CN.po
+++ b/addons/website_crm_partner_assign/i18n/zh_CN.po
@@ -3,14 +3,14 @@
 # * website_crm_partner_assign
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Eddie Lim <bhweelim@yahoo.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Talway <9010446@qq.com>, 2016
 # liulixia <liu.lixia@elico-corp.com>, 2016
 # Michael Chong <michaelchong2005@gmail.com>, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # xiaobin wu <bd5dml@gmail.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
 # 钟小华 <mackz@sina.com>, 2016
@@ -18,13 +18,14 @@
 # waveyeung <waveyeung@qq.com>, 2016
 # mrshelly <mrshelly@hotmail.com>, 2016
 # 木头 <mynameisshiy@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: 木头 <mynameisshiy@gmail.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -66,6 +67,8 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"<p/><p/><ol><li><a href=\"${lead.lead_link}\"/></li><br/></ol><p><a "
+"href=\"${object.get_portal_url()}\"/></p><p/><p/><p/>"
 
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_nbr_cases
@@ -129,6 +132,8 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_desinterested\" "
+"style=\"display:none;\"/>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
@@ -137,6 +142,8 @@ msgid ""
 "style=\"display:none;\">You need to fill up the next action and contact the "
 "customer before accepting the lead</span>"
 msgstr ""
+"<span class=\"text-danger error_partner_assign_interested\" "
+"style=\"display:none;\"/>"
 
 #. module: website_crm_partner_assign
 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
diff --git a/addons/website_crm_phone_validation/controllers/website_form.py b/addons/website_crm_phone_validation/controllers/website_form.py
index 3713fe86f9e..c404bb87724 100644
--- a/addons/website_crm_phone_validation/controllers/website_form.py
+++ b/addons/website_crm_phone_validation/controllers/website_form.py
@@ -4,8 +4,6 @@
 from odoo.addons.website_form.controllers.main import WebsiteForm
 from odoo.http import request, route
 
-import json
-
 
 class WebsiteForm(WebsiteForm):
 
@@ -32,17 +30,13 @@ class WebsiteForm(WebsiteForm):
         else:
             record = data.get('record', {})
             phone_fields = self._get_phone_fields_to_validate()
-            country = self._get_country()
-            invalid_fields = {}
+            country = request.env['res.country'].browse(record.get('country_id'))
+            contact_country = country.exists() and country or self._get_country()
             for phone_field in phone_fields:
                 if not record.get(phone_field):
                     continue
                 number = record[phone_field]
-                try:
-                    request.env[model_name].phone_format(number, country)
-                except Exception as error:
-                    invalid_fields[phone_field] = error.args[0]
-            if invalid_fields:
-                return json.dumps({'error_fields': invalid_fields})
+                fmt_number = request.env[model_name].phone_format(number, contact_country)
+                request.params.update({phone_field: fmt_number})
 
         return super(WebsiteForm, self).website_form(model_name, **kwargs)
diff --git a/addons/website_customer/i18n/de.po b/addons/website_customer/i18n/de.po
index 85f3e8a144a..d8ea7afeedd 100644
--- a/addons/website_customer/i18n/de.po
+++ b/addons/website_customer/i18n/de.po
@@ -4,22 +4,23 @@
 # 
 # Translators:
 # Martin K <martinkuenz@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Alle Länder"
 #: code:addons/website_customer/controllers/main.py:61
 #, python-format
 msgid "All Sectors of Activity"
-msgstr ""
+msgstr "Alle Tätigkeitsbereiche"
 
 #. module: website_customer
 #: model:ir.model.fields,help:website_customer.field_res_partner_tag_classname
@@ -120,6 +121,8 @@ msgid ""
 "Manage the partner tags to better classify them on your website.\n"
 "                    You can add the filter by tag on your website in the \"Customize\" menu."
 msgstr ""
+"Verwalten Sie die Partner-Tags, um sie besser auf Ihrer Website zu klassifizieren.\n"
+" Sie können den Filter auf Ihrer Website im Menü „Anpassen“ per Tag hinzufügen."
 
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.index
@@ -144,6 +147,8 @@ msgid ""
 "Partner Tags - These tags can be used on website to find customers by "
 "sector, or ... "
 msgstr ""
+"Partner-Tags: Diese Tags können auf der Website verwendet werden, um Kunden "
+"nach Sektor zu finden oder …"
 
 #. module: website_customer
 #: model:ir.model.fields,field_description:website_customer.field_res_partner_tag_partner_ids
@@ -163,7 +168,7 @@ msgstr "Referenzen nach Ländern"
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.opt_industry_list
 msgid "References by Sectors of Activity"
-msgstr ""
+msgstr "Verweise nach Tätigkeitsbereichen"
 
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.opt_tag_list
@@ -191,13 +196,13 @@ msgstr "Sichtbar in Website"
 #: model:ir.ui.view,arch_db:website_customer.view_partner_tag_list
 #: model:ir.ui.view,arch_db:website_customer.view_partners_form_website
 msgid "Website Tags"
-msgstr ""
+msgstr "Website-Tags"
 
 #. module: website_customer
 #: model:ir.model.fields,field_description:website_customer.field_res_partner_website_tag_ids
 #: model:ir.model.fields,field_description:website_customer.field_res_users_website_tag_ids
 msgid "Website tags"
-msgstr ""
+msgstr "Website-Tags"
 
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.opt_country
diff --git a/addons/website_customer/i18n/fr.po b/addons/website_customer/i18n/fr.po
index 1802a91e9c4..d14fe0ad315 100644
--- a/addons/website_customer/i18n/fr.po
+++ b/addons/website_customer/i18n/fr.po
@@ -4,23 +4,24 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # leemannd <denis.leemann@camptocamp.com>, 2017
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -48,7 +49,7 @@ msgstr "Tous les pays"
 #: code:addons/website_customer/controllers/main.py:61
 #, python-format
 msgid "All Sectors of Activity"
-msgstr ""
+msgstr "Tous les secteurs d'activité"
 
 #. module: website_customer
 #: model:ir.model.fields,help:website_customer.field_res_partner_tag_classname
@@ -168,7 +169,7 @@ msgstr "Références par pays"
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.opt_industry_list
 msgid "References by Sectors of Activity"
-msgstr ""
+msgstr "Références par secteurs d'activité"
 
 #. module: website_customer
 #: model:ir.ui.view,arch_db:website_customer.opt_tag_list
diff --git a/addons/website_event/i18n/de.po b/addons/website_event/i18n/de.po
index c1b6177dfe0..661bab8ec26 100644
--- a/addons/website_event/i18n/de.po
+++ b/addons/website_event/i18n/de.po
@@ -3,23 +3,24 @@
 # * website_event
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: David Vidal <david.vidal@trespinos.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,22 +36,22 @@ msgstr "(Frei)"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>End of Registration</b>"
-msgstr ""
+msgstr "<b>Anmeldefrist</b>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Price</b>"
-msgstr ""
+msgstr "<b>Preis</b>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Quantity</b>"
-msgstr ""
+msgstr "<b>Menge</b>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Ticket Type</b>"
-msgstr ""
+msgstr "<b>Tickettyp</b>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.country_events_list
@@ -77,6 +78,8 @@ msgid ""
 "<i class=\"fa fa-plus-circle\"/>\n"
 "                    <em>Configure and Launch Event Registration</em>"
 msgstr ""
+"<i class=\"fa fa-plus-circle\"/>\n"
+" <em>Veranstaltungsanmeldung konfigurieren und veröffentlichen</em>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.index
@@ -101,11 +104,14 @@ msgid ""
 "                        Sold Out\n"
 "                    </span>"
 msgstr ""
+"<span content=\"http://schema.org/SoldOut\" itemprop=\"availability\">\n"
+" Ausverkauf\n"
+"</span>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<span itemprop=\"name\">Event Registration</span>"
-msgstr ""
+msgstr "<span itemprop=\"name\">Veranstaltungsanmeldung</span>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
@@ -114,6 +120,9 @@ msgid ""
 "                        Free\n"
 "                    </span>"
 msgstr ""
+"<span content=\"0\" itemprop=\"price\">\n"
+" Kostenfrei\n"
+"</span>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_location
@@ -153,7 +162,7 @@ msgstr "<strong>Telefon</strong> <span class=\"text-muted\">(Optional)</span>"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.ticket
 msgid "<strong>Ticket Type:</strong>"
-msgstr ""
+msgstr "<strong>Tickettyp:</strong>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
@@ -180,7 +189,7 @@ msgstr "Alle Veranstaltungen"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.res_config_settings_view_form
 msgid "Ask questions to attendees when registering online"
-msgstr ""
+msgstr "Teilnehmern bei der Online-Anmeldung Fragen stellen"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_attendee_details
@@ -198,6 +207,8 @@ msgid ""
 "Check this option to have menus for your event on the\n"
 "                                website: registrations, schedule, map, ..."
 msgstr ""
+"Aktivieren Sie diese Option, wenn Sie für Ihre Veranstaltung auf der Website\n"
+" Menüs wünschen: Anmeldungen, Zeitplan, Karte, …"
 
 #. module: website_event
 #. openerp-web
@@ -249,6 +260,8 @@ msgid ""
 "Creates menus Introduction, Location and Register on the page  of the event "
 "on the website."
 msgstr ""
+"Erstellt auf der Veranstaltungsseite der Website die Menüs Einführung, "
+"Standort und Anmelden."
 
 #. module: website_event
 #: model:ir.model.fields,field_description:website_event.field_event_event_website_menu
@@ -258,7 +271,7 @@ msgstr "Dediziertes Menü"
 #. module: website_event
 #: model:ir.model.fields,field_description:website_event.field_event_type_website_menu
 msgid "Display a dedicated menu on Website"
-msgstr ""
+msgstr "Ein spezielles Menü auf der Website anzeigen"
 
 #. module: website_event
 #. openerp-web
@@ -275,7 +288,7 @@ msgstr "E-Mail"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_event_view_form_inherit_website
 msgid "Edit Badges"
-msgstr ""
+msgstr "Abzeichen bearbeiten"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.ticket
@@ -326,12 +339,12 @@ msgstr "Veranstaltung veröffentlicht"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "Event registration is closed."
-msgstr ""
+msgstr "Veranstaltungsanmeldung ist geschlossen."
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "Event registration not yet started."
-msgstr ""
+msgstr "Veranstaltungsanmeldung hat noch nicht begonnen."
 
 #. module: website_event
 #: model:mail.message.subtype,description:website_event.mt_event_unpublished
@@ -379,7 +392,7 @@ msgstr "Überblick"
 #. module: website_event
 #: model:ir.model.fields,field_description:website_event.field_event_event_is_participating
 msgid "Is Participating"
-msgstr ""
+msgstr "nimmt teil"
 
 #. module: website_event
 #: code:addons/website_event/models/event.py:54
@@ -519,7 +532,7 @@ msgstr "Anmelden"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
 msgid "Registration for this event is now closed"
-msgstr ""
+msgstr "Die Anmeldung für diese Veranstaltung ist geschlossen."
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.404
@@ -574,6 +587,7 @@ msgstr "Heute"
 #: model:ir.ui.view,arch_db:website_event.index
 msgid "Use the top menu <i>'Content'</i> to create your first event."
 msgstr ""
+"Erstellen Sie mit dem Topmenü <i>„Inhalte“</i> Ihre erste Veranstaltung."
 
 #. module: website_event
 #: model:ir.model.fields,field_description:website_event.field_event_event_website_published
@@ -583,12 +597,14 @@ msgstr "Sichtbar in Website"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
 msgid "Visualize on Google Maps"
-msgstr ""
+msgstr "Auf Google Maps visualisieren"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_complete
 msgid "We are glad to confirm your registration to our event"
 msgstr ""
+"Wir freuen uns, Ihre Anmeldung bei unserer Veranstaltung bestätigen zu "
+"können."
 
 #. module: website_event
 #: model:ir.actions.act_url,name:website_event.action_open_website
@@ -624,7 +640,7 @@ msgstr ""
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_complete
 msgid "Your registration"
-msgstr ""
+msgstr "Ihre Anmeldung"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_details
@@ -634,4 +650,4 @@ msgstr "bis"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.index
 msgid "unpublished"
-msgstr ""
+msgstr "unveröffentlicht"
diff --git a/addons/website_event/i18n/es.po b/addons/website_event/i18n/es.po
index c085889466c..938a21cb5df 100644
--- a/addons/website_event/i18n/es.po
+++ b/addons/website_event/i18n/es.po
@@ -3,25 +3,26 @@
 # * website_event
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # RGB Consulting <odoo@rgbconsulting.com>, 2016
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -37,22 +38,22 @@ msgstr "(Gratis)"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>End of Registration</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Price</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Quantity</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Ticket Type</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.country_events_list
@@ -78,7 +79,7 @@ msgstr "<i class=\"fa fa-clock-o\"/> De"
 msgid ""
 "<i class=\"fa fa-plus-circle\"/>\n"
 "                    <em>Configure and Launch Event Registration</em>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/><em/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.index
@@ -102,12 +103,12 @@ msgid ""
 "<span itemprop=\"availability\" content=\"http://schema.org/SoldOut\">\n"
 "                        Sold Out\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"http://schema.org/SoldOut\" itemprop=\"availability\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<span itemprop=\"name\">Event Registration</span>"
-msgstr ""
+msgstr "<span itemprop=\"name\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
@@ -115,7 +116,7 @@ msgid ""
 "<span itemprop=\"price\" content=\"0\">\n"
 "                        Free\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"0\" itemprop=\"price\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_location
@@ -155,7 +156,7 @@ msgstr "<strong>Teléfono</strong> <span class=\"text-muted\">(Opcional)</span>"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.ticket
 msgid "<strong>Ticket Type:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
@@ -200,6 +201,8 @@ msgid ""
 "Check this option to have menus for your event on the\n"
 "                                website: registrations, schedule, map, ..."
 msgstr ""
+"Marque esta opción para disponer de menús para su evento\n"
+" en el sitio web: registros, programa, mapa..."
 
 #. module: website_event
 #. openerp-web
@@ -262,7 +265,7 @@ msgstr "Menú dedicado"
 #. module: website_event
 #: model:ir.model.fields,field_description:website_event.field_event_type_website_menu
 msgid "Display a dedicated menu on Website"
-msgstr ""
+msgstr "Mostrar un menú dedicado en el sitio web"
 
 #. module: website_event
 #. openerp-web
diff --git a/addons/website_event/i18n/fr.po b/addons/website_event/i18n/fr.po
index 4095ff41d70..a97f5831097 100644
--- a/addons/website_event/i18n/fr.po
+++ b/addons/website_event/i18n/fr.po
@@ -6,15 +6,16 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
 # Frédéric LIETART <stuff@tifred.fr>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -30,22 +31,22 @@ msgstr "(Gratuit)"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>End of Registration</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Price</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Quantity</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Ticket Type</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.country_events_list
@@ -69,7 +70,7 @@ msgstr "<i class=\"fa fa-clock-o\"/> De"
 msgid ""
 "<i class=\"fa fa-plus-circle\"/>\n"
 "                    <em>Configure and Launch Event Registration</em>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/><em/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.index
@@ -93,12 +94,12 @@ msgid ""
 "<span itemprop=\"availability\" content=\"http://schema.org/SoldOut\">\n"
 "                        Sold Out\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"http://schema.org/SoldOut\" itemprop=\"availability\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<span itemprop=\"name\">Event Registration</span>"
-msgstr ""
+msgstr "<span itemprop=\"name\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
@@ -106,7 +107,7 @@ msgid ""
 "<span itemprop=\"price\" content=\"0\">\n"
 "                        Free\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"0\" itemprop=\"price\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_location
@@ -146,7 +147,7 @@ msgstr "<strong>Téléphone</strong> <span class=\"text-muted\">(Optionnel)</spa
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.ticket
 msgid "<strong>Ticket Type:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
diff --git a/addons/website_event/i18n/zh_CN.po b/addons/website_event/i18n/zh_CN.po
index aaafa891449..90fd1354a26 100644
--- a/addons/website_event/i18n/zh_CN.po
+++ b/addons/website_event/i18n/zh_CN.po
@@ -5,8 +5,8 @@
 # Translators:
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# fausthuang, 2016
+# Martin Trigaux, 2016
 # liulixia <liu.lixia@elico-corp.com>, 2016
 # Eddie Lim <bhweelim@yahoo.com>, 2016
 # SHOM <shanmuxin@yeah.net>, 2016
@@ -16,13 +16,14 @@
 # Ma XiaoXiao <junmaing@gmail.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: 苏州远鼎 <tiexinliu@126.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,22 +39,22 @@ msgstr "(免费)"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>End of Registration</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Price</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Quantity</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<b>Ticket Type</b>"
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.country_events_list
@@ -77,7 +78,7 @@ msgstr "<i class=\"fa fa-clock-o\"/> 来自"
 msgid ""
 "<i class=\"fa fa-plus-circle\"/>\n"
 "                    <em>Configure and Launch Event Registration</em>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/><em/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.index
@@ -101,12 +102,12 @@ msgid ""
 "<span itemprop=\"availability\" content=\"http://schema.org/SoldOut\">\n"
 "                        Sold Out\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"http://schema.org/SoldOut\" itemprop=\"availability\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
 msgid "<span itemprop=\"name\">Event Registration</span>"
-msgstr ""
+msgstr "<span itemprop=\"name\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_template
@@ -114,7 +115,7 @@ msgid ""
 "<span itemprop=\"price\" content=\"0\">\n"
 "                        Free\n"
 "                    </span>"
-msgstr ""
+msgstr "<span content=\"0\" itemprop=\"price\"/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_location
@@ -154,7 +155,7 @@ msgstr "<strong>电话</strong> <span class=\"text-muted\">(可选)</span>"
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.ticket
 msgid "<strong>Ticket Type:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.event_description_full
@@ -240,7 +241,7 @@ msgstr "继续"
 msgid ""
 "Create a name for your new event and click <em>\"Continue\"</em>. e.g: "
 "Technical Training"
-msgstr ""
+msgstr "<em/>"
 
 #. module: website_event
 #: model:ir.model.fields,help:website_event.field_event_event_website_menu
diff --git a/addons/website_event_questions/i18n/de.po b/addons/website_event_questions/i18n/de.po
index cf1665599f7..9806ea16b19 100644
--- a/addons/website_event_questions/i18n/de.po
+++ b/addons/website_event_questions/i18n/de.po
@@ -3,21 +3,22 @@
 # * website_event_questions
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: AppleMentalist <felix.schnatbaum@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr ""
 #. module: website_event_questions
 #: model:ir.ui.view,arch_db:website_event_questions.registration_attendee_details_questions
 msgid "<strong>Questions</strong>"
-msgstr ""
+msgstr "<strong>Fragestellungen</strong>"
 
 #. module: website_event_questions
 #: model:event.question,title:website_event_questions.event_question_2
@@ -97,7 +98,7 @@ msgstr "Event"
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_registration_answer_event_answer_id
 msgid "Event Answer"
-msgstr ""
+msgstr "Veranstaltungsantwort"
 
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_type
@@ -143,16 +144,19 @@ msgid ""
 "If True, this question will be asked for every attendee of a reservation. If"
 " not it will be asked only once and its value propagated to every attendees."
 msgstr ""
+"Falls „True“, wird diese Frage allen Teilnehmern einer Reservierung "
+"gestellt. Wenn nicht, wird es nur einmal gefragt und dessen Wert allen "
+"Teilnehmern zugewiesen."
 
 #. module: website_event_questions
 #: model:event.answer,name:website_event_questions.event_suggestion_2_1
 msgid "In Charge"
-msgstr ""
+msgstr "Verantwortlich"
 
 #. module: website_event_questions
 #: model:event.question,title:website_event_questions.event_question_0
 msgid "Kind of partner"
-msgstr ""
+msgstr "Art der Partner"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_answer___last_update
@@ -184,7 +188,7 @@ msgstr "Nein"
 #. module: website_event_questions
 #: model:event.answer,name:website_event_questions.event_suggestion_2_0
 msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_answer_question_id
@@ -200,6 +204,8 @@ msgstr "Frage"
 #, python-format
 msgid "Question should belong to either event category or event but not both"
 msgstr ""
+"Die Frage sollte entweder zur Veranstaltungskategorie oder zur Veranstaltung"
+" gehören, nicht jedoch zu beiden."
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_event_question_ids
@@ -215,12 +221,12 @@ msgstr "Fragestellungen"
 #: model:ir.ui.view,arch_db:website_event_questions.view_event_question_report_pivot
 #: model:ir.ui.view,arch_db:website_event_questions.view_event_question_report_search
 msgid "Questions Analysis"
-msgstr ""
+msgstr "Analyse der Fragen"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_type_use_questions
 msgid "Questions to Attendees"
-msgstr ""
+msgstr "Fragen an Teilnehmer"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_question_report_attendee_id
@@ -242,7 +248,7 @@ msgstr "Silber"
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_event_specific_question_ids
 msgid "Specific Questions"
-msgstr ""
+msgstr "Spezifische Fragen"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_question_title
@@ -252,7 +258,7 @@ msgstr "Titel"
 #. module: website_event_questions
 #: model:event.question,title:website_event_questions.event_question_1
 msgid "Veggie"
-msgstr ""
+msgstr "Vegetarisch"
 
 #. module: website_event_questions
 #: model:event.answer,name:website_event_questions.event_suggestion_1_0
@@ -262,19 +268,19 @@ msgstr "Ja."
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_answer
 msgid "event.answer"
-msgstr ""
+msgstr "event.answer"
 
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_question
 msgid "event.question"
-msgstr ""
+msgstr "event.question"
 
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_question_report
 msgid "event.question.report"
-msgstr ""
+msgstr "event.question.report"
 
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_registration_answer
 msgid "event.registration.answer"
-msgstr ""
+msgstr "event.registration.answer"
diff --git a/addons/website_event_questions/i18n/es.po b/addons/website_event_questions/i18n/es.po
index 4e934037b97..71dd6b1ab2a 100644
--- a/addons/website_event_questions/i18n/es.po
+++ b/addons/website_event_questions/i18n/es.po
@@ -3,7 +3,7 @@
 # * website_event_questions
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
@@ -14,15 +14,16 @@
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2018
+# Antonio Trueba, 2017
+# Gustavo Valverde, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -102,7 +103,7 @@ msgstr "Evento"
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_registration_answer_event_answer_id
 msgid "Event Answer"
-msgstr ""
+msgstr "Respuesta del evento"
 
 #. module: website_event_questions
 #: model:ir.model,name:website_event_questions.model_event_type
@@ -208,6 +209,8 @@ msgstr "Pregunta"
 #, python-format
 msgid "Question should belong to either event category or event but not both"
 msgstr ""
+"La pregunta debe pertenecer a la categoría del evento o al evento en sí, no "
+"a ambos"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_event_question_ids
@@ -228,7 +231,7 @@ msgstr "Análisis del cuestionario"
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_type_use_questions
 msgid "Questions to Attendees"
-msgstr ""
+msgstr "Preguntas a asistentes"
 
 #. module: website_event_questions
 #: model:ir.model.fields,field_description:website_event_questions.field_event_question_report_attendee_id
diff --git a/addons/website_event_questions/i18n/fr.po b/addons/website_event_questions/i18n/fr.po
index 7c4d0231b2d..44967525c90 100644
--- a/addons/website_event_questions/i18n/fr.po
+++ b/addons/website_event_questions/i18n/fr.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
 # Clo <clo@odoo.com>, 2017
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -26,7 +27,7 @@ msgstr ""
 #. module: website_event_questions
 #: model:ir.ui.view,arch_db:website_event_questions.registration_attendee_details_questions
 msgid "<strong>Questions</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_event_questions
 #: model:event.question,title:website_event_questions.event_question_2
diff --git a/addons/website_event_track/i18n/de.po b/addons/website_event_track/i18n/de.po
index b4b20d0a0b2..652827cf1c0 100644
--- a/addons/website_event_track/i18n/de.po
+++ b/addons/website_event_track/i18n/de.po
@@ -3,15 +3,15 @@
 # * website_event_track
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
+# Renzo Meister, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
@@ -20,14 +20,15 @@
 # Katharina Moritz <kmo@e2f.com>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,6 +57,22 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?>\n"
+"\n"
+" \n"
+" Sehr geehrte/r \n"
+" \n"
+" Wir freuen uns, Ihnen mitteilen zu können, dass Ihr Vorschlag ${object.name} für die Veranstaltung ${object.event_id.name} akzeptiert und bestätigt wurde.\n"
+"\n"
+" Weitere Informationen finden Sie hier:\n"
+" \n"
+" \n"
+" Veranstaltung anzeigen\n"
+" \n"
+" \n"
+" Herzlich,\n"
+"\n"
+"<div><p><t t-esc=\"object.partner_name\"/></p><p></p><p><div style=\"margin-top: 16px;\"><a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\"></a></div></p><p></p></div>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -65,27 +82,27 @@ msgstr "<b>Datum</b><br/>"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Mail</b>:"
-msgstr ""
+msgstr "<b>E-Mail</b>:"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Phone</b>:"
-msgstr ""
+msgstr "<b>Telefon:</b>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Proposed By</b>:"
-msgstr ""
+msgstr "<b>Vorgeschlagen von:</b>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Speakers Biography</b>:"
-msgstr ""
+msgstr "<b>Biographie der Vortragenden:</b>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Talk Introduction</b>:"
-msgstr ""
+msgstr "<b>Einleitung zum Vortrag:</b>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -130,6 +147,8 @@ msgid ""
 "<strong>Regular Talks</strong>. These are standard talks with slides,\n"
 "                                    alocated in slots of 60 minutes."
 msgstr ""
+"<strong>Regelmäßige Vorträge:</strong> Dies sind übliche Vorträge mit Präsentationen,\n"
+" mit einem zeitlichen Umfang von 60 Minuten."
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track7
@@ -147,6 +166,10 @@ msgid ""
 " * Red indicates something is preventing the progress of this track\n"
 " * Green indicates the track is ready to be pulled to the next stage"
 msgstr ""
+"Der Kanbanstatus eines Tracks zeigt spezielle Situationen an, die ihn betreffen:\n"
+" * Grau zeigt eine Standardsituation an.\n"
+" * Rot zeigt an, das etwas den Fortschritt dieses Tracks blockiert.\n"
+" * Grün zeigt an, dass der Track bereit ist, in die nächste Stufe überführt zu werden."
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -156,7 +179,7 @@ msgstr "Über den Autor"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_done
 msgid "Accepted Stage"
-msgstr ""
+msgstr "Akzeptierte Stufe"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_active
@@ -214,7 +237,7 @@ msgstr "Archiviert"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_allowed_track_tag_ids
 msgid "Available Track Tags"
-msgstr ""
+msgstr "Verfügbare Track-Tags"
 
 #. module: website_event_track
 #: model:event.sponsor.type,name:website_event_track.event_sponsor_type1
@@ -229,7 +252,7 @@ msgstr "Aufruf zu Vorträgen"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_cancel
 msgid "Canceled Stage"
-msgstr ""
+msgstr "Abgebrochene Stufe"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage5
@@ -245,7 +268,7 @@ msgstr "Klicken Sie, für eine neue Stufe in der Aufgaben Pipeline."
 #: model:ir.actions.act_window,help:website_event_track.action_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event
 msgid "Click to add a track."
-msgstr ""
+msgstr "Klicken Sie, um einen Track hinzuzufügen."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_color
@@ -261,7 +284,7 @@ msgstr "Konferenz"
 #. module: website_event_track
 #: model:mail.template,subject:website_event_track.mail_template_data_track_confirmation
 msgid "Confirmation of ${object.name}"
-msgstr ""
+msgstr "Bestätigung von ${object.name}"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage1
@@ -301,6 +324,10 @@ msgid ""
 "    You will use these stages in order to track the progress in\n"
 "    solving an event track."
 msgstr ""
+"Legen Sie die Schritte fest, die bei der Veranstaltung von\n"
+" Erstellung des Tracks bis zu dessen Beendigung verwendet werden.\n"
+" Mithilfe dieser Stufen können Sie den Fortschritt beim\n"
+" Lösen eines Veranstaltungstracks verfolgen."
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
@@ -383,7 +410,7 @@ msgstr "Veranstaltungsorte"
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor
 msgid "Event Sponsor"
-msgstr ""
+msgstr "Veranstaltungssponsor"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor_type
@@ -399,7 +426,7 @@ msgstr "Sponsorentypen"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_sponsor_search
 msgid "Event Sponsors"
-msgstr ""
+msgstr "Veranstaltungssponsoren"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track
@@ -440,6 +467,8 @@ msgid ""
 "Find out what people see and say about this event,\n"
 "                        and join the conversation."
 msgstr ""
+"Finden Sie heraus, was andere über diese Veranstaltung berichten\n"
+" und schließen Sie sich der Unterhaltung an."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_fold
@@ -464,7 +493,7 @@ msgstr "Grün"
 #. module: website_event_track
 #: selection:event.track,kanban_state:0
 msgid "Grey"
-msgstr ""
+msgstr "Grau"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
@@ -503,6 +532,8 @@ msgstr "Wie können automatische Tests der Website erstellt werden ?"
 #: model:event.track,name:website_event_track.event_track3
 msgid "How to develop real time apps, the website live chat module explained."
 msgstr ""
+"Wie können Module in Echtzeit entwickelt werden, am Beispiel der Live-Chat-"
+"Anwendung auf der Website?"
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track2
@@ -536,6 +567,8 @@ msgid ""
 "If set an email will be sent to the customer when the track reaches this "
 "step."
 msgstr ""
+"Wurde eine E-Mail-Adresse definiert, wird eine E-Mail an den Kunden gesandt,"
+" wenn der Track diesen Schritt erreicht."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_image
@@ -672,17 +705,17 @@ msgstr "Neue Paypal Module (Portal, Benutzung, Installation)"
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_event_track
 msgid "New Track"
-msgstr ""
+msgstr "Neuer Track"
 
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_event_track
 msgid "New Track Created"
-msgstr ""
+msgstr "Neuer Track erstellt"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "New track proposal"
-msgstr ""
+msgstr "Neuer Track-Vorschlag"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.tracks
@@ -737,12 +770,12 @@ msgstr "Die Vorschlagsannahme ist beendet!"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track_proposal
 msgid "Proposals on Website"
-msgstr ""
+msgstr "Vorschläge auf der Website"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
 msgid "Proposed by"
-msgstr ""
+msgstr "Vorgeschlagen von"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage3
@@ -832,17 +865,17 @@ msgstr "Referenten Biographie"
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email
 #, python-format
 msgid "Speaker Email"
-msgstr ""
+msgstr "E-Mail-Adresse des Vortragenden"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_name
 msgid "Speaker Name"
-msgstr ""
+msgstr "Name des Vortragenden"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_phone
 msgid "Speaker Phone"
-msgstr ""
+msgstr "Telefonnummer des Vortragenden"
 
 #. module: website_event_track
 #: code:addons/website_event_track/models/event_track.py:179
@@ -1013,7 +1046,7 @@ msgstr "Track"
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_blocked
 msgid "Track Blocked"
-msgstr ""
+msgstr "Track blockiert"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_date
@@ -1028,22 +1061,22 @@ msgstr "Track Beschreibung"
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_location
 msgid "Track Location"
-msgstr ""
+msgstr "Standort des Tracks"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Track Proposals on Website"
-msgstr ""
+msgstr "Track-Vorschläge auf der Website"
 
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_ready
 msgid "Track Ready"
-msgstr ""
+msgstr "Track bereit"
 
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_ready
 msgid "Track Ready for Next Stage"
-msgstr ""
+msgstr "Track für nächste Stufe bereit"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_stage
@@ -1058,12 +1091,12 @@ msgstr "Track Stufe"
 #: model:ir.ui.menu,name:website_event_track.event_track_stage_menu
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search
 msgid "Track Stages"
-msgstr ""
+msgstr "Track-Stufen"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_tag
 msgid "Track Tag"
-msgstr ""
+msgstr "Track-Tag"
 
 #. module: website_event_track
 #: model:ir.actions.act_window,name:website_event_track.action_event_track_tag
@@ -1075,7 +1108,7 @@ msgstr "Track Tags"
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_blocked
 msgid "Track blocked"
-msgstr ""
+msgstr "Track blockiert"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_track_count
@@ -1088,7 +1121,7 @@ msgstr "Tracks"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track_proposal
 msgid "Tracks Proposals on Website"
-msgstr ""
+msgstr "Track-Vorschläge auf der Website"
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event
@@ -1096,6 +1129,8 @@ msgid ""
 "Tracks define the schedule of your event. These can be a talk, a round "
 "table, a meeting, etc."
 msgstr ""
+"Tracks definieren den Zeitplan Ihrer Veranstaltung. Dies umfasst Vorträge, "
+"runde Tische, Meetings usw."
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track
@@ -1103,13 +1138,15 @@ msgid ""
 "Tracks define the schedule of your event. These can bea talk, a round table,"
 " a meeting, etc."
 msgstr ""
+"Tracks definieren den Zeitplan Ihrer Veranstaltung. Dies umfasst Vorträge, "
+"runde Tische, Meetings usw."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Tracks on Website"
-msgstr ""
+msgstr "Tracks auf der Website"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
@@ -1173,7 +1210,7 @@ msgstr "Ihre Telefonnummer"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_form
 msgid "e.g. Inspiring Business Talk"
-msgstr ""
+msgstr "z. B. inspirierender Business-Vortrag"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_form
@@ -1190,4 +1227,4 @@ msgstr "Vorträge"
 #: model:ir.ui.view,arch_db:website_event_track.agenda
 #: model:ir.ui.view,arch_db:website_event_track.tracks
 msgid "unpublished"
-msgstr ""
+msgstr "unveröffentlicht"
diff --git a/addons/website_event_track/i18n/es.po b/addons/website_event_track/i18n/es.po
index 6c46449e928..def3494c0d3 100644
--- a/addons/website_event_track/i18n/es.po
+++ b/addons/website_event_track/i18n/es.po
@@ -3,13 +3,13 @@
 # * website_event_track
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Sergio Hevia <sah@talleresbernesga.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
@@ -24,13 +24,14 @@
 # Fernando San Martín Woerner <fsnmartin@gmail.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: David Vidal <david.vidal@trespinos.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -59,6 +60,12 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?><div><p><t "
+"t-esc=\"object.partner_name\"/></p><p></p><p><div style=\"margin-top: "
+"16px;\"><a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px;"
+" font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-"
+"weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-"
+"radius:3px\"></a></div></p><p></p></div>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -153,6 +160,10 @@ msgid ""
 " * Red indicates something is preventing the progress of this track\n"
 " * Green indicates the track is ready to be pulled to the next stage"
 msgstr ""
+"Cuando un seguimiento se encuentra en estado \"Kanban\", significa que existen situaciones especiales que le están afectando\n"
+" * El gris es la situación por defecto\n"
+" *El rojo indica que hay algo que impide que el seguimiento prosiga\n"
+" *El verde indica que la tarea puede pasar a la siguiente etapa"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -162,7 +173,7 @@ msgstr "Sobre el autor"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_done
 msgid "Accepted Stage"
-msgstr ""
+msgstr "Etapa aceptada"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_active
@@ -234,7 +245,7 @@ msgstr "Convocatoria de propuestas"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_cancel
 msgid "Canceled Stage"
-msgstr ""
+msgstr "Etapa cancelada"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage5
@@ -266,7 +277,7 @@ msgstr "Conferencia"
 #. module: website_event_track
 #: model:mail.template,subject:website_event_track.mail_template_data_track_confirmation
 msgid "Confirmation of ${object.name}"
-msgstr ""
+msgstr "Confirmación de ${object.name}"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage1
@@ -306,6 +317,10 @@ msgid ""
 "    You will use these stages in order to track the progress in\n"
 "    solving an event track."
 msgstr ""
+"Defina los pasos que se utilizarán en el evento desde la\n"
+" creación del seguimiento hasta el cierre del mismo.\n"
+" Utilizará tales etapas para supervisar el progreso\n"
+" de la resolución de un seguimiento de evento."
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
@@ -390,7 +405,7 @@ msgstr "Localizaciones del evento"
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor
 msgid "Event Sponsor"
-msgstr ""
+msgstr "Patrocinador del evento"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor_type
@@ -473,7 +488,7 @@ msgstr "Verde"
 #. module: website_event_track
 #: selection:event.track,kanban_state:0
 msgid "Grey"
-msgstr ""
+msgstr "Gris"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
@@ -545,6 +560,8 @@ msgid ""
 "If set an email will be sent to the customer when the track reaches this "
 "step."
 msgstr ""
+"Si está fijado, se enviará un correo electrónico al cliente cuando el "
+"seguimiento alcance el susodicho paso."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_image
@@ -693,7 +710,7 @@ msgstr "Nuevo seguimiento creado"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "New track proposal"
-msgstr ""
+msgstr "Nueva propuesta de seguimiento"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.tracks
@@ -748,7 +765,7 @@ msgstr "Las propuestas están ya cerradas"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track_proposal
 msgid "Proposals on Website"
-msgstr ""
+msgstr "Propuestas en el sitio web"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -843,17 +860,17 @@ msgstr "Biografía del ponente"
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email
 #, python-format
 msgid "Speaker Email"
-msgstr ""
+msgstr "Correo electrónico del ponente"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_name
 msgid "Speaker Name"
-msgstr ""
+msgstr "Nombre del ponente"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_phone
 msgid "Speaker Phone"
-msgstr ""
+msgstr "Teléfono del ponente"
 
 #. module: website_event_track
 #: code:addons/website_event_track/models/event_track.py:179
@@ -1025,7 +1042,7 @@ msgstr "Sesión"
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_blocked
 msgid "Track Blocked"
-msgstr ""
+msgstr "Seguimiento bloqueado"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_date
@@ -1045,17 +1062,17 @@ msgstr "Seguir ubicación"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Track Proposals on Website"
-msgstr ""
+msgstr "Propuestas de seguimiento en el sitio web"
 
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_ready
 msgid "Track Ready"
-msgstr ""
+msgstr "Seguimisto listo"
 
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_ready
 msgid "Track Ready for Next Stage"
-msgstr ""
+msgstr "Seguimiento listo para la siguiente etapa"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_stage
@@ -1070,7 +1087,7 @@ msgstr "Estapa de la sesión"
 #: model:ir.ui.menu,name:website_event_track.event_track_stage_menu
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search
 msgid "Track Stages"
-msgstr ""
+msgstr "Fases de seguimiento"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_tag
@@ -1087,7 +1104,7 @@ msgstr "Etiquetas de la sesión"
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_blocked
 msgid "Track blocked"
-msgstr ""
+msgstr "Seguimiento bloqueado"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_track_count
@@ -1100,7 +1117,7 @@ msgstr "Sesiones"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track_proposal
 msgid "Tracks Proposals on Website"
-msgstr ""
+msgstr "Propuestas de seguimientos en el sitio web"
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event
@@ -1108,6 +1125,8 @@ msgid ""
 "Tracks define the schedule of your event. These can be a talk, a round "
 "table, a meeting, etc."
 msgstr ""
+"Los seguimientos determinan el programa de su evento. Puede ser una charla, "
+"una mesa redonda, una reunión, etc."
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track
@@ -1115,13 +1134,15 @@ msgid ""
 "Tracks define the schedule of your event. These can bea talk, a round table,"
 " a meeting, etc."
 msgstr ""
+"Los seguimientos determinan el programa de su evento. Pueden ser una charla,"
+" una mesa redonda, una reunión, etc."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Tracks on Website"
-msgstr ""
+msgstr "Seguimientos en el sitio web"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
diff --git a/addons/website_event_track/i18n/fr.po b/addons/website_event_track/i18n/fr.po
index 2b534f8fa08..3d7b27d47a7 100644
--- a/addons/website_event_track/i18n/fr.po
+++ b/addons/website_event_track/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
@@ -14,7 +14,7 @@
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Clo <clo@odoo.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
@@ -25,13 +25,14 @@
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Quentin THEURET <odoo@kerpeo.com>, 2017
 # fr rev <e2ffr04@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: fr rev <e2ffr04@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -60,6 +61,23 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?>\n"
+"\n"
+" \n"
+" Cher/chère \n"
+" \n"
+" Nous avons le plaisir de vous informer que votre proposition ${object.name} a été acceptée et confirmée pour l'événement ${object.event_id.name}.\n"
+" \n"
+" Vous trouverez de plus amples informations ici :\n"
+" \n"
+" \n"
+" Voir l'événement\n"
+" \n"
+" \n"
+" \n"
+" Sincèrement,\n"
+"\n"
+"<div><p><t t-esc=\"object.partner_name\"/></p><p></p><p><div style=\"margin-top: 16px;\"><a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\"></a></div></p><p></p></div>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -84,12 +102,12 @@ msgstr "<b>Proposé par</b> :"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Speakers Biography</b>:"
-msgstr ""
+msgstr "<b>Biographie des conférenciers</b> :"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "<b>Talk Introduction</b>:"
-msgstr ""
+msgstr "<b>Introduction de l'exposé</b> :"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -154,6 +172,10 @@ msgid ""
 " * Red indicates something is preventing the progress of this track\n"
 " * Green indicates the track is ready to be pulled to the next stage"
 msgstr ""
+"L'état kanban du parcours indique les situations spéciales qui l'affecte :\n"
+" * Gris est la situation par défaut\n"
+"* Rouge indique que quelque chose bloque la progression de ce parcours\n"
+" * Vert indique que le parcours est prêt pour l'étape suivante"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
@@ -235,7 +257,7 @@ msgstr "Appel à projets"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_cancel
 msgid "Canceled Stage"
-msgstr ""
+msgstr "Étape annulée"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage5
@@ -267,7 +289,7 @@ msgstr "Conférence"
 #. module: website_event_track
 #: model:mail.template,subject:website_event_track.mail_template_data_track_confirmation
 msgid "Confirmation of ${object.name}"
-msgstr ""
+msgstr "Confirmation de ${object.name}"
 
 #. module: website_event_track
 #: model:event.track.stage,name:website_event_track.event_track_stage1
@@ -307,6 +329,10 @@ msgid ""
 "    You will use these stages in order to track the progress in\n"
 "    solving an event track."
 msgstr ""
+"Définissez les étapes qui seront utilisées pour l'événement, de la\n"
+" création du parcours jusqu'à sa clôture.\n"
+" Vous utiliserez ces étapes afin de suivre la progression d'un\n"
+" parcours d'événement."
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
@@ -392,7 +418,7 @@ msgstr "Emplacements de l'événement"
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor
 msgid "Event Sponsor"
-msgstr ""
+msgstr "Sponsor de l'événement"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_sponsor_type
@@ -548,6 +574,8 @@ msgid ""
 "If set an email will be sent to the customer when the track reaches this "
 "step."
 msgstr ""
+"Si cette option est active, un e-mail sera envoyé au client lorsque le "
+"parcours atteindra cette étape."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_image
@@ -655,11 +683,13 @@ msgstr ""
 #: model:event.track,name:website_event_track.event_track25
 msgid "Merge proposals review, code sprint (entire afternoon)"
 msgstr ""
+"Examen des propositions de fusion, sprint de codage (tout l'après-midi)"
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track24
 msgid "Merge proposals review, code sprint (entire day)."
 msgstr ""
+"Examen des propositions de fusion, sprint de codage (toute la journée)"
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track30
@@ -694,7 +724,7 @@ msgstr "Nouvelle session créée"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
 msgid "New track proposal"
-msgstr ""
+msgstr "Nouvelle proposition de parcours"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.tracks
@@ -768,11 +798,14 @@ msgid ""
 "                            the presentations. Remove the above t-if when\n"
 "                            it's implemented."
 msgstr ""
+"Indiquez ici la liste de documents, notamment les diapositives\n"
+" des présentations. Supprimer l'élément ci-dessus une fois\n"
+" l'implémentation effectuée."
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track10
 msgid "Raising qualitive insights with the survey app"
-msgstr ""
+msgstr "Obtenir des informations de qualité avec l'application Enquête"
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track21
@@ -841,17 +874,17 @@ msgstr "Biographie du confériencer"
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email
 #, python-format
 msgid "Speaker Email"
-msgstr ""
+msgstr "E-mail du conférencier"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_name
 msgid "Speaker Name"
-msgstr ""
+msgstr "Nom du conférencier"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_phone
 msgid "Speaker Phone"
-msgstr ""
+msgstr "Téléphone du conférencier"
 
 #. module: website_event_track
 #: code:addons/website_event_track/models/event_track.py:179
@@ -1002,6 +1035,8 @@ msgid ""
 "Timely release of presentation material (slides),\n"
 "                                    for publishing on our website."
 msgstr ""
+"Mise à disposition en temps voulu des supports de présentation (diapositives),\n"
+" qui seront publiés sur notre site Web."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_name
@@ -1021,7 +1056,7 @@ msgstr "Surveiller"
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_blocked
 msgid "Track Blocked"
-msgstr ""
+msgstr "Parcours bloqué"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track_date
@@ -1041,17 +1076,17 @@ msgstr "Lieu de la session"
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Track Proposals on Website"
-msgstr ""
+msgstr "Propositions de parcours sur le site Web"
 
 #. module: website_event_track
 #: model:mail.message.subtype,name:website_event_track.mt_track_ready
 msgid "Track Ready"
-msgstr ""
+msgstr "Parcours prêt"
 
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_ready
 msgid "Track Ready for Next Stage"
-msgstr ""
+msgstr "Parcours prêt pour la prochaine étape"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_stage
@@ -1059,14 +1094,14 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_tree
 msgid "Track Stage"
-msgstr ""
+msgstr "Étape du parcours"
 
 #. module: website_event_track
 #: model:ir.actions.act_window,name:website_event_track.event_track_stage_action
 #: model:ir.ui.menu,name:website_event_track.event_track_stage_menu
 #: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search
 msgid "Track Stages"
-msgstr ""
+msgstr "Étapes du parcours"
 
 #. module: website_event_track
 #: model:ir.model,name:website_event_track.model_event_track_tag
@@ -1083,7 +1118,7 @@ msgstr "Tags de la session de l'événement"
 #. module: website_event_track
 #: model:mail.message.subtype,description:website_event_track.mt_track_blocked
 msgid "Track blocked"
-msgstr ""
+msgstr "Parcours bloqué"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_track_count
@@ -1096,7 +1131,7 @@ msgstr "Sessions"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track_proposal
 msgid "Tracks Proposals on Website"
-msgstr ""
+msgstr "Propositions de parcours sur le site Web"
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event
@@ -1104,6 +1139,8 @@ msgid ""
 "Tracks define the schedule of your event. These can be a talk, a round "
 "table, a meeting, etc."
 msgstr ""
+"Les parcours définissent le programme de votre événement. Il peut s'agir "
+"d'un exposé, d'une table ronde, d'une réunion, etc."
 
 #. module: website_event_track
 #: model:ir.actions.act_window,help:website_event_track.action_event_track
@@ -1111,13 +1148,15 @@ msgid ""
 "Tracks define the schedule of your event. These can bea talk, a round table,"
 " a meeting, etc."
 msgstr ""
+"Les parcours définissent le programme de votre événement. Il peut s'agir "
+"d'un exposé, d'une table ronde, d'une réunion, etc."
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_form
 msgid "Tracks on Website"
-msgstr ""
+msgstr "Parcours sur le site Web"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
diff --git a/addons/website_event_track/i18n/zh_CN.po b/addons/website_event_track/i18n/zh_CN.po
index 9fef4930f2d..6f10f7d6b8a 100644
--- a/addons/website_event_track/i18n/zh_CN.po
+++ b/addons/website_event_track/i18n/zh_CN.po
@@ -3,11 +3,11 @@
 # * website_event_track
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2016
 # Talway <9010446@qq.com>, 2016
 # SHOM <shanmuxin@yeah.net>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
 # 菜小蛇 <lttlsnk@gmail.com>, 2016
@@ -16,13 +16,14 @@
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -51,6 +52,12 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?><div><p><t "
+"t-esc=\"object.partner_name\"/></p><p></p><p><div style=\"margin-top: "
+"16px;\"><a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px;"
+" font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-"
+"weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-"
+"radius:3px\"></a></div></p><p></p></div>"
 
 #. module: website_event_track
 #: model:ir.ui.view,arch_db:website_event_track.track_view
diff --git a/addons/website_form/i18n/de.po b/addons/website_form/i18n/de.po
index 0b09c693ef9..3a529a84a83 100644
--- a/addons/website_form/i18n/de.po
+++ b/addons/website_form/i18n/de.po
@@ -6,15 +6,16 @@
 # aNj <anj2j@yahoo.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -96,6 +97,8 @@ msgid ""
 "Form action label. Ex: crm.lead could be 'Send an e-mail' and project.issue "
 "could be 'Create an Issue'."
 msgstr ""
+"Formular Aktionsbezeichnung Bsp.: crm.lead könnte „E-Mail senden“ sein und "
+"project.issue „Problem erstellen“."
 
 #. module: website_form
 #: model:ir.model.fields,field_description:website_form.field_ir_model_website_form_label
@@ -125,6 +128,8 @@ msgstr "Bitte füllen Sie das Formular korrekt aus."
 msgid ""
 "Specify the field which will contain meta and custom form fields datas."
 msgstr ""
+"Definieren Sie das Feld, welches die Metadaten und die Daten für "
+"benutzerdefinierten Formularfelder enthalten wird."
 
 #. module: website_form
 #. openerp-web
diff --git a/addons/website_forum/i18n/de.po b/addons/website_forum/i18n/de.po
index d9903b733cb..a983b8ccb63 100644
--- a/addons/website_forum/i18n/de.po
+++ b/addons/website_forum/i18n/de.po
@@ -3,27 +3,28 @@
 # * website_forum
 # 
 # Translators:
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
-# Thomas Lengyel <lexustec_fn@yahoo.de>, 2017
-# JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Tina Rittmüller <tr@ife.de>, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# JackTheHunter <Maximilian.N98@gmail.com>, 2017
+# Renzo Meister, 2017
+# Tina Rittmüller <tr@ife.de>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
+# Thomas Lengyel <lexustec_fn@yahoo.de>, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
+# Niki Waibel, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Mathias Neef <mn@copado.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,6 +73,43 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"\n"
+"\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+"\n"
+"\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+"\n"
+"\n"
+" \n"
+" \n"
+" \n"
+" Sehr geehrte/r ${object.name},\n"
+" Sie wurden dazu eingeladen, Ihre E-Mail-Adresse zu validieren, damit Sie Zugang zu\n"
+" \"${object.company_id.name}\" Diskussionsforen erhalten.\n"
+" Klicken Sie zum Validieren Ihrer E-Mail-Adresse auf den folgenden Link:\n"
+" \n"
+" Validieren Sie mein Konto für „${object.company_id.name}“-Diskussionsforen.\n"
+" \n"
+" Vielen Dank für Ihre Teilnahme!<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td></tr></tbody></table></div> \n"
+" \n"
+" \n"
+" \n"
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td valign=\"top\" style=\"width:600px; padding:0px 10px 5px 5px;\"><div><hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:0px auto;padding:0\"></div></td></tr></tbody></table></div><div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td style=\"padding:0px 10px 5px 5px;font-size: 14px;\"><p></p><p></p><p></p><a style=\"margin-left: 15px; padding:5px 10px; border-radius: 3px; background-color:#875A7B; text-align:center; text-decoration:none; color:#F7FBFD;\" href=\"${ctx.get('token_url')}\"></a><p></p></td></tr></tbody></table></div>"
 
 #. module: website_forum
 #. openerp-web
@@ -93,7 +131,7 @@ msgstr "${object.company_id.name} Forumsprüfung"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.tag
 msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\"/>&amp;nbsp;&amp;nbsp;"
-msgstr ""
+msgstr "<i class=\"fa fa-times\"/>&nbsp;&nbsp;&nbsp;&nbsp;"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -111,6 +149,8 @@ msgid ""
 "(Un)archiving a forum automatically (un)archives its posts. Do you want to "
 "proceed?"
 msgstr ""
+"Das (Un-)Archivieren eines Forums (un-)archiviert automatisch auch dessen "
+"Beiträge. Möchten Sie fortfahren?"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.view_forum_post_form
@@ -118,6 +158,8 @@ msgid ""
 "(Un)archiving a post automatically (un)archives its answers. Do you want to "
 "proceed?"
 msgstr ""
+"Das (Un-)Archivieren eines Beigrags (un-)archiviert automatisch auch dessen "
+"Antworten. Möchten Sie fortfahren?"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
@@ -186,6 +228,9 @@ msgid ""
 "<b>Answers should not add or expand questions</b>. Instead either edit the "
 "question or add a question comment."
 msgstr ""
+"<b>Antworten sollten nicht Fragen hinzufügen oder erweitern.</b> Bearbeiten "
+"Sie stattdessen entweder die Frage oder fügen Sie eine Frage als Kommentar "
+"hinzu."
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -254,6 +299,11 @@ msgid ""
 "    copy/paste. Links are welcome, but should be complementary to\n"
 "    answer, referring sources or additional reading."
 msgstr ""
+"<b>Antworten sollten nicht nur einen\n"
+" Link zur Lösung bereitstellen.</b> Bieten Sie stattdessen die Lösung\n"
+" als beschreibenden Text in Ihrer Antwort an, selbst wenn Sie diesen nur per\n"
+" Kopieren und Einfügen bereitstellen. Links sind willkommen, sollten jedoch nur als Ergänzung\n"
+" zur Antwort bereitgestellt werden, in denen auf Quellen oder weitere Informationen verwiesen wird."
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -263,6 +313,12 @@ msgid ""
 "Links are welcome, but should be complementary to answer, referring sources "
 "or additional reading."
 msgstr ""
+"<b>Antworten sollten nicht nur einen Link zur Lösung bereitstellen.</b> "
+"Bieten Sie stattdessen die Lösung als beschreibenden Text in Ihrer Antwort "
+"an, selbst wenn Sie diesen nur per Kopieren und Einfügen bereitstellen. "
+"Links sind willkommen, sollten jedoch nur als Ergänzung zur Antwort "
+"bereitgestellt werden, in denen auf Quellen oder weitere Informationen "
+"verwiesen wird."
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -406,13 +462,13 @@ msgstr "<span>Von </span>"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
 msgid "A new answer on"
-msgstr ""
+msgstr "Neue Antwort zu"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
 msgid "A new question"
-msgstr ""
+msgstr "Neue Frage"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.tag
@@ -421,6 +477,9 @@ msgid ""
 "            similar questions. Using the right tags makes it easier for\n"
 "            others to find and answer your question. (Hover the mouse to follow/unfollow tag(s))"
 msgstr ""
+"Ein Tag ist ein Label, das Ihre Frage mit anderen,\n"
+" ähnlichen Fragen kategorisiert. Mit den richtigen Tags können andere\n"
+" Ihre Frage einfacher finden und beantworten. (Mauszeiger über die Tags zum Folgen bzw. nicht mehr Folgen bewegen)"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -735,7 +794,7 @@ msgstr "Nach oben geschubst am"
 #: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:34
 #, python-format
 msgid "By sharing you answer, you will get additional"
-msgstr ""
+msgstr "Wenn Sie Ihre Antwort teilen, erhalten Sie zusätzliche"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_can_accept
@@ -898,7 +957,7 @@ msgstr "Schließen"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.close_post
 msgid "Close Post"
-msgstr ""
+msgstr "Beitrag schließen"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_close_all
@@ -913,7 +972,7 @@ msgstr "Eigene Beiträge schließen"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.close_post
 msgid "Close post"
-msgstr ""
+msgstr "Beitrag schließen"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_closed_uid
@@ -1004,12 +1063,12 @@ msgstr "Alle Antworten in Kommentare umwandeln und umgekehrt"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_answers
 msgid "Convert as a comment"
-msgstr ""
+msgstr "Als Kommentar konvertieren"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_comment
 msgid "Convert as an answer"
-msgstr ""
+msgstr "Als Antwort konvertieren"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_karma_accept
@@ -1190,7 +1249,7 @@ msgstr "Bearbeiten Sie Ihre vorherigen Antworten"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.user_detail_full
 msgid "Edit Your Profile"
-msgstr ""
+msgstr "Profil bearbeiten"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_edit_all
@@ -1248,7 +1307,7 @@ msgstr "Hilfreich"
 #: code:addons/website_forum/static/src/js/website_tour_forum.js:19
 #, python-format
 msgid "Enter a name for your new forum."
-msgstr ""
+msgstr "Geben Sie einen Namen für Ihr neues Forum ein."
 
 #. module: website_forum
 #: model:gamification.badge,name:website_forum.badge_q_3
@@ -1324,7 +1383,7 @@ msgstr "Erste Stimme abgegeben"
 #: model:ir.ui.view,arch_db:website_forum.post_answers
 #: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_flag
@@ -1540,6 +1599,9 @@ msgid ""
 "'remaining hours' field computed on tasks?, How to configure TPS and TVQ's "
 "canadian taxes?"
 msgstr ""
+"Wie kann ein physisches Verzeichnis an einem zurückliegenden Datum erstellt "
+"werden? Wie wird das Feld „verbleibende Stunden“ bei Aufgaben berechnet? Wie"
+" werden die kanadischen Steuern für TPS und TVQ berechnet?"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_id
@@ -1615,6 +1677,8 @@ msgid ""
 "Inventory Date Problem, Task remaining hours, Can you help solve solve my "
 "tax computation problem in Canada?"
 msgstr ""
+"Probleme bei Inventurdatum, verbleibende Stunden veranschlagen, können Sie "
+"bei der Lösung meiner Steuerberechnungsprobleme in Kanada helfen?"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_user_favourite
@@ -1741,7 +1805,7 @@ msgstr "Links"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.close_post
 msgid "Mark as offensive"
-msgstr ""
+msgstr "Als beleidigend markieren"
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_moderate
@@ -1780,6 +1844,8 @@ msgstr "Am häufigsten favorisiert"
 msgid ""
 "Move this question to the top of the list by sharing it on social networks."
 msgstr ""
+"Verschieben Sie diese Frage an den Anfang der Liste, indem Sie sie über "
+"soziale Netzwerke teilen."
 
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_user_vote
@@ -1865,13 +1931,13 @@ msgstr "Abstimmen über den eigenen Beitrag nicht erlaubt"
 #: code:addons/website_forum/models/forum.py:932
 #, python-format
 msgid "Not enough karma to create a new Tag"
-msgstr ""
+msgstr "Nicht genug Karma zum Erstellen eines neuen Tags."
 
 #. module: website_forum
 #: code:addons/website_forum/models/forum.py:489
 #, python-format
 msgid "Not enough karma to retag."
-msgstr ""
+msgstr "Nicht genug Karma zum erneuten Taggen."
 
 #. module: website_forum
 #: model:gamification.badge,name:website_forum.badge_q_2
@@ -1913,7 +1979,7 @@ msgstr "Disqualifiziert"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.close_post
 msgid "Offensive Post"
-msgstr ""
+msgstr "Beleidigender Beitrag"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_answers
@@ -2165,7 +2231,7 @@ msgstr "Frage wurde von 5 Benutzern als Favorit markiert"
 #: code:addons/website_forum/controllers/main.py:335
 #, python-format
 msgid "Question should not be empty."
-msgstr ""
+msgstr "Frage sollte nicht leer sein."
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -2209,7 +2275,7 @@ msgstr "Re: %s"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "Reactivate"
-msgstr ""
+msgstr "Erneut aktivieren"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -2240,6 +2306,8 @@ msgstr "Grund:"
 #: model:gamification.badge,description:website_forum.badge_a_1
 msgid "Received at least 3 upvote for an answer for the first time"
 msgstr ""
+"Hat erstmalig mindestens drei positive Bewertungen für eine Antwort "
+"erhalten."
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.display_post_question_block
@@ -2266,7 +2334,7 @@ msgstr "Berechnung der Relevanz"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "Reopen"
-msgstr ""
+msgstr "Erneut öffnen"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_answers
@@ -2316,12 +2384,12 @@ msgstr "Zweiter Parameter für die Relevanz"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
 msgid "See post"
-msgstr ""
+msgstr "Beitrag ansehen"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
 msgid "See question"
-msgstr ""
+msgstr "Frage ansehen"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -2394,7 +2462,7 @@ msgstr "Anzahl Silberauszeichnungen"
 #: code:addons/website_forum/static/src/js/website_forum.js:26
 #, python-format
 msgid "Sorry you must be logged in to perform this action"
-msgstr ""
+msgstr "Tut uns leid. Du must zum Ausführen dieser Aktion angemeldet sein."
 
 #. module: website_forum
 #. openerp-web
@@ -2633,6 +2701,9 @@ msgid ""
 "This post is currently awaiting moderation and not yet published... Do you "
 "want <i>Accept</i> or <i>Reject</i> this post ?"
 msgstr ""
+"Dieser Beitrag wartet derzeit auf Moderation und wurde noch nicht "
+"veröffentlicht. Müchten Sie diesen Beitrag <i>akzeptieren</i> oder "
+"<i>ablehnen?</i>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.private_profile
@@ -2679,7 +2750,7 @@ msgstr ""
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_count
 msgid "Total Votes"
-msgstr ""
+msgstr "Bewertungen gesamt"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -2787,7 +2858,7 @@ msgstr ""
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
 msgid "Validate question"
-msgstr ""
+msgstr "Frage validieren"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.display_post_question_block
@@ -2824,7 +2895,7 @@ msgstr "Warten auf Bestätigung"
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_res_users_forum_waiting_posts_count
 msgid "Waiting post"
-msgstr ""
+msgstr "Wartender Beitrag"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.new_link
@@ -2901,6 +2972,8 @@ msgid ""
 "You already have one pending post.<br/>\n"
 "            Please wait for a moderator to validate your previous post before continuing."
 msgstr ""
+"Sie haben bereits einen anstehenden <br/>Beitrag.\n"
+" Bitte warten Sie vor dem Fortfahren darauf, dass ein Moderator Ihren vorigen Beitrag validiert."
 
 #. module: website_forum
 #: code:addons/website_forum/models/forum.py:138
@@ -2912,7 +2985,7 @@ msgstr "Das Forum erlaubt nicht, dass Sie %s als Standard-Beitrag wählen."
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_answer
 msgid "You cannot post an empty answer"
-msgstr ""
+msgstr "Sie können keine leere Antwort senden."
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -3093,16 +3166,18 @@ msgid ""
 "has been posted and require your validation. Click here to access the "
 "question :"
 msgstr ""
+"wurde gesendet und erfordert Ihre Validierung. Klicken Sie hier, um auf die "
+"Frage zuzugreifen:"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
 msgid "has been posted. Click here to access the post :"
-msgstr ""
+msgstr "wurde gesendet. Klicken Sie hier, um auf den Beitrag zuzugreifen:"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
 msgid "has been posted. Click here to access the question :"
-msgstr ""
+msgstr "wurde gesendet. Klicken Sie hier, um auf die Frage zuzugreifen:"
 
 #. module: website_forum
 #. openerp-web
@@ -3225,7 +3300,7 @@ msgstr ""
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
 msgid "post"
-msgstr ""
+msgstr "senden"
 
 #. module: website_forum
 #: model:forum.post.reason,name:website_forum.reason_15
diff --git a/addons/website_forum/i18n/es.po b/addons/website_forum/i18n/es.po
index 394a2a8c780..eb94d64f2d2 100644
--- a/addons/website_forum/i18n/es.po
+++ b/addons/website_forum/i18n/es.po
@@ -3,9 +3,9 @@
 # * website_forum
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Jose Manuel <admin@jaboweb.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
@@ -24,13 +24,14 @@
 # luis galaviz galindo <luisg-96@hotmail.com>, 2016
 # Gustavo Orozco H. <gustavo.orozco.h@app-247.com>, 2016
 # David Arnold <blaggacao@users.noreply.github.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: David Arnold <blaggacao@users.noreply.github.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -79,6 +80,32 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; "
+"margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-"
+"collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td "
+"valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size:"
+" 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: "
+"auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"></td></tr></tbody></table></div><div "
+"summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 "
+"auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px;"
+" border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td valign=\"top\" style=\"width:600px; "
+"padding:0px 10px 5px 5px;\"><div><hr width=\"100%\" style=\"background-"
+"color:rgb(204,204,204);border:medium none;clear:both;display:block;font-"
+"size:0px;min-height:1px;line-height:0;margin:0px "
+"auto;padding:0\"></div></td></tr></tbody></table></div><div "
+"style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; "
+"background: #FFFFFF repeat top /100%; color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify;"
+" margin:0 auto; border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td style=\"padding:0px 10px 5px 5px;font-size: "
+"14px;\"><p></p><p></p><p></p><a style=\"margin-left: 15px; padding:5px 10px;"
+" border-radius: 3px; background-color:#875A7B; text-align:center; text-"
+"decoration:none; color:#F7FBFD;\" "
+"href=\"${ctx.get('token_url')}\"></a><p></p></td></tr></tbody></table></div>"
 
 #. module: website_forum
 #. openerp-web
@@ -99,7 +126,7 @@ msgstr "${object.company_id.name} Validación de los foros"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.tag
 msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\"/>&amp;nbsp;&amp;nbsp;"
-msgstr ""
+msgstr "<i class=\"fa fa-times\"/>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -193,7 +220,7 @@ msgstr ""
 msgid ""
 "<b>Answers should not add or expand questions</b>. Instead either edit the "
 "question or add a question comment."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -262,7 +289,7 @@ msgid ""
 "    description text in your answer, even if it's just a\n"
 "    copy/paste. Links are welcome, but should be complementary to\n"
 "    answer, referring sources or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -271,7 +298,7 @@ msgid ""
 " solution description text in your answer, even if it's just a copy/paste. "
 "Links are welcome, but should be complementary to answer, referring sources "
 "or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -2642,7 +2669,7 @@ msgstr "Este post ya está marcado"
 msgid ""
 "This post is currently awaiting moderation and not yet published... Do you "
 "want <i>Accept</i> or <i>Reject</i> this post ?"
-msgstr ""
+msgstr "<i/><i/>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.private_profile
@@ -2908,7 +2935,7 @@ msgstr "¿Porqué pueden otras personas editar mis preguntas/respuestas?"
 msgid ""
 "You already have one pending post.<br/>\n"
 "            Please wait for a moderator to validate your previous post before continuing."
-msgstr ""
+msgstr "<br/>"
 
 #. module: website_forum
 #: code:addons/website_forum/models/forum.py:138
diff --git a/addons/website_forum/i18n/fr.po b/addons/website_forum/i18n/fr.po
index 336d2eb6935..df926d3a563 100644
--- a/addons/website_forum/i18n/fr.po
+++ b/addons/website_forum/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Clo <clo@odoo.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
@@ -26,19 +26,20 @@
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
 # Jérémy Kersten <jke@openerp.com>, 2016
 # Vincent Hammadache <vhammadache@gmail.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Micky Jault <micky037@hotmail.fr>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Micky Jault <micky037@hotmail.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -87,6 +88,32 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; "
+"margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-"
+"collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td "
+"valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size:"
+" 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: "
+"auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"></td></tr></tbody></table></div><div "
+"summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 "
+"auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px;"
+" border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td valign=\"top\" style=\"width:600px; "
+"padding:0px 10px 5px 5px;\"><div><hr width=\"100%\" style=\"background-"
+"color:rgb(204,204,204);border:medium none;clear:both;display:block;font-"
+"size:0px;min-height:1px;line-height:0;margin:0px "
+"auto;padding:0\"></div></td></tr></tbody></table></div><div "
+"style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; "
+"background: #FFFFFF repeat top /100%; color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify;"
+" margin:0 auto; border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td style=\"padding:0px 10px 5px 5px;font-size: "
+"14px;\"><p></p><p></p><p></p><a style=\"margin-left: 15px; padding:5px 10px;"
+" border-radius: 3px; background-color:#875A7B; text-align:center; text-"
+"decoration:none; color:#F7FBFD;\" "
+"href=\"${ctx.get('token_url')}\"></a><p></p></td></tr></tbody></table></div>"
 
 #. module: website_forum
 #. openerp-web
@@ -199,7 +226,7 @@ msgstr ""
 msgid ""
 "<b>Answers should not add or expand questions</b>. Instead either edit the "
 "question or add a question comment."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -269,7 +296,7 @@ msgid ""
 "    description text in your answer, even if it's just a\n"
 "    copy/paste. Links are welcome, but should be complementary to\n"
 "    answer, referring sources or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -278,7 +305,7 @@ msgid ""
 " solution description text in your answer, even if it's just a copy/paste. "
 "Links are welcome, but should be complementary to answer, referring sources "
 "or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -2917,7 +2944,7 @@ msgstr "Pourquoi d'autres personnes peuvent modifier mes questions/réponses?"
 msgid ""
 "You already have one pending post.<br/>\n"
 "            Please wait for a moderator to validate your previous post before continuing."
-msgstr ""
+msgstr "<br/>"
 
 #. module: website_forum
 #: code:addons/website_forum/models/forum.py:138
diff --git a/addons/website_forum/i18n/zh_CN.po b/addons/website_forum/i18n/zh_CN.po
index 3a9b14c5f25..4b66d10b987 100644
--- a/addons/website_forum/i18n/zh_CN.po
+++ b/addons/website_forum/i18n/zh_CN.po
@@ -3,24 +3,25 @@
 # * website_forum
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # waveyeung <waveyeung@qq.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
 # Talway <9010446@qq.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # 钟小华 <mackz@sina.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Xu Lei <xulei8@qq.com>, 2016
 # Eddie Lim <bhweelim@yahoo.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # Lijie Ma <tony@malijie.cc>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Lijie Ma <tony@malijie.cc>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -69,6 +70,32 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; "
+"margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-"
+"collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td "
+"valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size:"
+" 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: "
+"auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"></td></tr></tbody></table></div><div "
+"summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 "
+"auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px;"
+" border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td valign=\"top\" style=\"width:600px; "
+"padding:0px 10px 5px 5px;\"><div><hr width=\"100%\" style=\"background-"
+"color:rgb(204,204,204);border:medium none;clear:both;display:block;font-"
+"size:0px;min-height:1px;line-height:0;margin:0px "
+"auto;padding:0\"></div></td></tr></tbody></table></div><div "
+"style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; "
+"background: #FFFFFF repeat top /100%; color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify;"
+" margin:0 auto; border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td style=\"padding:0px 10px 5px 5px;font-size: "
+"14px;\"><p></p><p></p><p></p><a style=\"margin-left: 15px; padding:5px 10px;"
+" border-radius: 3px; background-color:#875A7B; text-align:center; text-"
+"decoration:none; color:#F7FBFD;\" "
+"href=\"${ctx.get('token_url')}\"></a><p></p></td></tr></tbody></table></div>"
 
 #. module: website_forum
 #. openerp-web
@@ -87,7 +114,7 @@ msgstr "${object.company_id.name} 论坛验证"
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.tag
 msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\"/>&amp;nbsp;&amp;nbsp;"
-msgstr ""
+msgstr "<i class=\"fa fa-times\"/>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
@@ -175,7 +202,7 @@ msgstr "<b>回复者不应增加或延伸问题</b>. 除非可以编辑或增加
 msgid ""
 "<b>Answers should not add or expand questions</b>. Instead either edit the "
 "question or add a question comment."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -230,7 +257,7 @@ msgid ""
 "    description text in your answer, even if it's just a\n"
 "    copy/paste. Links are welcome, but should be complementary to\n"
 "    answer, referring sources or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -239,7 +266,7 @@ msgid ""
 " solution description text in your answer, even if it's just a copy/paste. "
 "Links are welcome, but should be complementary to answer, referring sources "
 "or additional reading."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_forum
 #: model:forum.forum,faq:website_forum.forum_help
@@ -2535,7 +2562,7 @@ msgstr "这个帖子已经被结束了"
 msgid ""
 "This post is currently awaiting moderation and not yet published... Do you "
 "want <i>Accept</i> or <i>Reject</i> this post ?"
-msgstr ""
+msgstr "<i/><i/>"
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.private_profile
@@ -2792,7 +2819,7 @@ msgstr "为什么其他人能编辑我的问题/回答？"
 msgid ""
 "You already have one pending post.<br/>\n"
 "            Please wait for a moderator to validate your previous post before continuing."
-msgstr ""
+msgstr "<br/>"
 
 #. module: website_forum
 #: code:addons/website_forum/models/forum.py:138
diff --git a/addons/website_forum_doc/i18n/de.po b/addons/website_forum_doc/i18n/de.po
index 331db5ab2d7..0d0c1cefa09 100644
--- a/addons/website_forum_doc/i18n/de.po
+++ b/addons/website_forum_doc/i18n/de.po
@@ -3,23 +3,24 @@
 # * website_forum_doc
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Fabian Liesch <fabian.liesch@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -179,7 +180,7 @@ msgstr "Fehler! Rekursive Kategorien sind nicht zulässig"
 #. module: website_forum_doc
 #: model:ir.ui.view,arch_db:website_forum_doc.promote_question
 msgid "Explain how to configure Odoo"
-msgstr ""
+msgstr "Erklären Sie die Konfiguration von Odoo."
 
 #. module: website_forum_doc
 #: model:ir.ui.view,arch_db:website_forum_doc.promote_question
@@ -413,7 +414,7 @@ msgstr "Die Fragenüberschrift ist kurz und verständlich"
 #. module: website_forum_doc
 #: model:forum.documentation.toc,introduction:website_forum_doc.toc_functional_doc
 msgid "This documentation is produced using the best posts from the"
-msgstr ""
+msgstr "Diese Dokumentation wird anhand der besten Beiträge erstellt aus"
 
 #. module: website_forum_doc
 #: model:ir.ui.view,arch_db:website_forum_doc.documentation_post
@@ -422,6 +423,8 @@ msgid ""
 "                                        from the Q&amp;A section where you can\n"
 "                                        discuss it and get feedback."
 msgstr ""
+"Diese Dokumentationsseite wurde\n"
+" aus dem Abschnitt mit Diskussionen und Feedback extrahiert."
 
 #. module: website_forum_doc
 #: model:ir.ui.view,arch_db:website_forum_doc.forum_question_doc
@@ -443,6 +446,8 @@ msgid ""
 "Tracks leads, boost opportunities and close deals.\n"
 "                    This serie of how-to will help you develop your business."
 msgstr ""
+"Leads verfolgen, Gelegenheiten ausbauen und Aufträge abschließen.\n"
+" In dieser Serie an How-Tos erfahren Sie alles zur Unternehmensentwicklung."
 
 #. module: website_forum_doc
 #: model:forum.documentation.toc,name:website_forum_doc.toc_website
diff --git a/addons/website_gengo/i18n/de.po b/addons/website_gengo/i18n/de.po
index c8ded96817b..818068fdda0 100644
--- a/addons/website_gengo/i18n/de.po
+++ b/addons/website_gengo/i18n/de.po
@@ -3,16 +3,17 @@
 # * website_gengo
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: darenkster <inactive+darenkster@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -108,14 +109,14 @@ msgstr "Inhalt der zu übersetzen ist oder gesendet werden kann an"
 #: code:addons/website_gengo/static/src/js/website_gengo.js:88
 #, python-format
 msgid "Could not Post translation"
-msgstr ""
+msgstr "Übersetzung konnte nicht gesendet werden"
 
 #. module: website_gengo
 #. openerp-web
 #: code:addons/website_gengo/static/src/js/website_gengo.js:195
 #, python-format
 msgid "Could not submit ! Try Again"
-msgstr ""
+msgstr "Konnte nicht gesendet werden! Erneut versuchen."
 
 #. module: website_gengo
 #. openerp-web
diff --git a/addons/website_hr_recruitment/i18n/de.po b/addons/website_hr_recruitment/i18n/de.po
index 1003d55943b..589d3bb2eb1 100644
--- a/addons/website_hr_recruitment/i18n/de.po
+++ b/addons/website_hr_recruitment/i18n/de.po
@@ -4,20 +4,21 @@
 # 
 # Translators:
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Jan Brodersen <4rmitxes@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Jan Brodersen <4rmitxes@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +29,12 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "$15k"
-msgstr ""
+msgstr "15.000 $"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "1/5"
-msgstr ""
+msgstr "1/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -43,7 +44,7 @@ msgstr "10 / 40 Personen"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "2/5"
-msgstr ""
+msgstr "2/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -53,42 +54,42 @@ msgstr "3 Monate"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "3/5"
-msgstr ""
+msgstr "3/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "4/5"
-msgstr ""
+msgstr "4/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "5/5"
-msgstr ""
+msgstr "5/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "50% YoY"
-msgstr ""
+msgstr "50 % YoY"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-bolt\"/> Bolts"
-msgstr ""
+msgstr "<i class=\"fa fa-bolt\"/>Blitze"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-heart\"/> Hearts"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>Herzen"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-star\"/> Stars"
-msgstr ""
+msgstr "<i class=\"fa fa-star\"/>Sterne"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-tasks\"/> Bar"
-msgstr ""
+msgstr "<i class=\"fa fa-tasks\"/>Balken"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -96,6 +97,8 @@ msgid ""
 "<span class=\"btn btn-primary btn-lg o_website_form_send\">Submit</span>\n"
 "                                <span id=\"o_website_form_result\"/>"
 msgstr ""
+"<span class=\"btn btn-primary btn-lg o_website_form_send\">Senden\n"
+"</span><span id=\"o_website_form_result\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
@@ -107,31 +110,36 @@ msgid ""
 "                                            Feel free to contact him/her if you have further questions.\n"
 "                                        </span>"
 msgstr ""
+"<span>\n"
+" Wir antworten normalerweise innerhalb von drei Tagen. <br/>\n"
+" Bei weiteren Fragen\n"
+" können Sie ihn/sie jederzeit kontaktieren.\n"
+"</span>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>Challenges</strong>"
-msgstr ""
+msgstr "<strong>Zielvereinbarung</strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>Must Have</strong>"
-msgstr ""
+msgstr "<strong>Must-have</strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>Responsibilities</strong>"
-msgstr ""
+msgstr "<strong>Verantwortlichkeiten</strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>What's great in the job?</strong>"
-msgstr ""
+msgstr "<strong>Was ist toll bei dem Job?</strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Achieve monthly targets"
-msgstr ""
+msgstr "Monatliche Ziele erreichen"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.job_countries
@@ -166,12 +174,12 @@ msgstr "Jetzt bewerben!"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Avg Deal Size:"
-msgstr ""
+msgstr "Durchschn. Angebotsumfang:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Benefits"
-msgstr ""
+msgstr "Vorteile"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -179,16 +187,18 @@ msgid ""
 "Brand-name product and services in categories like travel, electronics, "
 "health, fitness, cellular, and more"
 msgstr ""
+"Produkte und Dienste mit Markenzeichen in Kategorien wie Reisen, Elektronik,"
+" Gesundheit, Fitness, Mobil und mehr."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Growth:"
-msgstr ""
+msgstr "Unternehmenszuwachs:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Maturity:"
-msgstr ""
+msgstr "Unternehmenslaufzeit:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
@@ -214,6 +224,8 @@ msgstr "Fortfahren auf unserer Website"
 msgid ""
 "Create new job pages from the <strong><i>+New</i></strong> top-right button."
 msgstr ""
+"Erstellen Sie mit <strong><i>der Schaltfläche „+Neu“</i></strong> oben "
+"rechts neue Arbeitsseiten."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -221,21 +233,23 @@ msgid ""
 "Direct coordination with functional consultants for qualification and follow"
 " ups"
 msgstr ""
+"Direkte Koordination mit spezifischen Beratern für Qualifikation und "
+"Folgemaßnahmen."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Discount Programs"
-msgstr ""
+msgstr "Rabattprogramme"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Eat &amp; Drink"
-msgstr ""
+msgstr "Essen & Trinken"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Full sales cycle"
-msgstr ""
+msgstr "Voller Verkaufssyklus"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -243,18 +257,21 @@ msgid ""
 "Healthcare, dental, vision, life insurance, Flexible Spending Account (FSA),"
 " Health Savings Account (HSA)"
 msgstr ""
+"Krankenversicherung, zahn- und augenärztliche Versorgung, "
+"Lebensversicherungen, flexibles Girokonto (FSA, Flexible Spending Account), "
+"Sparkonto für medizinische Ausgaben (HSA, Health Savings Account)"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "High commissions for good performers"
-msgstr ""
+msgstr "Hohe Provisionen für gute Mitarbeiter"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "In the meantime,"
-msgstr ""
+msgstr "In der Zwischenzeit"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -264,7 +281,7 @@ msgstr "Bewerbungsformular"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Job Complexity:"
-msgstr ""
+msgstr "Job-Komplexität:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.detail
@@ -280,7 +297,7 @@ msgstr "Beruf"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating
 msgid "Job Security:"
-msgstr ""
+msgstr "Job-Sicherheit:"
 
 #. module: website_hr_recruitment
 #: code:addons/website_hr_recruitment/controllers/main.py:72
@@ -315,18 +332,20 @@ msgstr ""
 msgid ""
 "Large apps scope: CRM, MRP, Accounting, Inventory, HR, Project Mgt, etc."
 msgstr ""
+"Umfangreiche Apps: CRM, MRP, Buchhaltung, Bestandsdaten, HR, Projekt-Mgmt., "
+"usw."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Look around on our website:"
-msgstr ""
+msgstr "Schauen Sie sich auf unserer Website um:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Need More Info?"
-msgstr ""
+msgstr "Benötigen Sie weitere Infos ?"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.content_new_job_offer
@@ -337,6 +356,8 @@ msgstr "Neues Stellenangebot"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "No outbound calls, you get leads and focus on providing value to them"
 msgstr ""
+"Keine ausgehenden Anrufe, Sie erhalten Leads und konzentrieren sich darauf, "
+"diesen wertvolle Dienste bereitzustellen."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -344,6 +365,8 @@ msgid ""
 "Only a couple blocs from BART, Caltrain, Highway 101, carpool pickup, and "
 "Bay Bridge."
 msgstr ""
+"Nur wenige Blocks von BART, Caltrain, Highway 101, Autopool-Abholung und Bay"
+" Bridge entfernt."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
@@ -353,52 +376,55 @@ msgstr "Unsere Stellenangebote"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Overachieving Possibilities:"
-msgstr ""
+msgstr "Möglichkeiten für Leistungsspitzen:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "PTOs"
-msgstr ""
+msgstr "PTOs"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Peet's and Philz coffee provided all day to order and pantry snacks"
 msgstr ""
+"Das Café Peet's and Philz stellte den ganzen Tag lang bestellte und "
+"vorbereitete Snacks bereit."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Personal Evolution:"
-msgstr ""
+msgstr "Persönliche Entwicklung:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Play any sport with colleagues and the bill is covered"
 msgstr ""
+"Spielen Sie mit Kollegen jede Sportart ohne sich um die Rechnung zu kümmern."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Pre-tax commuter benefitsbr <br/>(parking and transit)"
-msgstr ""
+msgstr "Steuerliche Vorteile für Pendlerbr <br/>(Parken und Transit)"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Prime location"
-msgstr ""
+msgstr "Top-Standort"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Profitable"
-msgstr ""
+msgstr "Rentabel"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "Rating type"
-msgstr ""
+msgstr "Bewertungstyp"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "Rating value"
-msgstr ""
+msgstr "Bewertungswert"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -408,12 +434,12 @@ msgstr "Fortsetzen"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Sales Cycle:"
-msgstr ""
+msgstr "Verkaufszyklus"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Save on commute"
-msgstr ""
+msgstr "Beim Pendeln sparen"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -429,6 +455,11 @@ msgid ""
 "                qualification to the negotiation, going through astonishing\n"
 "                product demos."
 msgstr ""
+"Kurze Zusammenfassung des Jobs: Eine Verkaufsstelle für intelligente Personen, die schnell\n"
+" neue Managementmethoden der Branche lernen. Sie steuern\n"
+" den gesamten Verkaufszyklus von der Qualifikation\n"
+" von Gelegenheiten bis hin zur Verhandlung, bei der Sie erstaunliche\n"
+" Produkt-Demos vorstellen."
 
 #. module: website_hr_recruitment
 #: model:ir.model,name:website_hr_recruitment.model_hr_recruitment_source
@@ -438,38 +469,40 @@ msgstr "Bewerberherkunft"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Sponsored Events"
-msgstr ""
+msgstr "Gesponsorte Veranstaltungen"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Sport Activity"
-msgstr ""
+msgstr "Sportaktivität"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Team / Company Size:"
-msgstr ""
+msgstr "Größe von Team/Unternehmen"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "The culture"
-msgstr ""
+msgstr "Die Kultur"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "The founder’s story"
-msgstr ""
+msgstr "Geschichte des Gründers"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid ""
 "Tuesday Dinners, Monthly Lunch Mixers, Monthly Happy Hour, Annual day event"
 msgstr ""
+"Dinner am Dienstag, monatliche Lunch-Mixer, monatliche Happy Hour, jährliche"
+" Tagesveranstaltung"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "US + Canada Territory"
-msgstr ""
+msgstr "Gebiet der USA und Kanada"
 
 #. module: website_hr_recruitment
 #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_recruitment_source_url
@@ -479,12 +512,12 @@ msgstr "URL Parameter"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Vacation, Sick, and paid leaves"
-msgstr ""
+msgstr "Urlaubs- und Krankheitstage, bezahlte Urlaube"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Variability of the Job:"
-msgstr ""
+msgstr "Variabilität des Jobs:"
 
 #. module: website_hr_recruitment
 #: model:ir.actions.act_url,name:website_hr_recruitment.action_open_website
@@ -499,7 +532,7 @@ msgstr "Website-Beschreibung"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "What people say about us?"
-msgstr ""
+msgstr "Was sagen andere über uns?"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -507,6 +540,8 @@ msgid ""
 "You sell management software to directors of SMEs: interesting projects and "
 "people"
 msgstr ""
+"Sie verkaufen Managementsoftware an KMU-Inhaber, das bedeutet interessante "
+"Projekte und Personen."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -528,19 +563,19 @@ msgstr "Ihre Telefonnummer"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Your application has been posted successfully."
-msgstr ""
+msgstr "Ihre Bewerbung wurde erfolgreich gesendet."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Your application has been sent to:"
-msgstr ""
+msgstr "Ihre Bewerbung wurde gesendet an:"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
 msgid "for job opportunities."
-msgstr ""
+msgstr "für Job-Angebote."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
@@ -550,4 +585,4 @@ msgstr "offene Arbeitsstellen"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
 msgid "unpublished"
-msgstr ""
+msgstr "unveröffentlicht"
diff --git a/addons/website_hr_recruitment/i18n/es.po b/addons/website_hr_recruitment/i18n/es.po
index 079e63c91d4..04d20e6b6e2 100644
--- a/addons/website_hr_recruitment/i18n/es.po
+++ b/addons/website_hr_recruitment/i18n/es.po
@@ -4,20 +4,21 @@
 # 
 # Translators:
 # Roberto Lizana <robertolizana@trey.es>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Raquel Iciarte <ric@odoo.com>, 2017
 # Eduardo Magdalena <emagdalena@close2circle.com>, 2017
 # David Vidal <david.vidal@trespinos.es>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -73,22 +74,22 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-bolt\"/> Bolts"
-msgstr ""
+msgstr "<i class=\"fa fa-bolt\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-heart\"/> Hearts"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-star\"/> Stars"
-msgstr ""
+msgstr "<i class=\"fa fa-star\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-tasks\"/> Bar"
-msgstr ""
+msgstr "<i class=\"fa fa-tasks\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -96,6 +97,8 @@ msgid ""
 "<span class=\"btn btn-primary btn-lg o_website_form_send\">Submit</span>\n"
 "                                <span id=\"o_website_form_result\"/>"
 msgstr ""
+"<span class=\"btn btn-primary btn-lg o_website_form_send\"/><span "
+"id=\"o_website_form_result\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
@@ -106,7 +109,7 @@ msgid ""
 "                                            We usually reply between one and three days.<br/>\n"
 "                                            Feel free to contact him/her if you have further questions.\n"
 "                                        </span>"
-msgstr ""
+msgstr "<span><br/></span>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -126,7 +129,7 @@ msgstr "<strong>Responsabilidades</strong>"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>What's great in the job?</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -213,7 +216,7 @@ msgstr "Continuar a nuestro sitio web"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
 msgid ""
 "Create new job pages from the <strong><i>+New</i></strong> top-right button."
-msgstr ""
+msgstr "<strong><i/></strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -379,7 +382,7 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Pre-tax commuter benefitsbr <br/>(parking and transit)"
-msgstr ""
+msgstr "<br/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
diff --git a/addons/website_hr_recruitment/i18n/fr.po b/addons/website_hr_recruitment/i18n/fr.po
index 54cb110df2c..ab14e4fa6bf 100644
--- a/addons/website_hr_recruitment/i18n/fr.po
+++ b/addons/website_hr_recruitment/i18n/fr.po
@@ -6,7 +6,7 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Clo <clo@odoo.com>, 2016
 # Fabri Yohann <psn@fabri.pw>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2017
@@ -14,13 +14,14 @@
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Melanie Bernard <mbe@odoo.com>, 2017
 # Miguel Vidali <mvidali129@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Miguel Vidali <mvidali129@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -36,7 +37,7 @@ msgstr "$15k"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "1/5"
-msgstr ""
+msgstr "1/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -46,7 +47,7 @@ msgstr "10 personnes / 40"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "2/5"
-msgstr ""
+msgstr "2/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -56,42 +57,42 @@ msgstr "3 mois"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "3/5"
-msgstr ""
+msgstr "3/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "4/5"
-msgstr ""
+msgstr "4/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "5/5"
-msgstr ""
+msgstr "5/5"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "50% YoY"
-msgstr ""
+msgstr "50 % sur 12 mois"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-bolt\"/> Bolts"
-msgstr ""
+msgstr "<i class=\"fa fa-bolt\"/>Rouages"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-heart\"/> Hearts"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>Cœurs"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-star\"/> Stars"
-msgstr ""
+msgstr "<i class=\"fa fa-star\"/>Étoiles"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-tasks\"/> Bar"
-msgstr ""
+msgstr "<i class=\"fa fa-tasks\"/>Barre"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -112,6 +113,10 @@ msgid ""
 "                                            Feel free to contact him/her if you have further questions.\n"
 "                                        </span>"
 msgstr ""
+"<span>\n"
+" Nous répondons généralement sous un à trois jours.<br/>\n"
+" N'hésitez pas à le/la contacter si vous avez d'autres questions.\n"
+"</span>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -171,7 +176,7 @@ msgstr "Candidatez !"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Avg Deal Size:"
-msgstr ""
+msgstr "Taille moyenne du contrat :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -184,16 +189,18 @@ msgid ""
 "Brand-name product and services in categories like travel, electronics, "
 "health, fitness, cellular, and more"
 msgstr ""
+"Produits et services de marque dans des catégories telles que les voyages, "
+"l'électronique, la santé, le fitness, le mobile et plus encore"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Growth:"
-msgstr ""
+msgstr "Croissance de l'entreprise :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Company Maturity:"
-msgstr ""
+msgstr "Maturité de l'entreprise :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
@@ -219,6 +226,8 @@ msgstr "Retourner à l'accueil de notre site"
 msgid ""
 "Create new job pages from the <strong><i>+New</i></strong> top-right button."
 msgstr ""
+"Créez des pages d'emploi depuis le bouton <strong><i>+Nouveau "
+"en</i></strong> haut à droite."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -226,6 +235,8 @@ msgid ""
 "Direct coordination with functional consultants for qualification and follow"
 " ups"
 msgstr ""
+"Coordination directe avec les consultants fonctionnels pour qualification et"
+" suivi"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -235,12 +246,12 @@ msgstr "Programmes de réduction"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Eat &amp; Drink"
-msgstr ""
+msgstr "Manger et boire"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Full sales cycle"
-msgstr ""
+msgstr "Cycle de vente complet"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -248,18 +259,20 @@ msgid ""
 "Healthcare, dental, vision, life insurance, Flexible Spending Account (FSA),"
 " Health Savings Account (HSA)"
 msgstr ""
+"Santé, soins dentaires, vision, assurance-vie, compte gestion-santé et "
+"compte épargne santé"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "High commissions for good performers"
-msgstr ""
+msgstr "Commissions élevés en cas de bons résultats"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "In the meantime,"
-msgstr ""
+msgstr "Dans l'intervalle,"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -269,7 +282,7 @@ msgstr "Formulaire de recrutement"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Job Complexity:"
-msgstr ""
+msgstr "Complexité de l'emploi :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.detail
@@ -285,7 +298,7 @@ msgstr "Poste Occupé"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating
 msgid "Job Security:"
-msgstr ""
+msgstr "Sécurité de l'emploi :"
 
 #. module: website_hr_recruitment
 #: code:addons/website_hr_recruitment/controllers/main.py:72
@@ -320,13 +333,15 @@ msgstr ""
 msgid ""
 "Large apps scope: CRM, MRP, Accounting, Inventory, HR, Project Mgt, etc."
 msgstr ""
+"Grande portée des applications : CRM, MRP, comptabilité, inventaire, RH, "
+"gestion de projets, etc."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Look around on our website:"
-msgstr ""
+msgstr "Parcourez notre site Web :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -342,6 +357,8 @@ msgstr "Nouvelle offre d'emploi"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "No outbound calls, you get leads and focus on providing value to them"
 msgstr ""
+"Pas d'appels sortants, vous obtenez des leads et vous efforcez de leur "
+"offrir une valeur ajoutée"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -349,6 +366,8 @@ msgid ""
 "Only a couple blocs from BART, Caltrain, Highway 101, carpool pickup, and "
 "Bay Bridge."
 msgstr ""
+"À quelques pas seulement de BART, Caltrain, de la Highway 101, d'une aire de"
+" covoiturage et du pont San Francisco."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
@@ -358,47 +377,51 @@ msgstr "Nos offres d'emploi"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Overachieving Possibilities:"
-msgstr ""
+msgstr "Possibilités de se dépasser :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "PTOs"
-msgstr ""
+msgstr "PTO"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Peet's and Philz coffee provided all day to order and pantry snacks"
 msgstr ""
+"Café Peet's et Philz offert toute la journée pour toute commande et "
+"collations"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Personal Evolution:"
-msgstr ""
+msgstr "Évolution personnelle :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Play any sport with colleagues and the bill is covered"
 msgstr ""
+"Pratiquez n'importe quel sport avec des collègues ; la facture sera prise en"
+" charge"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Pre-tax commuter benefitsbr <br/>(parking and transit)"
-msgstr ""
+msgstr "Avantages de déplacement <br/>(parking et circulation)"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Prime location"
-msgstr ""
+msgstr "Emplacement privilégié"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Profitable"
-msgstr ""
+msgstr "Profitable"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "Rating type"
-msgstr ""
+msgstr "Type d'évaluation :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
@@ -413,12 +436,12 @@ msgstr "Reprendre"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Sales Cycle:"
-msgstr ""
+msgstr "Cycle de vente :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Save on commute"
-msgstr ""
+msgstr "Économisez sur les trajets domicile-travail"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -434,6 +457,10 @@ msgid ""
 "                qualification to the negotiation, going through astonishing\n"
 "                product demos."
 msgstr ""
+"Court résumé du poste : un poste de vente destiné à des personnes intelligentes\n"
+" capables d'apprendre rapidement les pratiques de gestion de nouveaux secteurs. Vous serez\n"
+" responsable de l'intégralité du cycle de vente de la qualification de l'opportunitén\\ à la négociation, en passant par des démonstrations de produits\n"
+" époustouflantes."
 
 #. module: website_hr_recruitment
 #: model:ir.model,name:website_hr_recruitment.model_hr_recruitment_source
@@ -443,7 +470,7 @@ msgstr "Origine des candidats"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Sponsored Events"
-msgstr ""
+msgstr "Événements sponsorisés"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -469,12 +496,12 @@ msgstr "L'histoire du fondateur"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid ""
 "Tuesday Dinners, Monthly Lunch Mixers, Monthly Happy Hour, Annual day event"
-msgstr ""
+msgstr "Dîners du mardi, déjeuners et happy hours mensuels, événement annuel"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "US + Canada Territory"
-msgstr ""
+msgstr "États-Unis + Canada"
 
 #. module: website_hr_recruitment
 #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_recruitment_source_url
@@ -484,12 +511,12 @@ msgstr "Paramètres du lien"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Vacation, Sick, and paid leaves"
-msgstr ""
+msgstr "Vacances, arrêts maladie et congés payés"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Variability of the Job:"
-msgstr ""
+msgstr "Variabilité de l'emploi :"
 
 #. module: website_hr_recruitment
 #: model:ir.actions.act_url,name:website_hr_recruitment.action_open_website
@@ -512,6 +539,8 @@ msgid ""
 "You sell management software to directors of SMEs: interesting projects and "
 "people"
 msgstr ""
+"Vous vendez des logiciels de gestion aux directeurs de PME : personnes et "
+"projets intéressants"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -533,19 +562,19 @@ msgstr "Votre numéro de téléphone"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Your application has been posted successfully."
-msgstr ""
+msgstr "Votre candidature a bien été envoyée."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
 #: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou_page_ir_ui_view
 #: model:website.page,arch_db:website_hr_recruitment.thankyou_page
 msgid "Your application has been sent to:"
-msgstr ""
+msgstr "Votre candidature a été envoyée à :"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
 msgid "for job opportunities."
-msgstr ""
+msgstr "pour des offres d'emploi."
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
diff --git a/addons/website_hr_recruitment/i18n/zh_CN.po b/addons/website_hr_recruitment/i18n/zh_CN.po
index 77788216d62..01de863fff1 100644
--- a/addons/website_hr_recruitment/i18n/zh_CN.po
+++ b/addons/website_hr_recruitment/i18n/zh_CN.po
@@ -3,21 +3,22 @@
 # * website_hr_recruitment
 # 
 # Translators:
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # Talway <9010446@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
-# Bo Cao <cao.poobo@hotmail.com>, 2017
+# Bo Cao, 2017
 # Liping Wang <lynn.config@gmail.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -73,22 +74,22 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-bolt\"/> Bolts"
-msgstr ""
+msgstr "<i class=\"fa fa-bolt\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-heart\"/> Hearts"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-star\"/> Stars"
-msgstr ""
+msgstr "<i class=\"fa fa-star\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
 msgid "<i class=\"fa fa-tasks\"/> Bar"
-msgstr ""
+msgstr "<i class=\"fa fa-tasks\"/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.apply
@@ -108,7 +109,7 @@ msgid ""
 "                                            We usually reply between one and three days.<br/>\n"
 "                                            Feel free to contact him/her if you have further questions.\n"
 "                                        </span>"
-msgstr ""
+msgstr "<span><br/></span>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -128,7 +129,7 @@ msgstr "<strong>职责</strong>"
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "<strong>What's great in the job?</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -215,7 +216,7 @@ msgstr "请继续浏览我们的网站"
 #: model:ir.ui.view,arch_db:website_hr_recruitment.index
 msgid ""
 "Create new job pages from the <strong><i>+New</i></strong> top-right button."
-msgstr ""
+msgstr "<strong><i/></strong>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
@@ -378,7 +379,7 @@ msgstr ""
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
 msgid "Pre-tax commuter benefitsbr <br/>(parking and transit)"
-msgstr ""
+msgstr "<br/>"
 
 #. module: website_hr_recruitment
 #: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
diff --git a/addons/website_links/i18n/de.po b/addons/website_links/i18n/de.po
index 30e8bf46e6f..1c51faa454e 100644
--- a/addons/website_links/i18n/de.po
+++ b/addons/website_links/i18n/de.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # aNj <anj2j@yahoo.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # jonas <jonas.hillebrecht@bklynsoap.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Philipp Hug <philipp@hug.cx>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,26 +29,27 @@ msgstr ""
 #: code:addons/website_links/static/src/js/website_links_charts.js:53
 #, python-format
 msgid " clicks"
-msgstr ""
+msgstr "Klicks"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links_charts.js:104
 #, python-format
 msgid " countries"
-msgstr ""
+msgstr "Länder"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links_charts.js:57
 #, python-format
 msgid "# of clicks"
-msgstr ""
+msgstr "# an Klicks"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.share_page_menu
 msgid "<span title=\"Track this page to count clicks\">Track this Page</span>"
 msgstr ""
+"<span title=\"Track this page to count clicks\">Diese Seite verfolgen</span>"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
@@ -82,7 +84,7 @@ msgstr "<strong>Verfolgter Link</strong>"
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
 msgid "All Time"
-msgstr ""
+msgstr "Alle Zeiten"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -91,6 +93,9 @@ msgid ""
 "placement=\"top\" title=\"Defines the context of your link. It might be an "
 "event you want to promote or a special promotion.\"/>"
 msgstr ""
+"Kampagne<i class=\"fa fa-info-circle\" data-placement=\"top\" data-"
+"toggle=\"tooltip\" title=\"Defines the context of your link. It might be an "
+"event you want to promote or a special promotion.\"/>"
 
 #. module: website_links
 #. openerp-web
@@ -104,12 +109,12 @@ msgstr "Kopieren"
 #: code:addons/website_links/static/src/js/website_links.js:358
 #, python-format
 msgid "Generating link..."
-msgstr ""
+msgstr "Verknüpfung wird erstellt …"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
 msgid "Get tracked link"
-msgstr ""
+msgstr "Verfolgten Link abrufen"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
@@ -134,6 +139,9 @@ msgid ""
 "placement=\"top\" title=\"Defines the medium used to share your link. It "
 "might be an email, or a Facebook Ads for instance.\"/>"
 msgstr ""
+"Medium<i class=\"fa fa-info-circle\" data-placement=\"top\" data-"
+"toggle=\"tooltip\" title=\"Defines the medium used to share your link. It "
+"might be an email, or a Facebook Ads for instance.\"/>"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -148,7 +156,7 @@ msgstr "Aktuellste"
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
 msgid "Recently Used"
-msgstr ""
+msgstr "Zuletzt verwendet"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -156,6 +164,8 @@ msgid ""
 "Share this page with a <strong>short link</strong> that includes "
 "<strong>analytics trackers</strong>."
 msgstr ""
+"Teilen <strong>Sie diese Seite mit einem kurzen Link, der "
+"einen</strong><strong/> Analytics-Tracker enthält."
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -164,6 +174,9 @@ msgid ""
 "placement=\"top\" title=\"Defines the source from which your traffic will "
 "come from, Facebook or Twitter for instance.\"/>"
 msgstr ""
+"Herkunft<i class=\"fa fa-info-circle\" data-placement=\"top\" data-"
+"toggle=\"tooltip\" title=\"Defines the source from which your traffic will "
+"come from, Facebook or Twitter for instance.\"/>"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
@@ -184,7 +197,7 @@ msgstr "Statistik"
 #: code:addons/website_links/static/src/js/website_links_charts.js:231
 #, python-format
 msgid "There is no data to show"
-msgstr ""
+msgstr "Keine Daten vorhanden."
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -192,6 +205,9 @@ msgid ""
 "Those trackers can be used in Google Analytics to track clicks and visitors,"
 " or in Odoo reports to track opportunities and related revenues."
 msgstr ""
+"Diese Tracker können bei Google Analytics verwendet werden, um Klicke und "
+"Besucher zu verfolgen, oder bei Odoo-Berichten, um Gelegenheiten und damit "
+"verbundene Einnahmen zu verfolgen."
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -203,7 +219,7 @@ msgstr "URL"
 #: code:addons/website_links/static/src/js/website_links.js:225
 #, python-format
 msgid "Unable to get recent links"
-msgstr ""
+msgstr "Zuletzt geöffnete Links können nicht abgerufen werden."
 
 #. module: website_links
 #. openerp-web
@@ -217,7 +233,7 @@ msgstr "Undefiniert"
 #: code:addons/website_links/static/src/js/website_links.js:248
 #, python-format
 msgid "You don't have any recent links."
-msgstr ""
+msgstr "Keine zuletzt geöffneten Links vorhanden."
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
@@ -242,33 +258,33 @@ msgstr "Klicks"
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
 msgid "copy"
-msgstr ""
+msgstr "Kopieren"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links.js:268
 #, python-format
 msgid "e.g. Newsletter, Social Network, .."
-msgstr ""
+msgstr "z. B. Newsletter, soziales Netzwerk, …"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links.js:265
 #, python-format
 msgid "e.g. Promotion of June, Winter Newsletter, .."
-msgstr ""
+msgstr "z. B. Promotion des Monats Juni, Winter-Newsletter, …"
 
 #. module: website_links
 #. openerp-web
 #: code:addons/website_links/static/src/js/website_links.js:271
 #, python-format
 msgid "e.g. Search Engine, Website page, .."
-msgstr ""
+msgstr "z. B. Suchmaschine, Website, …"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.create_shorten_url
 msgid "e.g. https://www.odoo.com/page/contactus"
-msgstr ""
+msgstr "z. B. https://www.odoo.com/page/contactus"
 
 #. module: website_links
 #. openerp-web
diff --git a/addons/website_links/i18n/es.po b/addons/website_links/i18n/es.po
index 5c4200a1525..d4457228f88 100644
--- a/addons/website_links/i18n/es.po
+++ b/addons/website_links/i18n/es.po
@@ -5,18 +5,19 @@
 # Translators:
 # Andres Ruiz <andres.ruiz.otalora@gmail.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -48,7 +49,7 @@ msgstr "Nº de clicks"
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.share_page_menu
 msgid "<span title=\"Track this page to count clicks\">Track this Page</span>"
-msgstr ""
+msgstr "<span title=\"Track this page to count clicks\"/>"
 
 #. module: website_links
 #: model:ir.ui.view,arch_db:website_links.graphs
diff --git a/addons/website_livechat/i18n/de.po b/addons/website_livechat/i18n/de.po
index 5ec4238c310..3d4afca4fa1 100644
--- a/addons/website_livechat/i18n/de.po
+++ b/addons/website_livechat/i18n/de.po
@@ -3,18 +3,19 @@
 # * website_livechat
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Anja Funk <anja.funk@afimage.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +46,7 @@ msgstr "Live-Chat"
 #. module: website_livechat
 #: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
 msgid "Live chat channel of your website"
-msgstr ""
+msgstr "Livechat-Kanal auf Ihrer Website"
 
 #. module: website_livechat
 #: model:ir.model,name:website_livechat.model_im_livechat_channel
@@ -80,7 +81,7 @@ msgstr "Das Team"
 #. module: website_livechat
 #: model:ir.ui.view,arch_db:website_livechat.channel_list_page
 msgid "There is no public livechat channel to show."
-msgstr ""
+msgstr "Kein öffentlicher Livechat-Kanal vorhanden."
 
 #. module: website_livechat
 #: model:ir.ui.view,arch_db:website_livechat.channel_page
@@ -95,12 +96,12 @@ msgstr "Website"
 #. module: website_livechat
 #: model:ir.model.fields,field_description:website_livechat.field_res_config_settings_channel_id
 msgid "Website Live Channel"
-msgstr ""
+msgstr "Live-Kanal der Website"
 
 #. module: website_livechat
 #: model:ir.model.fields,field_description:website_livechat.field_website_channel_id
 msgid "Website Live Chat Channel"
-msgstr ""
+msgstr "Livechat-Kanal der Website"
 
 #. module: website_livechat
 #: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel_website_description
@@ -110,7 +111,7 @@ msgstr "Website-Beschreibung"
 #. module: website_livechat
 #: model:ir.ui.view,arch_db:website_livechat.channel_page
 msgid "last feedbacks"
-msgstr ""
+msgstr "neuestes Feedback"
 
 #. module: website_livechat
 #: model:ir.model,name:website_livechat.model_res_config_settings
diff --git a/addons/website_mail/i18n/de.po b/addons/website_mail/i18n/de.po
index cbac4800e80..bf8ad9ea440 100644
--- a/addons/website_mail/i18n/de.po
+++ b/addons/website_mail/i18n/de.po
@@ -3,19 +3,20 @@
 # * website_mail
 # 
 # Translators:
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# Wolfgang Taferner, 2017
+# Renzo Meister, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,6 +121,100 @@ msgid ""
 "            </div>\n"
 "        </div>"
 msgstr ""
+"\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Automatische Anmeldung\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Großartig!<div style=\"margin: 10px auto;\"><table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\"><tbody><tr><td style=\"padding:2px;width:30%;\"><img src=\"web/static/src/img/logo.png\"/></td> \n"
+" \n"
+" Ihre Website ist jetzt online! \n"
+" \n"
+" Wussten Sie schon? \n"
+" \n"
+" \n"
+" \n"
+" Im Menü „Anpassen/Apps installieren“ können Sie neue Funktionen installieren (Forum, Blog, E-Commerce, Jobs usw.)\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Passen Sie im Menü „Anpassen“ das Erscheinungsbild Ihrer Website an.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Entdecken Sie den \n"
+" \n"
+" Website-Planer,\n"
+" um weitere Funktionen zu aktivieren.\n"
+" (${user.env['web.planner'].get_planner_progress('planner_website')}% done)\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Erhöhen Sie mit optimierten Verweisen Ihren Traffic dank unseres SEO-Tools.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Erhöhen Sie mit dem Live-Support der Website die Zahl der Konversionen von Besucher zu Kunden.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Erweitern Sie mit dem mehrsprachigen Support Ihr Zielpublikum.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Mit dem erweiterten HTML-Editor können Sie die Anpassung sogar noch weiter spezifizieren.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Und so vieles mehr …\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" Fragen? \n"
+" Sie sind nicht allein.\n"
+" \n"
+" \n"
+" Wir freuen uns, Ihnen dabei zur Seite zu stehen. Kontaktieren Sie uns bei Fragen über unser\n"
+" Support-Formular.\n"
+" Zudem können Sie mit unserer \n"
+" \n"
+" Benutzer-Dokumentation\n"
+" oder \n"
+" \n"
+" API-Dokumentation\n"
+" herausfinden, wie Sie das Beste aus Odoo herausholen.\n"
+" \n"
+" Genießen Sie Ihre Odoo-Erfahrung.\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" – Das Odoo-Team. P.S.: Die Leute lieben Odoo, lesen Sie, was andere dazu sagen.\n"
+" \n"
+"<td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\"><a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\"></a></td></tr></tbody></table><table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\"><tbody><tr><td style=\"padding:15px 10px;font-size:20px\"><p style=\"color:#875A7B;margin:0\" ></p><br><p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\"><span></span></p><br><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-size:13px;font-weight:bold; \"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-weight:bold;\"></span><span><a href=\"/web#view_type=kanban&amp;model=project.project&amp;action=project.open_view_project_all\"><span style=\"font-weight:bold; text-decoration:underline;\"></span></a></span><span></span><span style=\"color:#875A7B;margin:0;font-weight:bold\"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-weight:bold;\"></span><span style=\"font-style:italic;\"></span></p><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span><a href=\"https://www.odoo.com/help\"></a></span><a href=\"https://www.odoo.com/documentation/user\"><span style=\"text-decoration:underline;\"></span></a></span><span></span><a href=\"https://www.odoo.com/documentation\"><span style=\"text-decoration:underline;\"></span></a></p><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span></span></p></td></tr></tbody></table><div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\"><span><br/><br/><br/></span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\"></span></a></span></div></div>"
 
 #. module: website_mail
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
@@ -200,7 +295,7 @@ msgstr "In der Website als Kommentar sichtbar"
 #. module: website_mail
 #: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
 msgid "Your business is reachable from anywhere, anytime !"
-msgstr ""
+msgstr "Ihr Unternehmen ist jederzeit von überall aus erreichbar!"
 
 #. module: website_mail
 #: model:ir.model,name:website_mail.model_publisher_warranty_contract
diff --git a/addons/website_mail/i18n/es.po b/addons/website_mail/i18n/es.po
index c94b971ec11..e2c36caba1b 100644
--- a/addons/website_mail/i18n/es.po
+++ b/addons/website_mail/i18n/es.po
@@ -3,19 +3,20 @@
 # * website_mail
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -120,6 +121,54 @@ msgid ""
 "            </div>\n"
 "        </div>"
 msgstr ""
+"<div style=\"margin: 10px auto;\"><table cellspacing=\"0\" cellpadding=\"0\""
+" style=\"width:100%;\"><tbody><tr><td style=\"padding:2px;width:30%;\"><img "
+"src=\"web/static/src/img/logo.png\"/></td><td style=\"vertical-align: top; "
+"padding: 8px 10px;text-align: left;font-size: 14px;\"><a href=\"web/login\" "
+"style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: "
+"5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-"
+"decoration: none;\"></a></td></tr></tbody></table><table style=\"width:100"
+"%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px "
+"solid lightgray\"\"><tbody><tr><td style=\"padding:15px 10px;font-"
+"size:20px\"><p style=\"color:#875A7B;margin:0\" ></p><br><p dir=\"ltr\" "
+"style=\"font-size:15px;margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p><br><p dir=\"ltr\" style=\"margin-top:0pt"
+";margin-bottom:8pt;\"><span style=\"font-size:13px;font-weight:bold; "
+"\"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px"
+";list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-"
+"top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p "
+"dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-"
+"size:13px;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-"
+"weight:bold;\"></span><span><a "
+"href=\"/web#view_type=kanban&amp;model=project.project&amp;action=project.open_view_project_all\"><span"
+" style=\"font-weight:bold; text-"
+"decoration:underline;\"></span></a></span><span></span><span "
+"style=\"color:#875A7B;margin:0;font-weight:bold\"></span></p><ul style"
+"=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-"
+"type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style"
+"=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li "
+"dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style"
+"=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li "
+"dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-"
+"size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\"><span style"
+"=\"font-weight:bold;\"></span><span style=\"font-"
+"style:italic;\"></span></p><p dir=\"ltr\" style=\"font-size:13px;margin-"
+"top:0pt;margin-bottom:8pt;\"><span><a "
+"href=\"https://www.odoo.com/help\"></a></span><a "
+"href=\"https://www.odoo.com/documentation/user\"><span style=\"text-"
+"decoration:underline;\"></span></a></span><span></span><a "
+"href=\"https://www.odoo.com/documentation\"><span style=\"text-"
+"decoration:underline;\"></span></a></p><p dir=\"ltr\" style=\"font-size:13px"
+";margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></td></tr></tbody></table><div dir=\"ltr\" "
+"style=\"font-size:13px;margin-top:0pt;margin-"
+"bottom:8pt;color:grey\"><span><br/><br/><br/></span><a "
+"href=\"https://twitter.com/odoo/favorites\"><span style=\"text-"
+"decoration:underline;\"></span></a></span></div></div>"
 
 #. module: website_mail
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
diff --git a/addons/website_mail/i18n/fr.po b/addons/website_mail/i18n/fr.po
index a1d63f2290e..12c2e313aec 100644
--- a/addons/website_mail/i18n/fr.po
+++ b/addons/website_mail/i18n/fr.po
@@ -3,19 +3,20 @@
 # * website_mail
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Richard Mathot <rim@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -120,6 +121,11 @@ msgid ""
 "            </div>\n"
 "        </div>"
 msgstr ""
+"<br>\n"
+" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">Vou<span>s n'êtes pas seul\n"
+" \n"
+" \n"
+" N</span></p>ous serons ravis de vous accompagner. <br><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-size:13px;font-weight:bold; \"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-weight:bold;\"></span><span><a href=\"/web#view_type=kanban&amp;model=project.project&amp;action=project.open_view_project_all\"><span style=\"font-weight:bold; text-decoration:underline;\"></span></a></span><span></span><span style=\"color:#875A7B;margin:0;font-weight:bold\"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-weight:bold;\"></span><span style=\"font-style:italic;\"></span></p><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span><a href=\"https://www.odoo.com/help\"></a></span><a href=\"https://www.odoo.com/documentation/user\"><span style=\"text-decoration:underline;\"></span></a></span><span></span><a href=\"https://www.odoo.com/documentation\"><span style=\"text-decoration:underline;\"></span></a></p><p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span></span></p></td></tr></tbody></table><div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\"><span><br/><br/><br/></span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\"></span></a></span></div></div>"
 
 #. module: website_mail
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
diff --git a/addons/website_mail/i18n/zh_CN.po b/addons/website_mail/i18n/zh_CN.po
index 22aad44acda..c5b116574dd 100644
--- a/addons/website_mail/i18n/zh_CN.po
+++ b/addons/website_mail/i18n/zh_CN.po
@@ -3,17 +3,18 @@
 # * website_mail
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# Martin Trigaux, 2016
 # 菜小蛇 <lttlsnk@gmail.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: 苏州远鼎 <tiexinliu@126.com>, 2016\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -118,6 +119,54 @@ msgid ""
 "            </div>\n"
 "        </div>"
 msgstr ""
+"<div style=\"margin: 10px auto;\"><table cellspacing=\"0\" cellpadding=\"0\""
+" style=\"width:100%;\"><tbody><tr><td style=\"padding:2px;width:30%;\"><img "
+"src=\"web/static/src/img/logo.png\"/></td><td style=\"vertical-align: top; "
+"padding: 8px 10px;text-align: left;font-size: 14px;\"><a href=\"web/login\" "
+"style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: "
+"5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-"
+"decoration: none;\"></a></td></tr></tbody></table><table style=\"width:100"
+"%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px "
+"solid lightgray\"\"><tbody><tr><td style=\"padding:15px 10px;font-"
+"size:20px\"><p style=\"color:#875A7B;margin:0\" ></p><br><p dir=\"ltr\" "
+"style=\"font-size:15px;margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p><br><p dir=\"ltr\" style=\"margin-top:0pt"
+";margin-bottom:8pt;\"><span style=\"font-size:13px;font-weight:bold; "
+"\"></span></p><ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px"
+";list-style-type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-"
+"top:0pt;margin-bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p "
+"dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-"
+"size:13px;margin-top:0pt;margin-bottom:8pt;\"><span style=\"font-"
+"weight:bold;\"></span><span><a "
+"href=\"/web#view_type=kanban&amp;model=project.project&amp;action=project.open_view_project_all\"><span"
+" style=\"font-weight:bold; text-"
+"decoration:underline;\"></span></a></span><span></span><span "
+"style=\"color:#875A7B;margin:0;font-weight:bold\"></span></p><ul style"
+"=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-"
+"type:disc;\"><li dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style"
+"=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li "
+"dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:0pt;\"><span></span></p></li><li dir=\"ltr\"><p dir=\"ltr\" style"
+"=\"margin-top:0pt;margin-bottom:0pt;\"><span></span></p></li><li "
+"dir=\"ltr\"><p dir=\"ltr\" style=\"margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></li></ul><br><p dir=\"ltr\" style=\"font-"
+"size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\"><span style"
+"=\"font-weight:bold;\"></span><span style=\"font-"
+"style:italic;\"></span></p><p dir=\"ltr\" style=\"font-size:13px;margin-"
+"top:0pt;margin-bottom:8pt;\"><span><a "
+"href=\"https://www.odoo.com/help\"></a></span><a "
+"href=\"https://www.odoo.com/documentation/user\"><span style=\"text-"
+"decoration:underline;\"></span></a></span><span></span><a "
+"href=\"https://www.odoo.com/documentation\"><span style=\"text-"
+"decoration:underline;\"></span></a></p><p dir=\"ltr\" style=\"font-size:13px"
+";margin-top:0pt;margin-"
+"bottom:8pt;\"><span></span></p></td></tr></tbody></table><div dir=\"ltr\" "
+"style=\"font-size:13px;margin-top:0pt;margin-"
+"bottom:8pt;color:grey\"><span><br/><br/><br/></span><a "
+"href=\"https://twitter.com/odoo/favorites\"><span style=\"text-"
+"decoration:underline;\"></span></a></span></div></div>"
 
 #. module: website_mail
 #: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
diff --git a/addons/website_mail_channel/i18n/zh_CN.po b/addons/website_mail_channel/i18n/zh_CN.po
index 4f99d86e7d7..1f1b246bb85 100644
--- a/addons/website_mail_channel/i18n/zh_CN.po
+++ b/addons/website_mail_channel/i18n/zh_CN.po
@@ -5,19 +5,20 @@
 # Translators:
 # liAnGjiA <liangjia@qq.com>, 2016
 # Talway <9010446@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# Martin Trigaux, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# fausthuang, 2016
 # Joray <13637815@qq.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
-# Bo Cao <cao.poobo@hotmail.com>, 2017
+# Bo Cao, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Bo Cao <cao.poobo@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -36,6 +37,9 @@ msgid ""
 "<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><strong></strong></p><p></p><p><strong><a "
+"href=\"${ctx['token_url']}\"></a></strong></p><p></p></data>"
 
 #. module: website_mail_channel
 #: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
@@ -48,6 +52,9 @@ msgid ""
 "<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><strong></strong></p><p></p><p><strong><a "
+"href=\"${ctx['token_url']}\"></a></strong></p><p></p></data>"
 
 #. module: website_mail_channel
 #: model:ir.ui.view,arch_db:website_mail_channel.subscribe
diff --git a/addons/website_mass_mailing/i18n/de.po b/addons/website_mass_mailing/i18n/de.po
index 9b6d5d823b7..6b000d5a703 100644
--- a/addons/website_mass_mailing/i18n/de.po
+++ b/addons/website_mass_mailing/i18n/de.po
@@ -3,18 +3,19 @@
 # * website_mass_mailing
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Anja Funk <anja.funk@afimage.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +59,7 @@ msgstr "Ändere Newsletter"
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
 msgid "Choose your mailing subscriptions."
-msgstr ""
+msgstr "Wählen Sie Ihre Mailing-Abonnements."
 
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social
@@ -69,12 +70,12 @@ msgstr "Kontakt"
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.res_config_settings_view_form
 msgid "Encourage to subscribe to mailing lists with a popup"
-msgstr ""
+msgstr "Mit einem Popup regen Sie zum Abonnieren von Mailinglisten an."
 
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
 msgid "Here To Edit Dialog Content"
-msgstr ""
+msgstr "Hier zum Bearbeiten der Dialog-Inhalte"
 
 #. module: website_mass_mailing
 #: model:ir.model,name:website_mass_mailing.model_mail_mass_mailing_list
@@ -97,7 +98,7 @@ msgstr "Newsletter"
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.view_mail_mass_mailing_list_form
 msgid "Popup Content"
-msgstr ""
+msgstr "Popup-Inhalt"
 
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_form
@@ -122,6 +123,10 @@ msgid ""
 "pages. It triggers a popup when visitors land on the page. This popup "
 "prompts them to enter their email address to join a mailing list."
 msgstr ""
+"Damit wird ein neuer Popup-Newsletter-Schnipsel hinzugefügt, der auf Ihre "
+"Website-Seiten gezogen werden kann. Er löst ein Popup aus, wenn Besucher auf"
+" der Seite landen. Dieses Popup fordert dazu auf, sich mit der  E-Mail-"
+"Adresse für eine Mailingliste einzutragen."
 
 #. module: website_mass_mailing
 #. openerp-web
@@ -133,39 +138,39 @@ msgstr "Beginne hier..."
 #. module: website_mass_mailing
 #: model:res.groups,name:website_mass_mailing.group_website_popup_on_exit
 msgid "Use subscription pop up on the website"
-msgstr ""
+msgstr "Abonnement-Popup auf der Website verwenden"
 
 #. module: website_mass_mailing
 #: model:ir.model.fields,field_description:website_mass_mailing.field_res_config_settings_group_website_popup_on_exit
 msgid "Website Popup"
-msgstr ""
+msgstr "Website-Popup"
 
 #. module: website_mass_mailing
 #: model:ir.model.fields,field_description:website_mass_mailing.field_mail_mass_mailing_list_popup_content
 msgid "Website Popup Content"
-msgstr ""
+msgstr "Inhalt des Website-Popups"
 
 #. module: website_mass_mailing
 #: model:ir.model.fields,field_description:website_mass_mailing.field_mail_mass_mailing_list_popup_redirect_url
 msgid "Website Popup Redirect URL"
-msgstr ""
+msgstr "Weiterleitungs-URL des Website-Popups"
 
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
 msgid "You are not subscribed to any of our mailing list."
-msgstr ""
+msgstr "Sie sind derzeit bei keiner Mailingliste angemeldet."
 
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
 msgid "You have been successfully <strong>unsubscribed</strong>!"
-msgstr ""
+msgstr "Sie <strong>wurden erfolgreich abgemeldet!</strong>"
 
 #. module: website_mass_mailing
 #. openerp-web
 #: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:168
 #, python-format
 msgid "Your changes have been saved."
-msgstr ""
+msgstr "Ihre Änderungen wurden gespeichert."
 
 #. module: website_mass_mailing
 #. openerp-web
@@ -173,6 +178,7 @@ msgstr ""
 #, python-format
 msgid "Your changes have not been saved, try again later."
 msgstr ""
+"Ihre Änderungen wurden nicht gespeichert. Versuchen Sie es später erneut."
 
 #. module: website_mass_mailing
 #: model:ir.model,name:website_mass_mailing.model_res_config_settings
diff --git a/addons/website_mass_mailing/i18n/es.po b/addons/website_mass_mailing/i18n/es.po
index f10cd08f36a..5509271573a 100644
--- a/addons/website_mass_mailing/i18n/es.po
+++ b/addons/website_mass_mailing/i18n/es.po
@@ -3,21 +3,22 @@
 # * website_mass_mailing
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 2016
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2016
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Antonio Trueba <atgayol@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -161,7 +162,7 @@ msgstr "No estás suscrito a ninguna de nuestras listas de mailing"
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
 msgid "You have been successfully <strong>unsubscribed</strong>!"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_mass_mailing
 #. openerp-web
diff --git a/addons/website_mass_mailing/i18n/fr.po b/addons/website_mass_mailing/i18n/fr.po
index e0111200762..53d09444295 100644
--- a/addons/website_mass_mailing/i18n/fr.po
+++ b/addons/website_mass_mailing/i18n/fr.po
@@ -8,20 +8,21 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Loic <loic.richard2@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Quentin THEURET <odoo@kerpeo.com>, 2017
 # Micky Jault <micky037@hotmail.fr>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -165,7 +166,7 @@ msgstr "Vous n'êtes pas abonné à l'une des notre liste d'envoi."
 #. module: website_mass_mailing
 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
 msgid "You have been successfully <strong>unsubscribed</strong>!"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_mass_mailing
 #. openerp-web
diff --git a/addons/website_payment/i18n/de.po b/addons/website_payment/i18n/de.po
index 0b6b99c1618..af1bf2fd47a 100644
--- a/addons/website_payment/i18n/de.po
+++ b/addons/website_payment/i18n/de.po
@@ -3,15 +3,16 @@
 # * website_payment
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Ermin Trevisan <trevi@twanda.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr "E-Commerce"
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.header_footer_custom_payment
 msgid "Payment Icons"
-msgstr ""
+msgstr "Zahlungssymbole"
 
 #. module: website_payment
 #: model:ir.model,name:website_payment.model_website
diff --git a/addons/website_payment/i18n/fr.po b/addons/website_payment/i18n/fr.po
index 3eb06b07ed7..43dee106682 100644
--- a/addons/website_payment/i18n/fr.po
+++ b/addons/website_payment/i18n/fr.po
@@ -3,15 +3,16 @@
 # * website_payment
 # 
 # Translators:
-# Richard Mathot <rim@odoo.com>, 2017
-# lucasdeliege <deliegelucas@gmail.com>, 2017
+# Richard Mathot <rim@odoo.com>, 2016
+# lucasdeliege <deliegelucas@gmail.com>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: lucasdeliege <deliegelucas@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -32,7 +33,7 @@ msgstr "E-Commerce"
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.header_footer_custom_payment
 msgid "Payment Icons"
-msgstr ""
+msgstr "Icônes de paiement"
 
 #. module: website_payment
 #: model:ir.model,name:website_payment.model_website
diff --git a/addons/website_payment/i18n/zh_CN.po b/addons/website_payment/i18n/zh_CN.po
index 11cc4cf66ab..ca42cca8173 100644
--- a/addons/website_payment/i18n/zh_CN.po
+++ b/addons/website_payment/i18n/zh_CN.po
@@ -3,16 +3,17 @@
 # * website_payment
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
-# waveyeung <waveyeung@qq.com>, 2017
-# niulin lnc. <admin@niulin.net>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# waveyeung <waveyeung@qq.com>, 2016
+# niulin lnc. <admin@niulin.net>, 2016
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: niulin lnc. <admin@niulin.net>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -33,7 +34,7 @@ msgstr "电子商务"
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.header_footer_custom_payment
 msgid "Payment Icons"
-msgstr ""
+msgstr "支付图标"
 
 #. module: website_payment
 #: model:ir.model,name:website_payment.model_website
diff --git a/addons/website_quote/i18n/de.po b/addons/website_quote/i18n/de.po
index b1399c70e6b..4b72afdca84 100644
--- a/addons/website_quote/i18n/de.po
+++ b/addons/website_quote/i18n/de.po
@@ -3,37 +3,38 @@
 # * website_quote
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Markus Wernersbach <inactive+wernersbacher@transifex.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # key six <mobile.umts@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # e2f_de_t6 <e2f_de_t6@outlook.com>, 2017
 # DE T2 <e2f48d4s5vd1s2@outlook.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -762,7 +763,7 @@ msgstr "Felder"
 #. module: website_quote
 #: model:sale.quote.template,website_description:website_quote.website_quote_template_1
 msgid "Follows a transparent ranking system. Ready - Silver - Gold"
-msgstr ""
+msgstr "Folgt einem transparenten Rangsystem. Fertig – Silber – Gold"
 
 #. module: website_quote
 #: model:product.product,name:website_quote.product_product_quote_1
diff --git a/addons/website_quote/i18n/zh_CN.po b/addons/website_quote/i18n/zh_CN.po
index cb2f57258d4..dbfd0762152 100644
--- a/addons/website_quote/i18n/zh_CN.po
+++ b/addons/website_quote/i18n/zh_CN.po
@@ -3,12 +3,12 @@
 # * website_quote
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Luke <cialuo@qq.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
 # Eddie Lim <bhweelim@yahoo.com>, 2016
 # 菜小蛇 <lttlsnk@gmail.com>, 2016
@@ -18,13 +18,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-24 09:00+0000\n"
 "PO-Revision-Date: 2017-10-24 09:00+0000\n"
-"Last-Translator: waveyeung <waveyeung@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -84,6 +85,36 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" style=\"padding:0px; width:600px; margin:0 "
+"auto; background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-"
+"collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td "
+"valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px;font-size: "
+"12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: "
+"auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"></td></tr></tbody></table><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-"
+"collapse:collapse; background:inherit; color:inherit\"><tbody><tr><td "
+"valign=\"top\" style=\"width:600px; padding:0px 10px 5px 5px;\"><div><hr "
+"width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium "
+"none;clear:both;display:block;font-size:0px;min-height:1px;line-"
+"height:0;margin:15px "
+"auto;padding:0\"></div></td></tr></tbody></table></div><div "
+"style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; "
+"background: #FFFFFF repeat top /100%;color:#777777\"><table "
+"cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify;"
+" margin:0 auto; border-collapse:collapse; background:inherit; "
+"color:inherit\"><tbody><tr><td style=\"padding:0px 10px 5px 5px;font-size: "
+"14px;\"><p></p><br/><p><a "
+"href=\"/quote/${object.id}/${object.access_token}\"></a></p><br/><p><a style"
+"=\"text-decoration:none; color: #875A7B;\" "
+"href=\"/my/home\"></a></p><br/><p></p><br/><p></p></td></tr><tr><td "
+"style=\"padding:0px 10px 5px 5px;font-size: 14px;\"><p style=\"font-size: "
+"14px;\"></p><p style=\"font-size: 11px;\"><strong><a "
+"href=\"${user.company_id.website}\" style=\"text-decoration:none; color: "
+"#875A7B;\"><strong></strong></a><a href=\"www.odoo.com\" style=\"text-"
+"decoration:none; color: "
+"#875A7B;\"><strong></strong></a></strong></p></td></tr></tbody></table></div>"
 
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
@@ -227,7 +258,7 @@ msgstr "<SPAN>本人同意支付这个提案，我接受</SPAN>"
 msgid ""
 "<span>I agree that by signing this proposal, I\n"
 "                                    accept it on the behalf of </span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
@@ -715,7 +746,7 @@ msgid ""
 "                                first section is usually about your company,\n"
 "                                your references, your methodology or\n"
 "                                guarantees, your team, SLA, terms and conditions, etc."
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_quote
 #: model:product.product,quote_description:website_quote.product_product_quote_1
@@ -1427,7 +1458,7 @@ msgid ""
 "                                customize it to fit your own needs from the <i>Sale</i>\n"
 "                                application, using the menu: Configuration /\n"
 "                                Quotation Templates."
-msgstr ""
+msgstr "<strong/><i/>"
 
 #. module: website_quote
 #: model:ir.ui.view,arch_db:website_quote.so_quotation
@@ -1602,7 +1633,7 @@ msgid ""
 "                        of all products in the proposal. The table of content\n"
 "                        on the left is generated automatically using the styles you\n"
 "                        used in your description (heading 1, heading 2, ...)"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_quote
 #: code:addons/website_quote/controllers/main.py:150
diff --git a/addons/website_quote/models/sale_order.py b/addons/website_quote/models/sale_order.py
index 65fb384fe77..4405de69a87 100644
--- a/addons/website_quote/models/sale_order.py
+++ b/addons/website_quote/models/sale_order.py
@@ -201,8 +201,8 @@ class SaleOrder(models.Model):
 
     def get_portal_confirmation_action(self):
         """ Template override default behavior of pay / sign chosen in sales settings """
-        if self.template_id:
-            return 'sign' if self.require_payment == 1 else 'pay'
+        if self.require_payment is not None or self.require_payment is not False:
+            return 'pay' if self.require_payment == 1 else 'sign'
         return super(SaleOrder, self).get_portal_confirmation_action()
 
     @api.multi
diff --git a/addons/website_rating/i18n/de.po b/addons/website_rating/i18n/de.po
index ccf6d0f82ba..a7ec8f4926b 100644
--- a/addons/website_rating/i18n/de.po
+++ b/addons/website_rating/i18n/de.po
@@ -4,17 +4,18 @@
 # 
 # Translators:
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Tina Rittmüller <tr@ife.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +63,7 @@ msgstr "Das gefällt mir"
 #: code:addons/website_rating/static/src/js/website_mail.js:46
 #, python-format
 msgid "I love it"
-msgstr ""
+msgstr "Ich liebe es!"
 
 #. module: website_rating
 #. openerp-web
@@ -91,7 +92,7 @@ msgstr "Bewertung"
 #: code:addons/website_rating/static/src/xml/website_mail.xml:52
 #, python-format
 msgid "Remove selection"
-msgstr ""
+msgstr "Auswahl entfernen"
 
 #. module: website_rating
 #: model:ir.model.fields,help:website_rating.field_rating_rating_website_published
@@ -103,4 +104,4 @@ msgstr "In der Website als Kommentar sichtbar"
 #: code:addons/website_rating/static/src/xml/website_mail.xml:40
 #, python-format
 msgid "stars"
-msgstr ""
+msgstr "Sterne"
diff --git a/addons/website_sale/i18n/de.po b/addons/website_sale/i18n/de.po
index b90dde260f3..de658f069f1 100644
--- a/addons/website_sale/i18n/de.po
+++ b/addons/website_sale/i18n/de.po
@@ -4,12 +4,12 @@
 # 
 # Translators:
 # Thomas Neu <t.neu@runbox.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Niki Waibel, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Maik Steinfeld <info@streward.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
@@ -21,9 +21,9 @@
 # jonas <jonas.hillebrecht@bklynsoap.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # aNj <anj2j@yahoo.de>, 2017
@@ -33,13 +33,14 @@
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # e2f_de_t6 <e2f_de_t6@outlook.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: e2f_de_t6 <e2f_de_t6@outlook.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,12 +56,12 @@ msgstr "&amp;nbsp;"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
 msgid "/shop/cart"
-msgstr ""
+msgstr "/shop/cart"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "/shop/payment"
-msgstr ""
+msgstr "/shop/payment"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
@@ -108,6 +109,37 @@ msgid ""
 "                </div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?>\n"
+"\n"
+" \n"
+" IM WARENKORB BEFINDEN SICH PRODUKTE.\n"
+" Möchten Sie Ihren Einkauf abschließen?<div style=\"margin:auto;width:100%;\"><img src=\"/web/image/res.company/${user.company_id.id}/logo\" style=\"height: auto; width: 80px; margin-top:30px;\" alt=\"${user.company_id.name}\"/><h1 style=\"color:#A9A9A9;\"></h1> \n"
+" % if object.order_line:\n"
+" % for line in object.order_line:\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" ${line.product_id.display_name} ${line.name}\n"
+" \n"
+" \n"
+" ${(line.product_uom_qty) | int} ${(line.product_uom.name)}\n"
+" \n"
+" \n"
+" \n"
+" % endfor\n"
+" \n"
+" % endif\n"
+" \n"
+" \n"
+" Auftrag fortführen \n"
+" Vielen Dank für Ihren Einkauf bei ${user.company_id.name}! \n"
+" \n"
+" \n"
+"<p></p><br/><br/><hr/><table width=\"100%\"><tr><td style=\"padding: 10px; width:150px;\"><img src=\"/web/image/product.product/${line.product_id.id}/image\" height=\"100px\" width=\"100px\"/></td><td><strong></strong><br/></td><td width=\"100px\" align=\"right\"></td></tr></table><hr/><br/><br/><center><a href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\"></a><br/><br/><br/><p><b></b></p></center></div>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -123,6 +155,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add payment acquirers"
 msgstr ""
+"<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>Zahlungsempfänger "
+"hinzufügen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
@@ -145,6 +179,8 @@ msgid ""
 "<i class=\"fa fa-shopping-cart\"/>\n"
 "                    My Cart"
 msgstr ""
+"<i class=\"fa fa-shopping-cart\"/>\n"
+" Mein Warenkorb"
 
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:58
@@ -155,6 +191,9 @@ msgid ""
 "                        <p>You should send an email to the customers to encourage them!</p>\n"
 "                    "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" All</p> <p>verworfenen Warenkörbe finden Sie</p> hier. Dies sind Warenkörbe, die von Besuchern Ihrer Website vor mehr als einer Stunde erstellt wurden, aber noch nicht bestätigt wurden.\n"
+" Senden Sie Ihren Kunden eine E-Mail, um Sie zum Abschließen anzuregen! \n"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -162,6 +201,8 @@ msgid ""
 "<small class=\"text-muted pull-right\">Source: https://termsfeed.com/blog"
 "/sample-terms-and-conditions-template</small>"
 msgstr ""
+"<small class=\"text-muted pull-right\">Quelle: https://termsfeed.com/blog"
+"/sample-terms-andings-template</small>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
@@ -171,7 +212,7 @@ msgstr "<small><i class=\"fa fa-trash-o\"/> Entfernen</small>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
 msgid "<span class=\"col-xs-6 text-right h4 mt0\">Total:</span>"
-msgstr ""
+msgstr "<span class=\"col-xs-6 text-right h4 mt0\">Gesamt:</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
@@ -224,7 +265,7 @@ msgstr "<span class=\"fa fa-long-arrow-left\"/> Zurück"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "<span class=\"fa fa-long-arrow-left\"/> Previous"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-left\"/>Vorherige"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
@@ -238,21 +279,24 @@ msgid ""
 "                                        <span class=\"visible-xs-inline\">Checkout</span>\n"
 "                                        <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
+"<span class=\"hidden-xs\">Zur Kasse\n"
+" Kasse\n"
+"</span><span class=\"visible-xs-inline\"/><span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span> &amp; Shipping</span>"
-msgstr ""
+msgstr "<span>und Versand</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Billing</span>"
-msgstr ""
+msgstr "<span>Abrechnung</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Confirmed</span>"
-msgstr ""
+msgstr "<span>Bestätigt</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -262,12 +306,12 @@ msgstr "<span>Weiter </span><span class=\"fa fa-long-arrow-right\"/>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Order</span>"
-msgstr ""
+msgstr "<span>Auftrag</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Review Order</span>"
-msgstr ""
+msgstr "<span>Auftrag überprüfen</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
@@ -275,6 +319,8 @@ msgid ""
 "<span>Sort by</span>\n"
 "                        <span class=\"caret\"/>"
 msgstr ""
+"<span>Sortieren nach\n"
+"</span><span class=\"caret\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.suggested_products_list
@@ -289,12 +335,12 @@ msgstr "<strong>Bestelldetails:</strong>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
 msgid "<strong>Payment Acquirer:</strong>"
-msgstr ""
+msgstr "<strong>Zahlungsempfänger:</strong>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<strong>Payment Information:</strong>"
-msgstr ""
+msgstr "<strong>Zahlungsinformationen:</strong>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
@@ -308,6 +354,10 @@ msgid ""
 "This should the country in which your company is headquartered or the "
 "country from which you operate your web site and mobile app."
 msgstr ""
+"Ein <b>„Geltendes Recht“</b> informiert Benutzer über die für die "
+"Vereinbarung geltenden Vorschriften. Dies sollte das Land sein, in dem sich "
+"der Hauptsitz Ihres Unternehmens befindet oder das Land, von dem aus Sie "
+"Ihre Website und die mobile App betreiben."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -317,6 +367,11 @@ msgid ""
 "be part of a very long and thorough list in your Terms and Conditions "
 "agreements so as to encompass the most amount of negative uses."
 msgstr ""
+"Eine <b>Beschränkungsklausel für Benutzeraktivitäten</b> kann Benutzer "
+"darüber informieren, dass Sie bei Einverständnis mit der Nutzung Ihres "
+"Dienstes ebenfalls zustimmen, bestimmte Dinge zu unterlassen. Dies kann Teil"
+" einer sehr langen und umfangreichen Liste in Ihren Allgemeinen "
+"Geschäftsbedingungen sein, um übliche negative Nutzungen abzudecken."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -327,6 +382,12 @@ msgid ""
 " agreeing (or disagreeing) with the Terms and Conditions or Privacy Policies"
 " of these third parties."
 msgstr ""
+"Eine <b>Klausel zu Links zu anderen Websites</b> informiert Benutzer "
+"darüber, dass Sie nicht für verlinkte Websites von Dritten verantwortlich "
+"sind. Diese Art von Klausel informiert Benutzer allgemein darüber, dass sie "
+"dafür verantwortlich sind, die Allgemeinen Geschäftsbedingungen oder "
+"Datenschutzrichtlinien dieser Dritten zu lesen und diesen zuzustimmen bzw. "
+"sie abzulehnen."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -336,11 +397,15 @@ msgid ""
 "have an account with you) can be terminated in case of abuses or at your "
 "sole discretion."
 msgstr ""
+"Eine <b>Kündigungsklausel</b> informiert darüber, dass Nutzerkonten auf "
+"Ihrer Website und mobilen App oder der Nutzerzugang auf Ihre Website und "
+"mobile App (falls Nutzer kein Konto bei Ihnen haben) bei Missbrauch bzw. "
+"nach eigenem Ermessen gekündigt werden können."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "A document to provide"
-msgstr ""
+msgstr "Ein bereitzustellendes Dokument"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -357,12 +422,12 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:65
 #, python-format
 msgid "AT A GLANCE"
-msgstr ""
+msgstr "AUF EINEN BLICK"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_is_abandoned_cart
 msgid "Abandoned Cart"
-msgstr ""
+msgstr "Verworfener Warenkorb"
 
 #. module: website_sale
 #. openerp-web
@@ -373,17 +438,17 @@ msgstr ""
 #: model:ir.ui.menu,name:website_sale.menu_orders_abandoned_orders
 #, python-format
 msgid "Abandoned Carts"
-msgstr ""
+msgstr "Verworfene Warenkörbe"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale
 msgid "Abandoned Carts to Recover"
-msgstr ""
+msgstr "Verworfene Warenkörbe zum Wiederherstellen"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_abandoned_delay
 msgid "Abandoned Delay"
-msgstr ""
+msgstr "Verworfene Verzögerung"
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_accessory_product_ids
@@ -393,6 +458,10 @@ msgid ""
 "sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm "
 "figures out a list of accessories based on all the products added to cart."
 msgstr ""
+"Zubehör wird angezeigt, wenn der Kunde vor der Zahlung den Warenkorb prüft "
+"(Strategie zum Cross-Selling, z. B. für Computer: Maus, Tastatur usw.). Ein "
+"Algorithmus enthält eine Liste an Zubehör basierend auf allen Produkten im "
+"Warenkorb."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_accessory_product_ids
@@ -415,6 +484,7 @@ msgstr "Alle Produkte"
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Allow shoppers to compare products based on their attributes"
 msgstr ""
+"Ermöglichen Sie es Kunden, Produkte anhand von Eigenschaften zu vergleichen."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_pricelist_selectable
@@ -424,7 +494,7 @@ msgstr "Dem Endanwender erlauben diese Preisliste auszuwählen"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale_pricelist_form_view
 msgid "Allow to use on"
-msgstr ""
+msgstr "Nutzung zulassen bei"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_alternative_product_ids
@@ -440,7 +510,7 @@ msgstr "Alternative Produkte:"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_crm_team_abandoned_carts_amount
 msgid "Amount of Abandoned Carts"
-msgstr ""
+msgstr "Menge verworfener Warenkörbe"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -457,7 +527,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Apply specific prices per country, discounts, etc."
-msgstr ""
+msgstr "Wenden Sie spezifische Preise für Länder, Rabatte usw. an."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -467,7 +537,7 @@ msgstr "Zuweisung"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Assignation of online orders"
-msgstr ""
+msgstr "Zuweisung von Online-Bestellungen"
 
 #. module: website_sale
 #: model:ir.ui.menu,name:website_sale.menu_catalog_variants_action
@@ -483,7 +553,7 @@ msgstr "Attribute"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_automatic_invoice
 msgid "Automatic Invoice"
-msgstr ""
+msgstr "Automatische Rechnung"
 
 #. module: website_sale
 #. openerp-web
@@ -491,14 +561,14 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:93
 #, python-format
 msgid "Average Order"
-msgstr ""
+msgstr "Durchschnittlicher Auftrag"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:106
 #, python-format
 msgid "Best Sellers"
-msgstr ""
+msgstr "Bestseller"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.bill_to
@@ -517,18 +587,22 @@ msgid ""
 "codes. Specific conditions can be set (products, customers, minimum purchase"
 " amount, period). Rewards can be discounts (% or amount) or free products."
 msgstr ""
+"Steigern Sie Verkaufszahlen mit zwei Rabattprogrammen: Promo- und Coupon-"
+"Codes. Spezifische Bedingungen können festgelegt werden (Produkte, Kunden, "
+"Mindestbestellmenge, Zeitraum). Prämien können Rabatte sein (Prozent oder "
+"Betrag) oder kostenlose Produkte."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_can_directly_mark_as_paid
 msgid "Can be directly marked as paid"
-msgstr ""
+msgstr "Kann direkt als bezahlt markiert werden"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14
 #, python-format
 msgid "Capture order payments when the delivery is completed."
-msgstr ""
+msgstr "Erfassen Sie Zahlungen von Aufträgen bei Abschluss der Lieferung."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_quantity
@@ -538,17 +612,17 @@ msgstr "Anzahl der Artikel im Warenkorb"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_recovery_mail_template
 msgid "Cart Recovery Email"
-msgstr ""
+msgstr "E-Mail-Adresse zur Warenkorbwiederherstellung"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Cart are considered abandoned after"
-msgstr ""
+msgstr "Warenkörbe gelten als verworfen nach"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_recovery_email_sent
 msgid "Cart recovery email already sent"
-msgstr ""
+msgstr "E-Mail zur Warenkorbwiederherstellung bereits gesendet."
 
 #. module: website_sale
 #. openerp-web
@@ -556,7 +630,7 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:84
 #, python-format
 msgid "Carts"
-msgstr ""
+msgstr "Warenkörbe"
 
 #. module: website_sale
 #: model:ir.ui.menu,name:website_sale.menu_catalog
@@ -566,12 +640,12 @@ msgstr "Katalog"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: High to Low"
-msgstr ""
+msgstr "Katalogpreis: Hoch zu niedrig"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: Low to High"
-msgstr ""
+msgstr "Katalogpreis: Niedrig zu hoch"
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.product_public_category_action
@@ -591,6 +665,11 @@ msgid ""
 "Shop page, hit Customize and turn *Product Categories* on. A product can "
 "belong to several categories."
 msgstr ""
+"Kategorien können auf der Shop-Seite veröffentlicht werden (Raster für "
+"Online-Katalog), damit Kunden alle Artikel einer Kategorie finden. Gehen Sie"
+" zum Veröffentlichen auf die Shop-Seite, klicken Sie auf „Anpassen“ und "
+"aktivieren Sie „Produktkategorien“. Ein Produkt kann zu mehreren Kategorien "
+"gehören."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_sale_order_can_directly_mark_as_paid
@@ -598,6 +677,8 @@ msgid ""
 "Checked if the sales order can directly be marked as paid, i.e. if the quotation\n"
 "                is sent or confirmed and if the payment acquire is of the type transfer or manual"
 msgstr ""
+"Aktiviert, wenn der Auftrag direkt als bezahlt markiert werden kann, d. h. wenn das Angebot\n"
+" gesendet oder bestätigt wurde und die Zahlung per Transfer oder manuell erfolgt."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_child_id
@@ -642,6 +723,7 @@ msgstr "Klicken Sie auf <em> Weiter</em>, um das Produkt zu erstellen."
 #, python-format
 msgid "Click on this button so your customers can see it."
 msgstr ""
+"Klicken Sie auf diese Schaltfläche, damit es für Ihre Kunden sichtbar ist."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.product_public_category_action
@@ -661,32 +743,32 @@ msgstr "Unternehmensname"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Versandkosten für DHL berechnen und versenden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Versandkosten für FedEx berechnen und versenden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Versandkosten für UPS berechnen und versenden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Versandkosten für USPS berechnen und versenden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Versandkosten für bpost berechnen und versenden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs on orders"
-msgstr ""
+msgstr "Versandkosten für Aufträge berechnen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
@@ -708,12 +790,12 @@ msgstr "Auftrag bestätigen<span class=\"fa fa-long-arrow-right\"/>"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:6
 #, python-format
 msgid "Confirm orders when you get paid."
-msgstr ""
+msgstr "Aufträge bei Zahlung bestätigen."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Confirmation Email"
-msgstr ""
+msgstr "E-Mail bestätigen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
@@ -723,7 +805,7 @@ msgstr "Bestätigung<span class=\"chevron\"/>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "Confirmed Orders"
-msgstr ""
+msgstr "Bestätigte Aufträge"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_res_partner
@@ -736,7 +818,7 @@ msgstr "Kontakt"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:97
 #, python-format
 msgid "Conversion"
-msgstr ""
+msgstr "Konversion"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_res_country
@@ -771,7 +853,7 @@ msgstr "Währungen"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Customer Experience"
-msgstr ""
+msgstr "Kundenerfahrung"
 
 #. module: website_sale
 #: model:ir.ui.menu,name:website_sale.menu_orders_customers
@@ -781,7 +863,7 @@ msgstr "Kunden"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "DHL"
-msgstr ""
+msgstr "DHL"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_website_currency_id
@@ -802,11 +884,13 @@ msgstr "Standard Umsatzsteuer"
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Default recovery email to send when a cart is abandoned"
 msgstr ""
+"Standard-E-Mail-Adresse für die Wiederherstellung, die bei Verwerfen des "
+"Warenkorbs gesendet wird."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Default sales tax applied to local transactions"
-msgstr ""
+msgstr "Standard-Mehrwertsteuer für lokale Transaktionen"
 
 #. module: website_sale
 #: selection:res.config.settings,sale_delivery_settings:0
@@ -814,6 +898,8 @@ msgid ""
 "Delivery methods are only used internally: the customer doesn't pay for "
 "shipping costs"
 msgstr ""
+"Liefermethoden werden nur intern verwendet: Kunden zahlen keine "
+"Versandkosten."
 
 #. module: website_sale
 #: selection:res.config.settings,sale_delivery_settings:0
@@ -821,6 +907,8 @@ msgid ""
 "Delivery methods are selectable on the website: the customer pays for "
 "shipping costs"
 msgstr ""
+"Liefermethoden können auf der Website gewählt werden: Kunden zahlen für "
+"Versandkosten."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_website_sequence
@@ -838,12 +926,12 @@ msgstr "Anzeigename"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Display an images carousel on product pages"
-msgstr ""
+msgstr "Auf Produktseiten Bilder-Karussell anzeigen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Display crossed-out public prices"
-msgstr ""
+msgstr "Durchgestrichene öffentliche Preise anzeigen"
 
 #. module: website_sale
 #. openerp-web
@@ -888,17 +976,17 @@ msgstr "E-Mail-Assistent"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Email for Abandoned carts"
-msgstr ""
+msgstr "E-Mail für verworfene Warenkörbe"
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_order_mail_template
 msgid "Email sent to customer at the end of the checkout process"
-msgstr ""
+msgstr "Bei Abschluss des Zahlungsvorgangs E-Mail an Kunde gesendet"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Email sent to the customer after the checkout"
-msgstr ""
+msgstr "Nach Zahlung E-Mail an Kunde gesendet"
 
 #. module: website_sale
 #. openerp-web
@@ -916,7 +1004,7 @@ msgstr "Fehler! Rekursive Kategorien sind nicht zulässig"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info_option
 msgid "Extra Info<span class=\"chevron\"/>"
-msgstr ""
+msgstr "Weitere Informationen<span class=\"chevron\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
@@ -939,11 +1027,14 @@ msgid ""
 "Find here all the abandoned carts, i.e. the carts generated by your "
 "website's visitors more than one hour ago and not confirmed."
 msgstr ""
+"Finden Sie hier alle verworfenen Warenkörbe, d. h. die Warenkörbe, welche "
+"von Besuchern Ihrer Website vor mehr als einer Stunde erstellt und nicht "
+"bestätigt wurden."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "From Website"
-msgstr ""
+msgstr "Von Website"
 
 #. module: website_sale
 #. openerp-web
@@ -955,7 +1046,7 @@ msgstr "Generieren Sie eine Rechnung aus fakturierbaren Aufträgen."
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Generate the invoice automatically when the order is confirmed"
-msgstr ""
+msgstr "Rechnung automatisch generieren, wenn die Bestellung bestätigt wird."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
@@ -986,6 +1077,8 @@ msgstr "HTTP-Routing"
 #: model:ir.ui.view,arch_db:website_sale.reduction_code
 msgid "Have a promo code? Fill in this field and apply."
 msgstr ""
+"Sie haben einen Promo-Code? Füllen Sie dieses Feld aus und bewerben Sie "
+"sich."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_attribute_value_html_color
@@ -1000,6 +1093,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "How total tax amount is computed in orders and invoices"
 msgstr ""
+"Wie der gesamte Steuerbetrag in Bestellungen und Rechnungen berechnet wird"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment_sale_note
@@ -1022,6 +1116,13 @@ msgid ""
 "telecommunications, and services that are electronically supplied instead of"
 " shipped. Gift cards sent online are not included in the definition."
 msgstr ""
+"Wenn Sie digitale Waren an Kunden in der EU verkaufen, müssen Sie die MwSt. "
+"auf der Grundlage Ihrer Kunden-Standorte berechnen. Diese Regel gilt "
+"unabhängig davon, wo Ihr Standort ist. Digitale Waren werden in den "
+"Rechtsvorschriften definiert als Rundfunk, Telekommunikation und "
+"Dienstleistungen, die elektronisch erbracht werden, anstatt ausgeliefert zu "
+"werden. Geschenkkarten, die online versendet werden, entsprechen nicht "
+"dieser Definition."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -1038,6 +1139,18 @@ msgid ""
 "will respond to any DMCA take down notices received and you will take down "
 "the content."
 msgstr ""
+"Wenn Ihre Website oder die mobilen Apps Benutzern ermöglicht, Inhalte zu "
+"erstellen und mit anderen Benutzern öffentlich zu teilen, informiert ein "
+"<b>Abschnitt „Inhalte“</b> die Benutzer darüber, dass Sie die Rechte an den "
+"von ihnen erstellten Inhalten besitzen.<br/> Die Klausel „Inhalte“ erwähnt "
+"gewöhnlich, dass Benutzer Ihnen (als Entwickler der Website oder mobilen "
+"App) eine Lizenz geben müssen, damit Sie diese Inhalte auf Ihrer Website "
+"bzw. mobilen App teilen und Benutzern zur Verfügung stellen können.<br/> Da "
+"die von Benutzern erstellten Inhalte öffentlich sind, informiert ein "
+"Abschnitt mit DMCA-Hinweisklausel (oder zur Urheberrechtsverletzung) die "
+"Benutzer und Urheber darüber, dass im Falle von Urheberrechte verletzenden "
+"Inhalten, Sie auf jegliche DMCA-Hinweise zum Entfernen der Inhalte reagieren"
+" werden."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_image
@@ -1048,7 +1161,7 @@ msgstr "Bild"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_product_image_form
 msgid "Image Name"
-msgstr ""
+msgstr "Bildname"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_product_image_ids
@@ -1060,7 +1173,7 @@ msgstr "Bilder"
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_module_website_sale_stock
 msgid "Installs *e-Commerce Inventory*"
-msgstr ""
+msgstr "Installiert *E-Commerce-Bestand*"
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/main.py:501
@@ -1088,13 +1201,15 @@ msgstr "Abrechnung"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Issue invoices to customers"
-msgstr ""
+msgstr "Rechnungen an Kunden senden"
 
 #. module: website_sale
 #: code:addons/website_sale/models/sale_order.py:157
 #, python-format
 msgid "It is forbidden to modify a sales order which is not in draft status"
 msgstr ""
+"Es ist nicht zulässig, einen Verkaufsauftrag zu ändern, der nicht im "
+"Entwurfsstatus ist."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image___last_update
@@ -1112,7 +1227,7 @@ msgstr "Letzter Monat"
 #: model:ir.model.fields,field_description:website_sale.field_res_partner_last_website_so_id
 #: model:ir.model.fields,field_description:website_sale.field_res_users_last_website_so_id
 msgid "Last Online Sales Order"
-msgstr ""
+msgstr "Letzter Online-Verkaufsauftrag"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_write_uid
@@ -1142,18 +1257,19 @@ msgstr "Letztes Jahr"
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Let returning shoppers save products in a whishlist"
 msgstr ""
+"Lassen Sie wiederkehrende Kunden Produkte in einer Wunschliste speichern."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Let the customer enter a shipping address"
-msgstr ""
+msgstr "Lassen Sie Kunden eine Versandadresse eingeben."
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:15
 #, python-format
 msgid "Let's create your first product."
-msgstr ""
+msgstr "Los geht’s: Erstellen Sie Ihr erstes Produkt."
 
 #. module: website_sale
 #. openerp-web
@@ -1163,26 +1279,28 @@ msgid ""
 "Let's now take a look at your administration dashboard to get your eCommerce"
 " website ready in no time."
 msgstr ""
+"Schauen wir uns jetzt Ihr Admin-Dashboard an, damit Ihre E-Commerce-Website "
+"im Handumdrehen bereitsteht."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "Log In"
-msgstr ""
+msgstr "Login"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Manage availability of products"
-msgstr ""
+msgstr "Verfügbarkeit von Produkten verwalten"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Manage promotion &amp; coupon programs"
-msgstr ""
+msgstr "Werbe- und Gutscheinkampagnen verwalten"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_order_view_form
 msgid "Mark as Paid"
-msgstr ""
+msgstr "Als bezahlt markieren"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_image_medium
@@ -1203,7 +1321,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_group_website_multiimage
 msgid "Multi-Images"
-msgstr ""
+msgstr "Multi-Imaging"
 
 #. module: website_sale
 #. openerp-web
@@ -1222,12 +1340,12 @@ msgstr "Name"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - A to Z"
-msgstr ""
+msgstr "Name – A bis Z"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - Z to A"
-msgstr ""
+msgstr "Name – Z bis A"
 
 #. module: website_sale
 #. openerp-web
@@ -1241,7 +1359,7 @@ msgstr "Neues Produkt"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "Next <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Weiter<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.products
@@ -1251,22 +1369,22 @@ msgstr "Es ist kein Produkt vorhanden."
 #. module: website_sale
 #: selection:res.config.settings,sale_delivery_settings:0
 msgid "No shipping management on website"
-msgstr ""
+msgstr "Kein Versandmanagement auf der Website."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale_pricelist_form_view
 msgid "None website"
-msgstr ""
+msgstr "Keine Website"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Now to Follow Your Order"
-msgstr ""
+msgstr "Jetzt zum Befolgen Ihres Auftrags"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_crm_team_abandoned_carts_count
 msgid "Number of Abandoned Carts"
-msgstr ""
+msgstr "Anzahl verworfener Warenkörbe"
 
 #. module: website_sale
 #. openerp-web
@@ -1281,6 +1399,8 @@ msgid ""
 "Once activated, discounted prices can be applied from Pricelists setup form "
 "(Discount policy field)."
 msgstr ""
+"Sobald dies aktiviert ist, können ermäßigte Preise vom Setup-Formular für "
+"Preislisten angwendet werden (Feld für Rabattbestimmungen)."
 
 #. module: website_sale
 #. openerp-web
@@ -1288,12 +1408,13 @@ msgstr ""
 #, python-format
 msgid "Once you click on <b>Save</b>, your product is updated."
 msgstr ""
+"Sobald Sie auf <b>Speichern klicken,</b> wird Ihr Produkt aktualisiert."
 
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:39
 #, python-format
 msgid "Online Sales"
-msgstr ""
+msgstr "Online-Verkäufe"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_only_services
@@ -1305,7 +1426,7 @@ msgstr "Nur Dienstleistungen"
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:68
 #, python-format
 msgid "Open your website app here."
-msgstr ""
+msgstr "Öffnen Sie Ihre Website-App hier."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_options
@@ -1346,7 +1467,7 @@ msgstr "Aufträge"
 #. module: website_sale
 #: model:ir.actions.act_window,name:website_sale.sale_order_action_to_invoice
 msgid "Orders To Invoice"
-msgstr ""
+msgstr "Aufträge zur Rechnung"
 
 #. module: website_sale
 #. openerp-web
@@ -1361,7 +1482,7 @@ msgstr "Aufträge zur Rechnung"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:89
 #, python-format
 msgid "Orders/Day"
-msgstr ""
+msgstr "Aufträge pro Tag"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_parent_id
@@ -1397,14 +1518,14 @@ msgstr "Zahlung<span class=\"chevron\"/>"
 #. module: website_sale
 #: model:ir.actions.act_window,name:website_sale.payment_transaction_action_payments_to_capture
 msgid "Payments To Capture"
-msgstr ""
+msgstr "Zu erfassende Zahlungen"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:15
 #, python-format
 msgid "Payments to Capture"
-msgstr ""
+msgstr "Zu erfassende Zahlungen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -1414,25 +1535,25 @@ msgstr "Telefon"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Please proceed your current cart."
-msgstr ""
+msgstr "Bitte mit dem aktuellen Warenkorb fortfahren."
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/backend.py:108
 #, python-format
 msgid "Previous Month"
-msgstr ""
+msgstr "Vorheriger Monat"
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/backend.py:106
 #, python-format
 msgid "Previous Week"
-msgstr ""
+msgstr "Vorherige Woche"
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/backend.py:110
 #, python-format
 msgid "Previous Year"
-msgstr ""
+msgstr "Vorheriges Jahr"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
@@ -1486,7 +1607,7 @@ msgstr "Produktkatalog"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_comparison
 msgid "Product Comparison Tool"
-msgstr ""
+msgstr "Produktvergleichstool"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product_template_form_view
@@ -1502,7 +1623,7 @@ msgstr "Produktname"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Product Prices"
-msgstr ""
+msgstr "Produktpreise"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product_public_category_tree_view
@@ -1532,7 +1653,7 @@ msgstr "Das Produkt wurde nicht gefunden!"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Product prices displaying in web catalog"
-msgstr ""
+msgstr "Anzeige der Produktpreise im Webkatalog"
 
 #. module: website_sale
 #: model:ir.actions.act_window,name:website_sale.product_template_action_website
@@ -1555,6 +1676,10 @@ msgid ""
 "do so, attach some files to a product using the new Files button and publish"
 " them."
 msgstr ""
+"Stellen Sie Kunden auf der Bestätigungsseite des Zahlungsvorgangs "
+"produktspezifische Links oder Downloads bereit, wenn die Zahlung erfolgt "
+"ist. Dazu fügen Sie die Dateien mit der Schaltfläche „Neue Dateien“ zu einem"
+" Produkt hinzu und veröffentlichen sie."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product_template_search_view_website
@@ -1639,7 +1764,7 @@ msgstr "Begründung der Bewertung"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "Recovery Email to Send"
-msgstr ""
+msgstr "Zu sendende Wiederherstellungs-E-Mail"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_product_tmpl_id
@@ -1669,7 +1794,7 @@ msgstr "Verkauf"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_report_view_graph_website
 msgid "Sale Report"
-msgstr ""
+msgstr "Verkaufsbericht"
 
 #. module: website_sale
 #. openerp-web
@@ -1694,7 +1819,7 @@ msgstr "Vertriebskanal"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_report_view_pivot_website
 msgid "Sales Report"
-msgstr ""
+msgstr "Verkaufsbericht"
 
 #. module: website_sale
 #. openerp-web
@@ -1702,7 +1827,7 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:44
 #, python-format
 msgid "Sales Since Last"
-msgstr ""
+msgstr "Verkäufe seit letzter"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_salesperson_id
@@ -1723,6 +1848,8 @@ msgid ""
 "Select <b>New Product</b> to create it and manage its properties to boost "
 "your sales."
 msgstr ""
+"Um <b>Ihren Umsatz zu steigern, wählen Sie Neues</b> Produkt, um es zu "
+"erstellen und seine Eigenschaften zu verwalten."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1730,6 +1857,8 @@ msgid ""
 "Select optional products from the configuration form of your main products "
 "(in Sales tab)."
 msgstr ""
+"Wählen Sie optionale Produkte aus dem Konfigurationsformular Ihrer "
+"wichtigsten Produkte (im Verkaufsverzeichnis)."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
@@ -1744,22 +1873,22 @@ msgstr "Auswählbar"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Sell content to download or URL links"
-msgstr ""
+msgstr "Inhalte zum Download oder URL-Links verkaufen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Sell in several currencies"
-msgstr ""
+msgstr "In mehreren Währungen verkaufen"
 
 #. module: website_sale
 #: model:ir.actions.server,name:website_sale.ir_actions_server_sale_cart_recovery_email
 msgid "Send a Cart Recovery Email"
-msgstr ""
+msgstr "Warenkorb-Wiederherstellungs-E-Mail senden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_order_view_form_cart_recovery
 msgid "Send a Recovery Email"
-msgstr ""
+msgstr "Wiederherstellungs-E-Mail senden"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1772,6 +1901,8 @@ msgstr ""
 #, python-format
 msgid "Send a recovery email to visitors who haven't completed their order."
 msgstr ""
+"Senden Sie eine Wiederherstellungs-E-Mail an Besucher, die ihre Bestellung "
+"noch nicht abgeschlossen haben."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_sequence
@@ -1782,6 +1913,8 @@ msgstr "Reihenfolge"
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Set product attributes (e.g. color, size) to sell variants"
 msgstr ""
+"Legen Sie Produktattribute fest (z. B. Farbe, Größe), um Varianten zu "
+"verkaufen."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.bill_to
@@ -1804,7 +1937,7 @@ msgstr "Lieferadresse"
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Shipping Costs"
-msgstr ""
+msgstr "Versandkosten"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_sale_delivery_settings
@@ -1830,7 +1963,7 @@ msgstr "Shop-Bestätigung"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "Shop - Select Payment Acquirer"
-msgstr ""
+msgstr "Shop – Zahlungsempfänger auswählen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
@@ -1840,12 +1973,12 @@ msgstr "Warenkorb"
 #. module: website_sale
 #: model:res.groups,name:website_sale.group_website_multi_image
 msgid "Show multi image on eCommerce"
-msgstr ""
+msgstr "Mehrere Bilder bei E-Commerce anzeigen"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Sign Up"
-msgstr ""
+msgstr "Registrieren"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale
@@ -1886,7 +2019,7 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:111
 #, python-format
 msgid "Sold"
-msgstr ""
+msgstr "Verkauft"
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/main.py:519
@@ -1902,7 +2035,7 @@ msgstr "Entschuldigung, dieses Produkt ist nicht mehr verfügbar"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Sorting by :"
-msgstr ""
+msgstr "Wird sortiert nach:"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -1953,21 +2086,23 @@ msgid ""
 "Suggest more expensive alternatives to your customers (upsell strategy). "
 "Those products show up on the product page."
 msgstr ""
+"Schlagen Sie Kunden teurere Alternativen vor (Upselling-Strategie). Diese "
+"Produkte werden auf der Produktseite angezeigt."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Suggest optional products when adding to cart"
-msgstr ""
+msgstr "Schlagen Sie beim Hinzufügen zum Warenkorb optionale Produkte vor."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.suggested_products_list
 msgid "Suggested Accessories:"
-msgstr ""
+msgstr "Vorgeschlagenes Zubehör:"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "TIN / VAT"
-msgstr ""
+msgstr "TIN bzw. MwSt."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1996,6 +2131,9 @@ msgid ""
 "contents, logo and other visual media you created is your property and is "
 "protected by copyright laws."
 msgstr ""
+"Die Offenlegung <b>zum geistigen Eigentum</b> informiert Benutzer darüber, "
+"dass Inhalte, Logo und andere von Ihnen erstellte visuelle Medien Ihr "
+"Eigentum darstellen und urheberrechtlich geschützt sind."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_website_url
@@ -2009,6 +2147,8 @@ msgid ""
 "The mode selected here applies as invoicing policy of any new product "
 "created but not of products already existing."
 msgstr ""
+"Der hier ausgewählte Modus gilt als Bestimmung zur Rechnungsstellung für "
+"alle neu erstellten Produkte, jedoch nicht für bestehende Produkte."
 
 #. module: website_sale
 #: code:addons/website_sale/models/sale_order.py:258
@@ -2017,23 +2157,25 @@ msgid ""
 "The quote should be sent and the payment acquirer type should be manual or "
 "wire transfer"
 msgstr ""
+"Das Angebot sollte gesendet werden und der Zahlungsempfänger-Typ manuell "
+"oder Überweisung sein."
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:51
 #, python-format
 msgid "There is no recent confirmed order."
-msgstr ""
+msgstr "Kein zuletzt bestätigter Auftrag vorhanden."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "This adds the choice of a currency on pricelists."
-msgstr ""
+msgstr "Dies fügt die Wahl einer Währung zu Preislisten hinzu."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
 msgid "This combination does not exist."
-msgstr ""
+msgstr "Diese Kombination existiert nicht."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_public_category_image
@@ -2046,7 +2188,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "This is your current cart."
-msgstr ""
+msgstr "Dies ist Ihr aktueller Warenkorb."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -2057,6 +2199,7 @@ msgstr "Dieser Gutscheincode ist unbekannt."
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "This tax is applied to any new product created in the catalog."
 msgstr ""
+"Diese Steuer wird auf alle neu im Katalog erstellte Produkte angewendet."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -2076,12 +2219,12 @@ msgstr "Typ"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "USPS"
-msgstr ""
+msgstr "USPS"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
@@ -2103,14 +2246,14 @@ msgstr "Offene Bestellungen"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
 #, python-format
 msgid "Untaxed Total Sold"
-msgstr ""
+msgstr "Gesamtverkauf nicht besteuert"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
 #, python-format
 msgid "Upload an image from your local library."
-msgstr ""
+msgstr "Laden Sie ein Bild aus Ihrer lokalen Bibliothek hoch."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_popover
@@ -2143,7 +2286,7 @@ msgstr "Website Öffentliche Kategorien"
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_sequence
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_sequence
 msgid "Website Sequence"
-msgstr ""
+msgstr "Website-Sequenz"
 
 #. module: website_sale
 #: model:ir.actions.act_url,name:website_sale.action_open_website
@@ -2180,7 +2323,7 @@ msgstr "Webseiten Preis"
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_price_difference
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_price_difference
 msgid "Website price difference"
-msgstr ""
+msgstr "Website-Preisdifferenz"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_public_price
@@ -2196,12 +2339,12 @@ msgstr "Websites"
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_crm_team_website_ids
 msgid "Websites using this sales channel"
-msgstr ""
+msgstr "Websites mit diesem Verkaufskanal."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_wishlist
 msgid "Wishlists"
-msgstr ""
+msgstr "Wunschlisten"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -2210,6 +2353,9 @@ msgid ""
 "(from Sales tab). With the second one, you set prices and computation rules "
 "from Pricelists."
 msgstr ""
+"Mit dem ersten Modus können Sie im Produktkonkonfigurationsformular (im "
+"Verkaufsverzeichnis) verschiedene Preise festlegen. Mit dem zweiten legen "
+"Sie Preise und Berechnungsregeln von Preislisten fest."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_orders_ecommerce
@@ -2221,12 +2367,12 @@ msgstr "Sie haben keine freigebene Bestellung aus dem Webshop."
 #: model:ir.actions.act_window,help:website_sale.sale_report_action_carts
 #: model:ir.actions.act_window,help:website_sale.sale_report_action_dashboard
 msgid "You don't have any order from the website."
-msgstr ""
+msgstr "Sie haben keine Bestellung von der Website."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.payment_transaction_action_payments_to_capture
 msgid "You don't have any payments to capture from the website."
-msgstr ""
+msgstr "Sie haben keine Zahlungen, die von der Website erfasst werden können."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_unpaid_orders_ecommerce
@@ -2236,12 +2382,12 @@ msgstr "Sie haben keine unbezahlte Bestellung aus dem Webshop."
 #. module: website_sale
 #: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery
 msgid "You left items in your cart."
-msgstr ""
+msgstr "Sie haben Artikel in Ihrem Warenkorb gelassen."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce
 msgid "You should send an email to revive them!"
-msgstr ""
+msgstr "Senden Sie eine E-Mail, um sie erneut zu inspirieren!"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -2271,7 +2417,7 @@ msgstr "Ihr Warenkorb ist noch leer!"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Your previous cart has already been completed."
-msgstr ""
+msgstr "Ihr vorheriger Warenkorb wurde bereits abgeschlossen."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -2281,7 +2427,7 @@ msgstr "PLZ Code"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "bpost"
-msgstr ""
+msgstr "bpost"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -2315,6 +2461,8 @@ msgstr "Stunden"
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "if you want to merge your previous cart into current cart."
 msgstr ""
+"wenn Sie Ihren vorherigen Warenkorb mit der aktuellen zusammenführen "
+"möchten."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
@@ -2322,6 +2470,8 @@ msgid ""
 "if you want to restore your previous cart. Your current cart will be "
 "replaced with your previous cart."
 msgstr ""
+"wenn Sie Ihren vorherigen Warenkorb wiederherstellen möchten. Ihr aktueller "
+"Warenkorb wird durch Ihren vorherigen Warenkorb ersetzt."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_popover
@@ -2332,6 +2482,7 @@ msgstr "Artikel)"
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_cart_abandoned_delay
 msgid "number of hours after which the cart is considered abandoned"
 msgstr ""
+"Anzahl der Stunden, nach denen der Warenkorb als verworfen betrachtet wird"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_product_attribute_value
@@ -2341,7 +2492,7 @@ msgstr "product.attribute.value"
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_product_image
 msgid "product.image"
-msgstr ""
+msgstr "product.image"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_product_style
diff --git a/addons/website_sale/i18n/es.po b/addons/website_sale/i18n/es.po
index 4fdf7cbddc4..26ed430e923 100644
--- a/addons/website_sale/i18n/es.po
+++ b/addons/website_sale/i18n/es.po
@@ -34,13 +34,14 @@
 # e2f_es_ t6 <e2f_es_t6@outlook.com>, 2017
 # Manuel Isaac <manuel.aih@hotmail.com>, 2018
 # Daniel Santibáñez Polanco <dansanti@gmail.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: Daniel Santibáñez Polanco <dansanti@gmail.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -109,6 +110,18 @@ msgid ""
 "                </div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?><div style=\"margin:auto;width:100%;\"><img "
+"src=\"/web/image/res.company/${user.company_id.id}/logo\" style=\"height: "
+"auto; width: 80px; margin-top:30px;\" alt=\"${user.company_id.name}\"/><h1 "
+"style=\"color:#A9A9A9;\"></h1><p></p><br/><br/><hr/><table "
+"width=\"100%\"><tr><td style=\"padding: 10px; width:150px;\"><img "
+"src=\"/web/image/product.product/${line.product_id.id}/image\" "
+"height=\"100px\" width=\"100px\"/></td><td><strong></strong><br/></td><td "
+"width=\"100px\" align=\"right\"></td></tr></table><hr/><br/><br/><center><a "
+"href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" "
+"style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; "
+"color: #fff; border-radius: 5px; font-size: 16px;\" "
+"class=\"o_default_snippet_text\"></a><br/><br/><br/><p><b></b></p></center></div>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -156,7 +169,7 @@ msgid ""
 "                        You can find all abandoned carts here, i.e. the carts generated by your website's visitors from over an hour ago that haven't been confirmed yet.</p>\n"
 "                        <p>You should send an email to the customers to encourage them!</p>\n"
 "                    "
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\"/><p/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -1285,12 +1298,12 @@ msgstr "Nombre"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - A to Z"
-msgstr ""
+msgstr "Nombre - A a la Z"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - Z to A"
-msgstr ""
+msgstr "Nombre - Z a la A"
 
 #. module: website_sale
 #. openerp-web
@@ -1304,7 +1317,7 @@ msgstr "Nuevo producto"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "Next <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Siguiente <span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.products
@@ -1677,12 +1690,12 @@ msgstr "Calificación"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_feedback
 msgid "Rating Last Feedback"
-msgstr ""
+msgstr "Valoración del último comentario"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_image
 msgid "Rating Last Image"
-msgstr ""
+msgstr "Valoración de la última imagen"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_value
@@ -1912,7 +1925,7 @@ msgstr "Mostrar imágenes múltiples en eCommerce"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Sign Up"
-msgstr ""
+msgstr "Registrarse"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.website_sale
diff --git a/addons/website_sale/i18n/fr.po b/addons/website_sale/i18n/fr.po
index ebda731ce9b..57674e93fbe 100644
--- a/addons/website_sale/i18n/fr.po
+++ b/addons/website_sale/i18n/fr.po
@@ -4,9 +4,9 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
@@ -14,13 +14,13 @@
 # Lucas Deliege <lud@odoo.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Clo <clo@odoo.com>, 2016
-# Cyrille de Lambert <cdelambert@teclib.com>, 2016
+# Cyrille de Lambert <cdelambert@auguria.net>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
-# Hamid Darabi <hamid.darabi@gmail.com>, 2016
+# Hamid Darabi, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Fabri Yohann <psn@fabri.pw>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
@@ -38,13 +38,14 @@
 # Xavier Symons <xsy@openerp.com>, 2017
 # fr trans <e2ffr05@hotmail.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: fr rev <e2ffr02@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -60,12 +61,12 @@ msgstr "&amp;nbsp;"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
 msgid "/shop/cart"
-msgstr ""
+msgstr "/shop/cart"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "/shop/payment"
-msgstr ""
+msgstr "/shop/payment"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
@@ -113,6 +114,37 @@ msgid ""
 "                </div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?>\n"
+"\n"
+" \n"
+" VOTRE PANIER CONTIENT UN ARTICLE.\n"
+" Voulez-vous finaliser votre achat ?<div style=\"margin:auto;width:100%;\"><img src=\"/web/image/res.company/${user.company_id.id}/logo\" style=\"height: auto; width: 80px; margin-top:30px;\" alt=\"${user.company_id.name}\"/><h1 style=\"color:#A9A9A9;\"></h1> \n"
+" % if object.order_line:\n"
+" % for line in object.order_line:\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+" ${line.product_id.display_name} ${line.name}\n"
+" \n"
+" \n"
+" ${(line.product_uom_qty) | int} ${(line.product_uom.name)}\n"
+" \n"
+" \n"
+" \n"
+" % endfor\n"
+" \n"
+" % endif\n"
+" \n"
+" \n"
+" Reprendre la commande \n"
+" Merci de faire vos achats chez ${user.company_id.name} ! \n"
+" \n"
+" \n"
+"<p></p><br/><br/><hr/><table width=\"100%\"><tr><td style=\"padding: 10px; width:150px;\"><img src=\"/web/image/product.product/${line.product_id.id}/image\" height=\"100px\" width=\"100px\"/></td><td><strong></strong><br/></td><td width=\"100px\" align=\"right\"></td></tr></table><hr/><br/><br/><center><a href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\"></a><br/><br/><br/><p><b></b></p></center></div>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -127,6 +159,8 @@ msgstr ""
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add payment acquirers"
 msgstr ""
+"<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>Ajouter des acquéreurs "
+"de paiement"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
@@ -183,7 +217,7 @@ msgstr "<small><i class=\"fa fa-trash-o\"/> Supprimer</small>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
 msgid "<span class=\"col-xs-6 text-right h4 mt0\">Total:</span>"
-msgstr ""
+msgstr "<span class=\"col-xs-6 text-right h4 mt0\">Total :</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
@@ -250,21 +284,24 @@ msgid ""
 "                                        <span class=\"visible-xs-inline\">Checkout</span>\n"
 "                                        <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
+"<span class=\"hidden-xs\">Procéder au</span> règlement\n"
+" <span class=\"visible-xs-inline\">Paiement</span>\n"
+"<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span> &amp; Shipping</span>"
-msgstr ""
+msgstr "<span>et expédition</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Billing</span>"
-msgstr ""
+msgstr "<span>Facturation</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Confirmed</span>"
-msgstr ""
+msgstr "<span>Confirmé</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -274,12 +311,12 @@ msgstr "<span>Suivant </span><span class=\"fa fa-long-arrow-right\"/>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Order</span>"
-msgstr ""
+msgstr "<span>Commande</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Review Order</span>"
-msgstr ""
+msgstr "<span>Réviser la commande</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
@@ -303,12 +340,12 @@ msgstr "<strong>Détails de la commande:</strong>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
 msgid "<strong>Payment Acquirer:</strong>"
-msgstr ""
+msgstr "<strong>Acquéreur de paiement :</strong>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<strong>Payment Information:</strong>"
-msgstr ""
+msgstr "<strong>Information de paiement:</strong>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
@@ -322,6 +359,10 @@ msgid ""
 "This should the country in which your company is headquartered or the "
 "country from which you operate your web site and mobile app."
 msgstr ""
+"Une <b>clause Droit applicable</b> informe les utilisateurs des lois qui "
+"régissent le contrat. Il doit s'agir du pays où votre entreprise a son siège"
+" ou du pays depuis lequel vous exploitez votre site Web et votre application"
+" mobile."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -331,6 +372,11 @@ msgid ""
 "be part of a very long and thorough list in your Terms and Conditions "
 "agreements so as to encompass the most amount of negative uses."
 msgstr ""
+"<b>Une clause de Limitation</b> indique aux utilisateurs qu'en acceptant "
+"d'utiliser votre service, ils s'engagent également à ne pas effectuer "
+"certaines actions. Cela peut s'inscrire dans une liste très longue et "
+"approfondie dans vos Conditions générales afin d'englober un maximum "
+"d'utilisations déconseillées."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -341,6 +387,11 @@ msgid ""
 " agreeing (or disagreeing) with the Terms and Conditions or Privacy Policies"
 " of these third parties."
 msgstr ""
+"Une clause <b>Liens vers d'autres sites Web</b> informe les utilisateurs que"
+" vous n'êtes pas responsable des sites Web tiers vers lesquels vous "
+"redirigez. Ce type de clause vise généralement à informer les utilisateurs "
+"qu'ils sont tenus de lire et d'accepter (ou non) les Conditions générales ou"
+" les Politiques de confidentialité de ces tierces parties."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -350,11 +401,15 @@ msgid ""
 "have an account with you) can be terminated in case of abuses or at your "
 "sole discretion."
 msgstr ""
+"Une clause <b>Résiliation</b> précise que les comptes utilisateurs sur votre"
+" site Web et application mobile ou l'accès des utilisateurs à votre site Web"
+" et application mobile (si les utilisateurs ne peuvent pas s'inscrire) "
+"peuvent être résiliés en cas d'abus ou à votre seule discrétion."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "A document to provide"
-msgstr ""
+msgstr "Un document à fournir"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -392,12 +447,12 @@ msgstr "Paniers abandonnés"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale
 msgid "Abandoned Carts to Recover"
-msgstr ""
+msgstr "Paniers abandonnés à récupérer"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_abandoned_delay
 msgid "Abandoned Delay"
-msgstr ""
+msgstr "Délai d'abandon"
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_accessory_product_ids
@@ -460,7 +515,7 @@ msgstr "Alternatives"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_crm_team_abandoned_carts_amount
 msgid "Amount of Abandoned Carts"
-msgstr ""
+msgstr "Nombre de paniers abandonnés"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -503,7 +558,7 @@ msgstr "Caractéristiques"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_automatic_invoice
 msgid "Automatic Invoice"
-msgstr ""
+msgstr "Facture automatique"
 
 #. module: website_sale
 #. openerp-web
@@ -545,14 +600,14 @@ msgstr ""
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_can_directly_mark_as_paid
 msgid "Can be directly marked as paid"
-msgstr ""
+msgstr "Peut être directement marqué comme payé"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14
 #, python-format
 msgid "Capture order payments when the delivery is completed."
-msgstr ""
+msgstr "Capturez le paiement des commandes une fois la livraison effectuée."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_quantity
@@ -562,17 +617,17 @@ msgstr "Quantité du panier"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_cart_recovery_mail_template
 msgid "Cart Recovery Email"
-msgstr ""
+msgstr "E-mail de récupération du panier"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Cart are considered abandoned after"
-msgstr ""
+msgstr "Les paniers sont considérés comme abandonnés au bout de"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_recovery_email_sent
 msgid "Cart recovery email already sent"
-msgstr ""
+msgstr "E-mail de récupération du panier déjà envoyé"
 
 #. module: website_sale
 #. openerp-web
@@ -590,12 +645,12 @@ msgstr "Catalogue"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: High to Low"
-msgstr ""
+msgstr "Prix catalogue : décroissant"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: Low to High"
-msgstr ""
+msgstr "Prix catalogue : croissant"
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.product_public_category_action
@@ -627,6 +682,8 @@ msgid ""
 "Checked if the sales order can directly be marked as paid, i.e. if the quotation\n"
 "                is sent or confirmed and if the payment acquire is of the type transfer or manual"
 msgstr ""
+"Coché si le bon de commande peut directement être marqué comme payé, c'est-à-dire si le devis\n"
+" est envoyé ou confirmé et si l'acquéreur de paiement est de type transfert ou manuel"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_child_id
@@ -690,32 +747,32 @@ msgstr "Nom de la société"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with DHL"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec DHL"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with FedEx"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec FedEx"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with UPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec UPS"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with USPS"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec USPS"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs and ship with bpost"
-msgstr ""
+msgstr "Calculer les frais de port et expédier avec bpost"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Compute shipping costs on orders"
-msgstr ""
+msgstr "Calculer les frais de port des commandes"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
@@ -737,7 +794,7 @@ msgstr "Confirmez la commande <span class=\"fa fa-long-arrow-right\"/>"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:6
 #, python-format
 msgid "Confirm orders when you get paid."
-msgstr ""
+msgstr "Confirmez les commandes lorsque vous êtes payé."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -752,7 +809,7 @@ msgstr "Confirmation<span class=\"chevron\"/>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "Confirmed Orders"
-msgstr ""
+msgstr "Commandes confirmées"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_res_partner
@@ -765,7 +822,7 @@ msgstr "Contact"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:97
 #, python-format
 msgid "Conversion"
-msgstr ""
+msgstr "Conversion"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_res_country
@@ -800,7 +857,7 @@ msgstr "Devises"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Customer Experience"
-msgstr ""
+msgstr "Expérience client"
 
 #. module: website_sale
 #: model:ir.ui.menu,name:website_sale.menu_orders_customers
@@ -831,11 +888,12 @@ msgstr "Taxes à la vente par défaut"
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Default recovery email to send when a cart is abandoned"
 msgstr ""
+"E-mail de récupération par défaut à envoyer quand un panier est abandonné"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Default sales tax applied to local transactions"
-msgstr ""
+msgstr "Taxe de vente par défaut appliquée aux transactions locales"
 
 #. module: website_sale
 #: selection:res.config.settings,sale_delivery_settings:0
@@ -876,7 +934,7 @@ msgstr "Affichez un carousel d'images sur les pages d'article"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Display crossed-out public prices"
-msgstr ""
+msgstr "Afficher les prix publics barrés"
 
 #. module: website_sale
 #. openerp-web
@@ -920,7 +978,7 @@ msgstr "Assistant de composition d'emails"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Email for Abandoned carts"
-msgstr ""
+msgstr "E-mail concernant les paniers abandonnés"
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_order_mail_template
@@ -930,7 +988,7 @@ msgstr "Courriel envoyé au client à la fin du processus de commande"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Email sent to the customer after the checkout"
-msgstr ""
+msgstr "E-mail envoyé au client après le paiement"
 
 #. module: website_sale
 #. openerp-web
@@ -990,7 +1048,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Generate the invoice automatically when the order is confirmed"
-msgstr ""
+msgstr "Générer la facture automatiquement lorsque la commande est confirmée"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
@@ -1020,7 +1078,7 @@ msgstr "Routage HTTP"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.reduction_code
 msgid "Have a promo code? Fill in this field and apply."
-msgstr ""
+msgstr "Vous avez un code promo ? Remplissez ce champ et validez."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_attribute_value_html_color
@@ -1083,6 +1141,14 @@ msgid ""
 "will respond to any DMCA take down notices received and you will take down "
 "the content."
 msgstr ""
+"Si votre site Web ou vos applications mobiles permettent aux utilisateurs de"
+" créer du contenu et de le mettre à disposition des autres utilisateurs, un "
+"article <b>Contenu</b> informe les utilisateurs qu'ils détiennent les droits"
+" relatifs au contenu créé par leurs soins.<br/> La clause « Contenu » "
+"mentionne généralement que les utilisateurs doivent accorder au développeur "
+"du site Web ou de l'application mobile le droit de partager ce contenu sur "
+"leur site Web/application mobile pour le mettre à la disposition d'autres "
+"utilisateurs.<br/> "
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_image
@@ -1105,7 +1171,7 @@ msgstr "Images"
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_module_website_sale_stock
 msgid "Installs *e-Commerce Inventory*"
-msgstr ""
+msgstr "Installation d'*e-Commerce Inventory*"
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/main.py:501
@@ -1133,13 +1199,15 @@ msgstr "Facturation"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Issue invoices to customers"
-msgstr ""
+msgstr "Émettre des factures aux clients"
 
 #. module: website_sale
 #: code:addons/website_sale/models/sale_order.py:157
 #, python-format
 msgid "It is forbidden to modify a sales order which is not in draft status"
 msgstr ""
+"Il est interdit de modifier un bon de commande qui n'a pas le statut de "
+"brouillon"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image___last_update
@@ -1157,7 +1225,7 @@ msgstr "Le mois dernier"
 #: model:ir.model.fields,field_description:website_sale.field_res_partner_last_website_so_id
 #: model:ir.model.fields,field_description:website_sale.field_res_users_last_website_so_id
 msgid "Last Online Sales Order"
-msgstr ""
+msgstr "Dernier bon de commande en ligne"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_write_uid
@@ -1199,7 +1267,7 @@ msgstr "Laissez le client entrer une adresse de livraison"
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:15
 #, python-format
 msgid "Let's create your first product."
-msgstr ""
+msgstr "Créons votre premier produit."
 
 #. module: website_sale
 #. openerp-web
@@ -1209,16 +1277,18 @@ msgid ""
 "Let's now take a look at your administration dashboard to get your eCommerce"
 " website ready in no time."
 msgstr ""
+"Jetons maintenant un œil à votre tableau de bord administrateur pour que "
+"votre site Web d'e-commerce soit prêt en un rien de temps."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "Log In"
-msgstr ""
+msgstr "Connexion"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Manage availability of products"
-msgstr ""
+msgstr "Gérer la disponibilité des produits"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1228,7 +1298,7 @@ msgstr "Gérer les promotions et campagnes de bons de réduction"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_order_view_form
 msgid "Mark as Paid"
-msgstr ""
+msgstr "Marquer comme payé"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_image_medium
@@ -1268,12 +1338,12 @@ msgstr "Nom"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - A to Z"
-msgstr ""
+msgstr "Nom : de A à Z"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Name - Z to A"
-msgstr ""
+msgstr "Nom : de Z à A"
 
 #. module: website_sale
 #. openerp-web
@@ -1287,7 +1357,7 @@ msgstr "Nouvel article"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "Next <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Suivant<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.products
@@ -1307,7 +1377,7 @@ msgstr "Pas de site web"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "Now to Follow Your Order"
-msgstr ""
+msgstr "Maintenant pour suivre votre commande"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_crm_team_abandoned_carts_count
@@ -1327,6 +1397,9 @@ msgid ""
 "Once activated, discounted prices can be applied from Pricelists setup form "
 "(Discount policy field)."
 msgstr ""
+"Une fois cette option activée, les tarifs réduits peuvent être appliqués "
+"depuis le formulaire de configuration des listes de prix (champ Politique de"
+" remise)."
 
 #. module: website_sale
 #. openerp-web
@@ -1352,7 +1425,7 @@ msgstr "Services seulement"
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:68
 #, python-format
 msgid "Open your website app here."
-msgstr ""
+msgstr "Ouvrez l'application de votre site Web ici."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_options
@@ -1444,14 +1517,14 @@ msgstr "Paiement<span class=\"chevron\"/>"
 #. module: website_sale
 #: model:ir.actions.act_window,name:website_sale.payment_transaction_action_payments_to_capture
 msgid "Payments To Capture"
-msgstr ""
+msgstr "Paiements à capturer"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:15
 #, python-format
 msgid "Payments to Capture"
-msgstr ""
+msgstr "Paiements à capturer"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -1461,7 +1534,7 @@ msgstr "Téléphone"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Please proceed your current cart."
-msgstr ""
+msgstr "Continuez avec votre panier actuel."
 
 #. module: website_sale
 #: code:addons/website_sale/controllers/backend.py:108
@@ -1533,7 +1606,7 @@ msgstr "Catalogue d'articles"
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_comparison
 msgid "Product Comparison Tool"
-msgstr ""
+msgstr "Outil de comparaison des produits"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product_template_form_view
@@ -1602,6 +1675,10 @@ msgid ""
 "do so, attach some files to a product using the new Files button and publish"
 " them."
 msgstr ""
+"Fournissez aux clients des liens ou du contenu téléchargeable spécifiques "
+"aux produits sur la page de confirmation de la procédure de paiement si ce "
+"dernier aboutit. Pour ce faire, joignez des fichiers à un produit en "
+"utilisant le nouveau bouton Fichiers et publiez-les."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product_template_search_view_website
@@ -1686,7 +1763,7 @@ msgstr "Raison de l'évaluation"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
 msgid "Recovery Email to Send"
-msgstr ""
+msgstr "E-mail de récupération à envoyer"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_product_tmpl_id
@@ -1716,7 +1793,7 @@ msgstr "Vente"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_report_view_graph_website
 msgid "Sale Report"
-msgstr ""
+msgstr "Rapport de vente"
 
 #. module: website_sale
 #. openerp-web
@@ -1741,7 +1818,7 @@ msgstr "Equipe de vente"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_report_view_pivot_website
 msgid "Sales Report"
-msgstr ""
+msgstr "Rapport de ventes"
 
 #. module: website_sale
 #. openerp-web
@@ -1749,7 +1826,7 @@ msgstr ""
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:44
 #, python-format
 msgid "Sales Since Last"
-msgstr ""
+msgstr "Ventes depuis"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_salesperson_id
@@ -1779,6 +1856,8 @@ msgid ""
 "Select optional products from the configuration form of your main products "
 "(in Sales tab)."
 msgstr ""
+"Sélectionnez des produits optionnels depuis le formulaire de configuration "
+"de vos produits principaux (dans l'onglet Ventes)."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
@@ -1793,7 +1872,7 @@ msgstr "Sélectionnable"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Sell content to download or URL links"
-msgstr ""
+msgstr "Vendre du contenu à télécharger ou des liens URL"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1803,12 +1882,12 @@ msgstr "Vendez en plusieurs devises"
 #. module: website_sale
 #: model:ir.actions.server,name:website_sale.ir_actions_server_sale_cart_recovery_email
 msgid "Send a Cart Recovery Email"
-msgstr ""
+msgstr "Envoyer un e-mail de récupération du panier"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sale_order_view_form_cart_recovery
 msgid "Send a Recovery Email"
-msgstr ""
+msgstr "Envoyer un e-mail de récupération"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1821,6 +1900,8 @@ msgstr ""
 #, python-format
 msgid "Send a recovery email to visitors who haven't completed their order."
 msgstr ""
+"Envoyez un e-mail de récupération aux visiteurs qui n'ont pas terminé leur "
+"commande."
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_public_category_sequence
@@ -1879,7 +1960,7 @@ msgstr "Magasin- Confirmé"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "Shop - Select Payment Acquirer"
-msgstr ""
+msgstr "Boutique – Sélectionner l'acquéreur de paiement"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
@@ -2062,6 +2143,8 @@ msgid ""
 "The mode selected here applies as invoicing policy of any new product "
 "created but not of products already existing."
 msgstr ""
+"Le mode sélectionné ici s'applique en tant que politique de facturation de "
+"tout nouveau produit créé, mais pas pour les produits existants."
 
 #. module: website_sale
 #: code:addons/website_sale/models/sale_order.py:258
@@ -2070,13 +2153,15 @@ msgid ""
 "The quote should be sent and the payment acquirer type should be manual or "
 "wire transfer"
 msgstr ""
+"Le devis doit être envoyé et l'acquéreur de paiement doit être manuel ou de "
+"type virement bancaire"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:51
 #, python-format
 msgid "There is no recent confirmed order."
-msgstr ""
+msgstr "Aucune commande confirmée récemment."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -2087,7 +2172,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
 msgid "This combination does not exist."
-msgstr ""
+msgstr "Cette combinaison n'existe pas."
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_public_category_image
@@ -2101,7 +2186,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "This is your current cart."
-msgstr ""
+msgstr "Voici votre panier actuel."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -2111,7 +2196,7 @@ msgstr "Ce code promotionnel n'est pas disponible"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "This tax is applied to any new product created in the catalog."
-msgstr ""
+msgstr "Cette taxe s'applique à tout nouveau produit créé dans le catalogue."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -2158,14 +2243,14 @@ msgstr "Commandes non payées"
 #: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
 #, python-format
 msgid "Untaxed Total Sold"
-msgstr ""
+msgstr "Vente totale hors taxes"
 
 #. module: website_sale
 #. openerp-web
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
 #, python-format
 msgid "Upload an image from your local library."
-msgstr ""
+msgstr "Importez une image de votre bibliothèque locale."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_popover
@@ -2235,7 +2320,7 @@ msgstr "Prix web"
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_price_difference
 #: model:ir.model.fields,field_description:website_sale.field_product_template_website_price_difference
 msgid "Website price difference"
-msgstr ""
+msgstr "Différence de prix sur le site  Web"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_product_website_public_price
@@ -2251,12 +2336,12 @@ msgstr "Sites web"
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_crm_team_website_ids
 msgid "Websites using this sales channel"
-msgstr ""
+msgstr "Sites web utilisant ce canal de vente"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings_module_website_sale_wishlist
 msgid "Wishlists"
-msgstr ""
+msgstr "Listes d'envies"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -2265,6 +2350,9 @@ msgid ""
 "(from Sales tab). With the second one, you set prices and computation rules "
 "from Pricelists."
 msgstr ""
+"Avec le premier mode, vous pouvez définir plusieurs prix dans le formulaire "
+"de configuration produit (onglet Ventes). Avec le deuxième, vous fixez les "
+"prix et les règles de calcul depuis les listes de prix."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_orders_ecommerce
@@ -2276,12 +2364,12 @@ msgstr "Vous n'avez pas de commande confirmée sur le site web."
 #: model:ir.actions.act_window,help:website_sale.sale_report_action_carts
 #: model:ir.actions.act_window,help:website_sale.sale_report_action_dashboard
 msgid "You don't have any order from the website."
-msgstr ""
+msgstr "Vous n'avez passé aucune commande sur le site Web."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.payment_transaction_action_payments_to_capture
 msgid "You don't have any payments to capture from the website."
-msgstr ""
+msgstr "Vous n'avez pas de paiements à capturer depuis le site Web."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_unpaid_orders_ecommerce
@@ -2291,7 +2379,7 @@ msgstr "Vous n'avez pas de commande impayée sur le site web."
 #. module: website_sale
 #: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery
 msgid "You left items in your cart."
-msgstr ""
+msgstr "Vous avez laissé des articles dans votre panier."
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce
@@ -2326,7 +2414,7 @@ msgstr "Votre panier est vide !"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "Your previous cart has already been completed."
-msgstr ""
+msgstr "Votre précédent panier a déjà été réglé."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -2336,7 +2424,7 @@ msgstr "Code postal"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "bpost"
-msgstr ""
+msgstr "bpost"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.coupon_form
@@ -2354,7 +2442,7 @@ msgstr "eCommerce"
 #: model:ir.ui.menu,name:website_sale.menu_catalog_categories
 #: model:ir.ui.view,arch_db:website_sale.product_template_form_view
 msgid "eCommerce Categories"
-msgstr ""
+msgstr "Catégories d'e-commerce"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.search count
@@ -2370,6 +2458,7 @@ msgstr "heures"
 #: model:ir.ui.view,arch_db:website_sale.cart
 msgid "if you want to merge your previous cart into current cart."
 msgstr ""
+"si vous voulez fusionner votre précédent panier et votre panier actuel."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
@@ -2377,6 +2466,8 @@ msgid ""
 "if you want to restore your previous cart. Your current cart will be "
 "replaced with your previous cart."
 msgstr ""
+"si vous voulez restaurer votre précédent panier. Votre panier actuel sera "
+"remplacé par votre précédent panier."
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_popover
@@ -2386,7 +2477,7 @@ msgstr "articles)"
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_res_config_settings_cart_abandoned_delay
 msgid "number of hours after which the cart is considered abandoned"
-msgstr ""
+msgstr "nombre d'heures au bout duquel le panier est réputé abandonné"
 
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_product_attribute_value
diff --git a/addons/website_sale/i18n/zh_CN.po b/addons/website_sale/i18n/zh_CN.po
index 469c140b95b..0fe5f7899f3 100644
--- a/addons/website_sale/i18n/zh_CN.po
+++ b/addons/website_sale/i18n/zh_CN.po
@@ -27,13 +27,14 @@
 # Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 14:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+0000\n"
-"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -62,7 +63,7 @@ msgid ""
 "30-day money-back guarantee<br/>\n"
 "                              Free Shipping in U.S.<br/>\n"
 "                              Buy now, get in 2 days"
-msgstr ""
+msgstr "<br/><br/>"
 
 #. module: website_sale
 #: model:mail.template,body_html:website_sale.mail_template_sale_cart_recovery
@@ -99,6 +100,18 @@ msgid ""
 "                </div>\n"
 "            "
 msgstr ""
+"<?xml version=\"1.0\"?><div style=\"margin:auto;width:100%;\"><img "
+"src=\"/web/image/res.company/${user.company_id.id}/logo\" style=\"height: "
+"auto; width: 80px; margin-top:30px;\" alt=\"${user.company_id.name}\"/><h1 "
+"style=\"color:#A9A9A9;\"></h1><p></p><br/><br/><hr/><table "
+"width=\"100%\"><tr><td style=\"padding: 10px; width:150px;\"><img "
+"src=\"/web/image/product.product/${line.product_id.id}/image\" "
+"height=\"100px\" width=\"100px\"/></td><td><strong></strong><br/></td><td "
+"width=\"100px\" align=\"right\"></td></tr></table><hr/><br/><br/><center><a "
+"href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" "
+"style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; "
+"color: #fff; border-radius: 5px; font-size: 16px;\" "
+"class=\"o_default_snippet_text\"></a><br/><br/><br/><p><b></b></p></center></div>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
@@ -112,7 +125,7 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.payment
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add payment acquirers"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address_kanban
@@ -122,7 +135,7 @@ msgstr "<i class=\"fa fa-check\"/> 送货到此地址"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
 msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Add an address"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-plus-square\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
@@ -134,7 +147,7 @@ msgstr "<i class=\"fa fa-print\"/> 打印"
 msgid ""
 "<i class=\"fa fa-shopping-cart\"/>\n"
 "                    My Cart"
-msgstr ""
+msgstr "<i class=\"fa fa-shopping-cart\"/>"
 
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:58
@@ -144,14 +157,14 @@ msgid ""
 "                        You can find all abandoned carts here, i.e. the carts generated by your website's visitors from over an hour ago that haven't been confirmed yet.</p>\n"
 "                        <p>You should send an email to the customers to encourage them!</p>\n"
 "                    "
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\"/><p/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
 msgid ""
 "<small class=\"text-muted pull-right\">Source: https://termsfeed.com/blog"
 "/sample-terms-and-conditions-template</small>"
-msgstr ""
+msgstr "<small class=\"text-muted pull-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart_lines
@@ -161,7 +174,7 @@ msgstr "<small><i class=\"fa fa-trash-o\"/> 移除</small>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
 msgid "<span class=\"col-xs-6 text-right h4 mt0\">Total:</span>"
-msgstr ""
+msgstr "<span class=\"col-xs-6 text-right h4 mt0\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.total
@@ -183,6 +196,8 @@ msgid ""
 "<span class=\"fa fa-chevron-left\" aria-hidden=\"true\"/>\n"
 "                                            <span class=\"sr-only\">Previous</span>"
 msgstr ""
+"<span aria-hidden=\"true\" class=\"fa fa-chevron-left\"/><span class=\"sr-"
+"only\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.product
@@ -190,6 +205,8 @@ msgid ""
 "<span class=\"fa fa-chevron-right\" aria-hidden=\"true\"/>\n"
 "                                            <span class=\"sr-only\">Next</span>"
 msgstr ""
+"<span aria-hidden=\"true\" class=\"fa fa-chevron-right\"/><span class=\"sr-"
+"only\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.continue_shopping
@@ -198,16 +215,18 @@ msgid ""
 "                <span class=\"hidden-xs\">Continue Shopping</span>\n"
 "                <span class=\"visible-xs-inline\">Continue</span>"
 msgstr ""
+"<span class=\"fa fa-long-arrow-left\"/><span class=\"hidden-xs\"/><span "
+"class=\"visible-xs-inline\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "<span class=\"fa fa-long-arrow-left\"/> Back"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-left\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "<span class=\"fa fa-long-arrow-left\"/> Previous"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-left\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.checkout
@@ -221,43 +240,45 @@ msgid ""
 "                                        <span class=\"visible-xs-inline\">Checkout</span>\n"
 "                                        <span class=\"fa fa-long-arrow-right\"/>"
 msgstr ""
+"<span class=\"hidden-xs\"/><span class=\"visible-xs-inline\"/><span "
+"class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span> &amp; Shipping</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Billing</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Confirmed</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "<span>Next </span><span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "<span/><span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Order</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Review Order</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid ""
 "<span>Sort by</span>\n"
 "                        <span class=\"caret\"/>"
-msgstr ""
+msgstr "<span/><span class=\"caret\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.suggested_products_list
@@ -272,12 +293,12 @@ msgstr "<strong>订单详情:</strong>"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
 msgid "<strong>Payment Acquirer:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<strong>Payment Information:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
@@ -290,7 +311,7 @@ msgid ""
 "A <b>Governing Law</b> will inform users which laws govern the agreement. "
 "This should the country in which your company is headquartered or the "
 "country from which you operate your web site and mobile app."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -299,7 +320,7 @@ msgid ""
 " use your service, they’re also agreeing to not do certain things. This can "
 "be part of a very long and thorough list in your Terms and Conditions "
 "agreements so as to encompass the most amount of negative uses."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -309,7 +330,7 @@ msgid ""
 "clause will generally inform users that they are responsible for reading and"
 " agreeing (or disagreeing) with the Terms and Conditions or Privacy Policies"
 " of these third parties."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.terms
@@ -318,7 +339,7 @@ msgid ""
 " and mobile app or users’ access to your website and mobile (if users can’t "
 "have an account with you) can be terminated in case of abuses or at your "
 "sole discretion."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
@@ -590,7 +611,7 @@ msgstr "城市"
 #: model:ir.ui.view,arch_db:website_sale.products
 msgid ""
 "Click <i>'New'</i> in the top-right corner to create your first product."
-msgstr ""
+msgstr "<i/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.cart
@@ -890,7 +911,7 @@ msgstr "错误！您不能创建循环类别。"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info_option
 msgid "Extra Info<span class=\"chevron\"/>"
-msgstr ""
+msgstr "<span class=\"chevron\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
@@ -1010,7 +1031,7 @@ msgid ""
 "authors that, if any content is found to be a copyright infringement, you "
 "will respond to any DMCA take down notices received and you will take down "
 "the content."
-msgstr ""
+msgstr "<b/><br/><br/>"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_product_image_image
@@ -1210,7 +1231,7 @@ msgstr "新产品"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
 msgid "Next <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "<span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.products
@@ -1256,7 +1277,7 @@ msgstr ""
 #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:55
 #, python-format
 msgid "Once you click on <b>Save</b>, your product is updated."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:39
@@ -1689,7 +1710,7 @@ msgstr "选择"
 msgid ""
 "Select <b>New Product</b> to create it and manage its properties to boost "
 "your sales."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
@@ -1959,7 +1980,7 @@ msgid ""
 "The <b>Intellectual Property</b> disclosure will inform users that the "
 "contents, logo and other visual media you created is your property and is "
 "protected by copyright laws."
-msgstr ""
+msgstr "<b/>"
 
 #. module: website_sale
 #: model:ir.model.fields,help:website_sale.field_product_product_website_url
@@ -2215,7 +2236,7 @@ msgstr "你的地址"
 msgid ""
 "Your Address\n"
 "                                        <small> or </small>"
-msgstr ""
+msgstr "<small/>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.extra_info
diff --git a/addons/website_sale_comparison/i18n/zh_CN.po b/addons/website_sale_comparison/i18n/zh_CN.po
index 16a9be03205..c8cf7855eb8 100644
--- a/addons/website_sale_comparison/i18n/zh_CN.po
+++ b/addons/website_sale_comparison/i18n/zh_CN.po
@@ -3,19 +3,20 @@
 # * website_sale_comparison
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
 # Si Ling Lau <happy8645@hotmail.com>, 2017
 # liAnGjiA <liangjia@qq.com>, 2017
 # glovebx <ruinning@163.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -85,22 +86,22 @@ msgstr ""
 #. module: website_sale_comparison
 #: model:ir.ui.view,arch_db:website_sale_comparison.recommended_product
 msgid "<i class=\"fa fa-exchange\"/> Compare"
-msgstr ""
+msgstr "<i class=\"fa fa-exchange\"/>"
 
 #. module: website_sale_comparison
 #: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
 msgid "<i class=\"fa fa-shopping-cart\"/>&amp;nbsp;Add to Cart"
-msgstr ""
+msgstr "<i class=\"fa fa-shopping-cart\"/>"
 
 #. module: website_sale_comparison
 #: model:ir.ui.view,arch_db:website_sale_comparison.recommended_product
 msgid "<span class=\"h3\">Suggested alternatives: </span>"
-msgstr ""
+msgstr "<span class=\"h3\"/>"
 
 #. module: website_sale_comparison
 #: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
 msgid "<strong>Price:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: website_sale_comparison
 #: model:product.attribute.value,name:website_sale_comparison.product_attribute_value_17
diff --git a/addons/website_sale_delivery/i18n/de.po b/addons/website_sale_delivery/i18n/de.po
index 10ece125c81..52818085eb6 100644
--- a/addons/website_sale_delivery/i18n/de.po
+++ b/addons/website_sale_delivery/i18n/de.po
@@ -4,21 +4,22 @@
 # 
 # Translators:
 # Felix Schubert <felix.schubert@go-erp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
+# Renzo Meister, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: DE R1 <e2fes1@hotmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,18 +34,20 @@ msgid ""
 "%s does not ship to your address, please choose another one.\n"
 "(Error: %s)"
 msgstr ""
+"%s versendet nicht an Ihre Adresse. Bitte wählen Sie eine andere.\n"
+"(Error: %s)"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add delivery methods"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid ""
 "<span class=\"badge pull-right o_delivery_compute\">Select to compute "
 "delivery rate</span>"
-msgstr ""
+msgstr "<span class=\"badge pull-right o_delivery_compute\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
@@ -63,6 +66,9 @@ msgid ""
 " This description will be copied to every Sales Order, Delivery Order and "
 "Customer Invoice/Credit Note"
 msgstr ""
+"Eine Beschreibung des Produkts, die Sie Ihren Kunden mitteilen möchten. "
+"Diese Beschreibung wird in jeden Verkaufsauftrag, Lieferauftrag und jede "
+"Kundenrechnung/Kreditanmerkung kopiert."
 
 #. module: website_sale_delivery
 #: model:ir.model,name:website_sale_delivery.model_delivery_carrier
@@ -72,7 +78,7 @@ msgstr "Frachtführer"
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid "Choose a delivery method"
-msgstr ""
+msgstr "Wählen Sie eine Liefermethode."
 
 #. module: website_sale_delivery
 #: model:ir.model,name:website_sale_delivery.model_res_country
@@ -103,12 +109,12 @@ msgstr "Beschreibung"
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery
 msgid "Description displayed on the eCommerce and on online quotations."
-msgstr ""
+msgstr "Beschreibung wird im E-Commerce und auf Online-Angeboten angezeigt."
 
 #. module: website_sale_delivery
 #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_description
 msgid "Description for Online Quotations"
-msgstr ""
+msgstr "Beschreibung für Online-Angebote"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
@@ -123,12 +129,12 @@ msgstr "Verfügbar"
 #. module: website_sale_delivery
 #: model:ir.model.fields,help:website_sale_delivery.field_sale_order_has_delivery
 msgid "Has an order line set for delivery"
-msgstr ""
+msgstr "Auftragszeile für Lieferung vorhanden"
 
 #. module: website_sale_delivery
 #: model:ir.model.fields,field_description:website_sale_delivery.field_sale_order_has_delivery
 msgid "Has delivery"
-msgstr ""
+msgstr "Lieferung vorhanden"
 
 #. module: website_sale_delivery
 #: code:addons/website_sale_delivery/controllers/main.py:42
@@ -145,7 +151,7 @@ msgstr ""
 #: code:addons/website_sale_delivery/controllers/main.py:49
 #, python-format
 msgid "Ouch, you cannot choose this carrier!"
-msgstr ""
+msgstr "Leider können Sie diesen Lieferanten nicht wählen."
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_search_inherit_website_sale_delivery
@@ -171,7 +177,7 @@ msgstr "Nettobetrag"
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.portal_order_page_shipping_tracking
 msgid "Tracking:"
-msgstr ""
+msgstr "Tracking:"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
diff --git a/addons/website_sale_delivery/i18n/es.po b/addons/website_sale_delivery/i18n/es.po
index 8be46e06239..4170d180b4e 100644
--- a/addons/website_sale_delivery/i18n/es.po
+++ b/addons/website_sale_delivery/i18n/es.po
@@ -7,19 +7,20 @@
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Rafael Blasco <rafabn@antiun.com>, 2016
 # Jose Manuel <admin@jaboweb.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -38,14 +39,14 @@ msgstr ""
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add delivery methods"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid ""
 "<span class=\"badge pull-right o_delivery_compute\">Select to compute "
 "delivery rate</span>"
-msgstr ""
+msgstr "<span class=\"badge pull-right o_delivery_compute\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
diff --git a/addons/website_sale_delivery/i18n/fr.po b/addons/website_sale_delivery/i18n/fr.po
index 009e1f0685d..e687c88a28a 100644
--- a/addons/website_sale_delivery/i18n/fr.po
+++ b/addons/website_sale_delivery/i18n/fr.po
@@ -6,7 +6,7 @@
 # Xavier Belmere <Info@cartmeleon.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Francis Ndong <francissimel@hotmail.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2017
@@ -14,13 +14,14 @@
 # lap.odoo <lap@odoo.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -39,14 +40,14 @@ msgstr ""
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add delivery methods"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid ""
 "<span class=\"badge pull-right o_delivery_compute\">Select to compute "
 "delivery rate</span>"
-msgstr ""
+msgstr "<span class=\"badge pull-right o_delivery_compute\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
@@ -64,6 +65,9 @@ msgid ""
 " This description will be copied to every Sales Order, Delivery Order and "
 "Customer Invoice/Credit Note"
 msgstr ""
+"Une description du produit que vous souhaitez communiquer à vos clients. "
+"Cette description sera copiée sur chaque bon de commande, bon de livraison "
+"et note de crédit/facture client"
 
 #. module: website_sale_delivery
 #: model:ir.model,name:website_sale_delivery.model_delivery_carrier
diff --git a/addons/website_sale_delivery/i18n/zh_CN.po b/addons/website_sale_delivery/i18n/zh_CN.po
index d5a3266984d..3a761f4f19c 100644
--- a/addons/website_sale_delivery/i18n/zh_CN.po
+++ b/addons/website_sale_delivery/i18n/zh_CN.po
@@ -6,19 +6,21 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # mrshelly <mrshelly@hotmail.com>, 2016
 # 钟小华 <mackz@sina.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# fausthuang, 2016
+# Martin Trigaux, 2016
 # Talway <9010446@qq.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # 菜小蛇 <lttlsnk@gmail.com>, 2017
 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
+# Tison He <hedisen@sina.com>, 2018
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-10 11:35+0000\n"
 "PO-Revision-Date: 2017-10-10 11:35+0000\n"
-"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -37,14 +39,14 @@ msgstr ""
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add delivery methods"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-arrow-right\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
 msgid ""
 "<span class=\"badge pull-right o_delivery_compute\">Select to compute "
 "delivery rate</span>"
-msgstr ""
+msgstr "<span class=\"badge pull-right o_delivery_compute\"/>"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
@@ -112,7 +114,7 @@ msgstr "在线报价单的描述"
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
 msgid "FedEx Delivery Methods"
-msgstr ""
+msgstr "FedEx 交货方式"
 
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
@@ -182,4 +184,4 @@ msgstr "在网站可见"
 #. module: website_sale_delivery
 #: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
 msgid "bpost Delivery Methods"
-msgstr ""
+msgstr "Bpost运输方式"
diff --git a/addons/website_sale_digital/i18n/de.po b/addons/website_sale_digital/i18n/de.po
index 7732edbf7dd..02000412be4 100644
--- a/addons/website_sale_digital/i18n/de.po
+++ b/addons/website_sale_digital/i18n/de.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Maik Steinfeld <info@streward.de>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +64,7 @@ msgstr "Digitale Anhänge"
 #: model:ir.model.fields,field_description:website_sale_digital.field_ir_attachment_product_downloadable
 #: model:ir.model.fields,field_description:website_sale_digital.field_mrp_document_product_downloadable
 msgid "Downloadable from product portal"
-msgstr ""
+msgstr "Kann vom Produktportal heruntergeladen werden."
 
 #. module: website_sale_digital
 #: model:ir.ui.view,arch_db:website_sale_digital.portal_order_page_downloads
@@ -90,7 +91,7 @@ msgstr "Roman von Lewis Caroll."
 #: model:ir.ui.view,arch_db:website_sale_digital.product_product_view_form_inherit_digital
 #: model:ir.ui.view,arch_db:website_sale_digital.product_template_view_form_inherit_digital
 msgid "Portal Files"
-msgstr ""
+msgstr "Portal-Dateien"
 
 #. module: website_sale_digital
 #: model:ir.model,name:website_sale_digital.model_product_product
diff --git a/addons/website_sale_options/i18n/de.po b/addons/website_sale_options/i18n/de.po
index ccdc46ea31c..dab6c46cad3 100644
--- a/addons/website_sale_options/i18n/de.po
+++ b/addons/website_sale_options/i18n/de.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Maik Steinfeld <info@streward.de>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Niki Waibel <niki.waibel@gmail.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,21 +50,23 @@ msgid ""
 "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Proceed "
 "to Checkout</span><span class=\"visible-xs-inline\">Checkout</span>"
 msgstr ""
+"<i class=\"fa fa-shopping-cart fa-fw\"/><span class=\"hidden-xs\"/><span "
+"class=\"visible-xs-inline\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<small>Remove <span class=\"hidden-xs\"> from Cart</span></small>"
-msgstr ""
+msgstr "<small><span class=\"hidden-xs\"/></small>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<span class=\"js_item\">1 </span><span class=\"js_items hidden\">5 </span>"
-msgstr ""
+msgstr "<span class=\"js_item\"/><span class=\"js_items hidden\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<strong>Add<span class=\"hidden-xs\"> to Cart</span></strong>"
-msgstr ""
+msgstr "<strong><span class=\"hidden-xs\"/></strong>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
@@ -84,13 +87,13 @@ msgstr "Verknüpfte Auftragsposition"
 #: code:addons/website_sale_options/models/sale_order.py:46
 #, python-format
 msgid "Option for:"
-msgstr ""
+msgstr "Option für:"
 
 #. module: website_sale_options
 #: code:addons/website_sale_options/models/sale_order.py:48
 #, python-format
 msgid "Option:"
-msgstr ""
+msgstr "Option:"
 
 #. module: website_sale_options
 #: model:ir.model.fields,field_description:website_sale_options.field_product_product_optional_product_ids
@@ -105,6 +108,9 @@ msgid ""
 "Optional Products are suggested whenever the customer hits *Add to Cart* "
 "(cross-sell strategy, e.g. for computers: warranty, software, etc.)."
 msgstr ""
+"Optionale Produkte werden vorgeschlagen, wenn der Kunde auf „Zu Warenkorb "
+"hinzufügen“ klickt (Cross-Selling-Strategie, z. B. für Computer: Garantie, "
+"Software usw.)."
 
 #. module: website_sale_options
 #: model:ir.model.fields,field_description:website_sale_options.field_sale_order_line_option_line_ids
diff --git a/addons/website_sale_options/i18n/fr.po b/addons/website_sale_options/i18n/fr.po
index 243fe34f848..d187f003e4f 100644
--- a/addons/website_sale_options/i18n/fr.po
+++ b/addons/website_sale_options/i18n/fr.po
@@ -3,20 +3,21 @@
 # * website_sale_options
 # 
 # Translators:
-# Xavier Belmere <Info@cartmeleon.com>, 2017
-# Richard Mathot <rim@odoo.com>, 2017
+# Xavier Belmere <Info@cartmeleon.com>, 2016
+# Richard Mathot <rim@odoo.com>, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Nancy Bolognesi <nb@microcom.ca>, 2016
+# Martin Trigaux, 2016
 # Lucas Deliege <lud@openerp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Nancy Bolognesi <nb@microcom.ca>, 2017
 # Quentin THEURET <odoo@kerpeo.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Quentin THEURET <odoo@kerpeo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -49,6 +50,8 @@ msgid ""
 "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Proceed "
 "to Checkout</span><span class=\"visible-xs-inline\">Checkout</span>"
 msgstr ""
+"<i class=\"fa fa-shopping-cart fa-fw\"/><span class=\"hidden-xs\"/><span "
+"class=\"visible-xs-inline\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
@@ -58,7 +61,7 @@ msgstr "<small>Enlever<span class=\"hidden-xs\">du panier</span></small>"
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<span class=\"js_item\">1 </span><span class=\"js_items hidden\">5 </span>"
-msgstr ""
+msgstr "<span class=\"js_item\"/><span class=\"js_items hidden\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
diff --git a/addons/website_sale_options/i18n/zh_CN.po b/addons/website_sale_options/i18n/zh_CN.po
index fdeae666a1b..8095a018b3c 100644
--- a/addons/website_sale_options/i18n/zh_CN.po
+++ b/addons/website_sale_options/i18n/zh_CN.po
@@ -3,19 +3,20 @@
 # * website_sale_options
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # Talway <9010446@qq.com>, 2016
 # Gary Wei <Gary.wei@elico-corp.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # glovebx <ruinning@163.com>, 2017
 # 卓忆科技 <zhanghao@jointd.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: 卓忆科技 <zhanghao@jointd.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -48,21 +49,23 @@ msgid ""
 "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Proceed "
 "to Checkout</span><span class=\"visible-xs-inline\">Checkout</span>"
 msgstr ""
+"<i class=\"fa fa-shopping-cart fa-fw\"/><span class=\"hidden-xs\"/><span "
+"class=\"visible-xs-inline\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<small>Remove <span class=\"hidden-xs\"> from Cart</span></small>"
-msgstr ""
+msgstr "<small><span class=\"hidden-xs\"/></small>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<span class=\"js_item\">1 </span><span class=\"js_items hidden\">5 </span>"
-msgstr ""
+msgstr "<span class=\"js_item\"/><span class=\"js_items hidden\"/>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
 msgid "<strong>Add<span class=\"hidden-xs\"> to Cart</span></strong>"
-msgstr ""
+msgstr "<strong><span class=\"hidden-xs\"/></strong>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
diff --git a/addons/website_sale_wishlist/i18n/de.po b/addons/website_sale_wishlist/i18n/de.po
index 84e41d9cf02..9b0b7c6d761 100644
--- a/addons/website_sale_wishlist/i18n/de.po
+++ b/addons/website_sale_wishlist/i18n/de.po
@@ -5,22 +5,23 @@
 # Translators:
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # key six <mobile.umts@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +34,7 @@ msgstr ""
 msgid ""
 "<i class=\"fa fa-heart\"/>\n"
 "                        Wishlist"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
@@ -48,23 +49,23 @@ msgstr "Aktiv"
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "Add <span class=\"hidden-xs\">to Cart</span>"
-msgstr ""
+msgstr "<span class=\"hidden-xs\"/>"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "Add product to my cart but keep it in my wishlist"
-msgstr ""
+msgstr "Produkt zu Warenkorb hinzufügen und in Wunschliste behalten"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.add_to_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_add_to_wishlist
 msgid "Add to Wishlist"
-msgstr ""
+msgstr "Zur Wunschliste hinzufügen"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_create_date
 msgid "Added Date"
-msgstr ""
+msgstr "Datum beim Hinzufügen"
 
 #. module: website_sale_wishlist
 #: model:ir.model,name:website_sale_wishlist.model_res_partner
@@ -89,12 +90,12 @@ msgstr "Aktuelle Session"
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_price_new
 msgid "Current price"
-msgstr ""
+msgstr "Aktueller Preis"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_price_new
 msgid "Current price of this product, using same pricelist, ..."
-msgstr ""
+msgstr "Aktueller Preis dieses Produkts, unter derselben Preisliste …"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_display_name
@@ -124,7 +125,7 @@ msgstr "Zuletzt aktualisiert am"
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "My Wishlist"
-msgstr ""
+msgstr "Meine Wunschliste"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_partner_id
@@ -139,7 +140,7 @@ msgstr "Preis"
 #. module: website_sale_wishlist
 #: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_price
 msgid "Price of the product when it has been added in the wishlist"
-msgstr ""
+msgstr "Preis des Produkts, wenn es zur Wunschliste hinzugefügt wurde"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_pricelist_id
@@ -149,7 +150,7 @@ msgstr "Preisliste"
 #. module: website_sale_wishlist
 #: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_pricelist_id
 msgid "Pricelist when added"
-msgstr ""
+msgstr "Preisliste beim Hinzufügen"
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_product_id
@@ -164,7 +165,7 @@ msgstr "Sitzung"
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "Shop Wishlist"
-msgstr ""
+msgstr "Shop-Wunschliste"
 
 #. module: website_sale_wishlist
 #: model:ir.model,name:website_sale_wishlist.model_res_users
@@ -180,12 +181,14 @@ msgstr "Website"
 #: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_session
 msgid "Website session identifier where this product was wishlisted."
 msgstr ""
+"ID der Website-Session, in der dieses Produkt zur Wunschliste hinzugefügt "
+"wurde."
 
 #. module: website_sale_wishlist
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_res_partner_wishlist_ids
 #: model:ir.model.fields,field_description:website_sale_wishlist.field_res_users_wishlist_ids
 msgid "Wishlist"
-msgstr ""
+msgstr "Wunschliste"
 
 #. module: website_sale_wishlist
 #: model:ir.model,name:website_sale_wishlist.model_ir_autovacuum
@@ -195,4 +198,4 @@ msgstr "ir.autovacuum"
 #. module: website_sale_wishlist
 #: model:ir.model,name:website_sale_wishlist.model_product_wishlist
 msgid "product.wishlist"
-msgstr ""
+msgstr "product.wishlist"
diff --git a/addons/website_sale_wishlist/i18n/es.po b/addons/website_sale_wishlist/i18n/es.po
index 906ee93dc40..0da10be654b 100644
--- a/addons/website_sale_wishlist/i18n/es.po
+++ b/addons/website_sale_wishlist/i18n/es.po
@@ -6,7 +6,7 @@
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 # José Vicente <txusev@gmail.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # Ana Juaristi <ajuaristio@gmail.com>, 2017
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2017
 # Eric Antones <eantones@users.noreply.github.com>, 2017
@@ -16,14 +16,15 @@
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2017
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -36,7 +37,7 @@ msgstr ""
 msgid ""
 "<i class=\"fa fa-heart\"/>\n"
 "                        Wishlist"
-msgstr ""
+msgstr "<i class=\"fa fa-heart\"/>"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
@@ -51,7 +52,7 @@ msgstr "Activo"
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "Add <span class=\"hidden-xs\">to Cart</span>"
-msgstr ""
+msgstr "<span class=\"hidden-xs\"/>"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
diff --git a/addons/website_sale_wishlist/i18n/zh_CN.po b/addons/website_sale_wishlist/i18n/zh_CN.po
index 0c62df00fad..0a391f96beb 100644
--- a/addons/website_sale_wishlist/i18n/zh_CN.po
+++ b/addons/website_sale_wishlist/i18n/zh_CN.po
@@ -3,20 +3,21 @@
 # * website_sale_wishlist
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2017
 # waveyeung <waveyeung@qq.com>, 2017
 # liAnGjiA <liangjia@qq.com>, 2017
 # Maie <m@maie.name>, 2017
 # 厦门-许舟 <windedge99@gmail.com>, 2017
 # Xu Lei <xulei8@qq.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+0000\n"
-"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -46,7 +47,7 @@ msgstr "有效"
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
 msgid "Add <span class=\"hidden-xs\">to Cart</span>"
-msgstr ""
+msgstr "<span class=\"hidden-xs\"/>"
 
 #. module: website_sale_wishlist
 #: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
diff --git a/addons/website_slides/i18n/de.po b/addons/website_slides/i18n/de.po
index 0a94aa500d7..b7350898cd1 100644
--- a/addons/website_slides/i18n/de.po
+++ b/addons/website_slides/i18n/de.po
@@ -4,26 +4,27 @@
 # 
 # Translators:
 # Thomas Lengyel <lexustec_fn@yahoo.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Andi <flimflam@salasar.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,6 +51,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:mail.template,body_html:website_slides.slide_template_published
@@ -70,6 +83,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_embed_count_views
@@ -97,6 +122,8 @@ msgid ""
 "(Un)archiving a channel automatically (un)archives its slides. Do you want "
 "to proceed?"
 msgstr ""
+"Das (Un-)Archivieren eines Kanals (un-)archiviert automatisch dessen Folien."
+" Möchten Sie fortfahren?"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slides_search
@@ -335,7 +362,7 @@ msgstr "Nur für authorisierte Benutzer"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_5
 msgid "Awesome Timesheet by Odoo"
-msgstr ""
+msgstr "Awesome Timesheet von Odoo"
 
 #. module: website_slides
 #: model:slide.tag,name:website_slides.tag1
@@ -422,7 +449,7 @@ msgstr "Kanäle"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_10
 msgid "Company Culture"
-msgstr ""
+msgstr "Unternehmenskultur"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_datas
@@ -443,6 +470,8 @@ msgid ""
 "Could not fetch data from url. Document or access right not available.\n"
 "Here is the received response: %s"
 msgstr ""
+"Daten konnten nicht von URL abgerufen werden. Dokument oder Zugangsberechtigung nicht verfügbar.\n"
+"Hier ist die erhaltene Antwort: %s"
 
 #. module: website_slides
 #: code:addons/website_slides/models/slides.py:322
@@ -457,7 +486,7 @@ msgstr ""
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
-msgstr ""
+msgstr "Erstellen Sie ein Google-Projekt und einen Schlüssel"
 
 #. module: website_slides
 #. openerp-web
@@ -515,6 +544,8 @@ msgstr "Verwerfen"
 #: model:slide.slide,description:website_slides.slide_6
 msgid "Discover how easy marketing your business can be with Odoo"
 msgstr ""
+"Entdecken Sie, wie leicht mit Odoo das Marketing für Ihr Unternehmens sein "
+"kann."
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_0
@@ -525,11 +556,17 @@ msgid ""
 "\n"
 "Discover Odoo MRP: https://www.odoo.com/page/manufacturing"
 msgstr ""
+"Entdecken Sie, wie Sie MRP, PLM, Qualität und Wartung in eine einzigen Anwendung integrieren können, um so die Effizienz Ihrer Fertigungsvorgänge zu maximieren.\n"
+"\n"
+" Erfahren Sie mehr über die Funktionen unter: https://www.odoo.com/page/manufacturing-features\n"
+"\n"
+"Entdecken Sie Odoo MRP: https://www.odoo.com/page/manufacturing"
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_1
 msgid "Discover the CRM sales people love https://www.odoo.com/page/crm"
 msgstr ""
+"Entdecken Sie den beliebten CRM-Vertrieb https://www.odoo.com/page/crm"
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_2
@@ -538,11 +575,14 @@ msgid ""
 "\n"
 "Learn more at https://odoo.com"
 msgstr ""
+"Entdecken Sie die umfassende Lösung für Businessmanagement-Software, die jeder Unternehmensgröße und -situation gerecht wird.\n"
+"\n"
+"Erfahren Sie mehr unter https://odoo.com"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_dislikes
 msgid "Dislikes"
-msgstr ""
+msgstr "Dislikes"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_category_display_name
@@ -593,11 +633,15 @@ msgid ""
 "Chrome: http://bit.ly/2613LcY\n"
 "iOS: http://bit.ly/1ZUZsZD"
 msgstr ""
+"Laden Sie Awesome Timesheet von Odoo herunter und entdecken Sie, wie einfach Zeiterfassung und Mitarbeitermanagement sein können. \n"
+"\n"
+"Chrome: http://bit.ly/2613LcY\n"
+"iOS: http://bit.ly/1ZUZsZD"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_download_security
 msgid "Download Security"
-msgstr ""
+msgstr "Sicherheit herunterladen"
 
 #. module: website_slides
 #: model:ir.model.fields,help:website_slides.field_slide_channel_publish_template_id
@@ -696,7 +740,7 @@ msgstr "Google-Doc-Key"
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 msgid "Google Drive API Key"
-msgstr ""
+msgstr "Google Drive API-Schlüssel"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_graph
@@ -798,7 +842,7 @@ msgstr "Zuletzt publiziert"
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_8
 msgid "Learn more at https://www.odoo.com/page/sales"
-msgstr ""
+msgstr "Erfahren Sie mehr unter https://www.odoo.com/page/sales"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_likes
@@ -852,6 +896,7 @@ msgstr "Name"
 #: model:mail.template,subject:website_slides.slide_template_published
 msgid "New ${object.slide_type} published on ${object.channel_id.name}"
 msgstr ""
+"Neue ${object.slide_type} veröffentlicht von ${object.channel_id.name}"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slides_channel_header
@@ -910,7 +955,7 @@ msgstr "Anzahl Videos"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_2
 msgid "Odoo All-in-One Software Demonstration"
-msgstr ""
+msgstr "Odoo All-in-One Software-Demonstration"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_1
@@ -926,37 +971,37 @@ msgstr "Odoo Days"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_7
 msgid "Odoo Inventory"
-msgstr ""
+msgstr "Odoo Bestand"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_0
 msgid "Odoo MRP"
-msgstr ""
+msgstr "Odoo MRP"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_6
 msgid "Odoo Marketing"
-msgstr ""
+msgstr "Odoo Marketing"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_8
 msgid "Odoo Sales"
-msgstr ""
+msgstr "Odoo Verkauf"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_3
 msgid "Odoo Sign Demonstration"
-msgstr ""
+msgstr "Odoo Sign Demonstration"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_9
 msgid "Open Days 2014 Infographic"
-msgstr ""
+msgstr "Open Days 2018 Infographic"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_11
 msgid "OpenSource CMS, A performance comparison - Mantavya Gajjar"
-msgstr ""
+msgstr "OpenSource CMS, Leistungsvergleich – Mantavya Gajjar"
 
 #. module: website_slides
 #. openerp-web
@@ -1183,6 +1228,9 @@ msgid ""
 "\n"
 "Discover more at https://www.odoo.com/page/sign"
 msgstr ""
+"Lassen Sie das manuelle Drucken und Scannen hinter sich. Verwenden Sie mit Odoo Sign elektronische Signaturen! \n"
+"\n"
+"Erfahren Sie mehr unter https://www.odoo.com/page/sign"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_tag_form
@@ -1217,6 +1265,9 @@ msgid ""
 "The document type will be set automatically based on the document URL and "
 "properties (e.g. height and width for presentation and document)."
 msgstr ""
+"Der Dokumenttyp wird automatisch basierend auf der Dokument-URL und den "
+"Eigenschaften (z. B. Höhe und Breite für Präsentation und Dokument) "
+"festgelegt."
 
 #. module: website_slides
 #: sql_constraint:slide.slide:0
@@ -1384,6 +1435,9 @@ msgid ""
 "\n"
 "Discover Odoo Inventory: https://www.odoo.com/page/warehouse"
 msgstr ""
+"Lagerverwaltungssoftware für das 21. Jahrhundert.\n"
+"\n"
+"Entdecken Sie Odoo Inventory: https://www.odoo.com/page/warehouse"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_form
diff --git a/addons/website_slides/i18n/es.po b/addons/website_slides/i18n/es.po
index cbff5f27cda..5d015eaf5b9 100644
--- a/addons/website_slides/i18n/es.po
+++ b/addons/website_slides/i18n/es.po
@@ -3,9 +3,9 @@
 # * website_slides
 # 
 # Translators:
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
@@ -25,13 +25,14 @@
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Jorge <jcamacho@trey.es>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Jorge <jcamacho@trey.es>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -58,6 +59,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:mail.template,body_html:website_slides.slide_template_published
@@ -78,6 +91,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_embed_count_views
diff --git a/addons/website_slides/i18n/fr.po b/addons/website_slides/i18n/fr.po
index 5efa1047498..0ee9cb3456a 100644
--- a/addons/website_slides/i18n/fr.po
+++ b/addons/website_slides/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Clo <clo@odoo.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -20,13 +20,14 @@
 # Jeanjean Noname <monsieur.spock@gmail.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Fabien Bourgeois <fabien@yaltik.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Fabien Bourgeois <fabien@yaltik.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -88,6 +89,22 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"\n"
+"Bonjour,\n"
+"\n"
+" Un nouveau ${object.slide_type} ${object.name} a été publié sur ${object.channel_id.name} à ${format_tz(object.write_date, tz=user.tz)}\n"
+"\n"
+"\n"
+" \n"
+" \n"
+" \n"
+"\n"
+"\n"
+" \n"
+" Voir ${object.name}\n"
+" \n"
+"\n"
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: 10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; background-color: #cccccc; margin: 16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\" class=\"o_default_snippet_text\" href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_embed_count_views
@@ -115,6 +132,8 @@ msgid ""
 "(Un)archiving a channel automatically (un)archives its slides. Do you want "
 "to proceed?"
 msgstr ""
+"(Dés)archiver un canal (dés)archivera automatiquement ses diapositives. "
+"Voulez-vous continuer ?"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.slides_search
@@ -353,12 +372,12 @@ msgstr "Réservé aux utilisateurs authentifiés"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_5
 msgid "Awesome Timesheet by Odoo"
-msgstr ""
+msgstr "Awesome Timesheet par Odoo"
 
 #. module: website_slides
 #: model:slide.tag,name:website_slides.tag1
 msgid "CMS"
-msgstr ""
+msgstr "CMS"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_channel_can_see
@@ -440,7 +459,7 @@ msgstr "Canaux"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_10
 msgid "Company Culture"
-msgstr ""
+msgstr "Culture de l'entreprise"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_datas
@@ -461,6 +480,8 @@ msgid ""
 "Could not fetch data from url. Document or access right not available.\n"
 "Here is the received response: %s"
 msgstr ""
+"Impossible de récupérer les données de l'URL. Document ou droit d'accès non "
+"disponible.n\\Voici la réponse reçue : %s"
 
 #. module: website_slides
 #: code:addons/website_slides/models/slides.py:322
@@ -475,7 +496,7 @@ msgstr ""
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 msgid "Create a Google Project and Get a Key"
-msgstr ""
+msgstr "Créer un projet Google et obtenir une clé"
 
 #. module: website_slides
 #. openerp-web
@@ -531,7 +552,7 @@ msgstr "Annuler"
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_6
 msgid "Discover how easy marketing your business can be with Odoo"
-msgstr ""
+msgstr "Découvrez comment faire connaître facilement votre activité avec Odoo"
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_0
@@ -542,11 +563,17 @@ msgid ""
 "\n"
 "Discover Odoo MRP: https://www.odoo.com/page/manufacturing"
 msgstr ""
+"Découvrez comment intégrer MRP, PLM, qualité et maintenance dans une seule application pour maximiser l'efficacité de vos opérations de fabrication.\n"
+"\n"
+"Pour en savoir plus sur les fonctionnalités, consultez https://www.odoo.com/page/manufacturing-features\n"
+"\n"
+"Découvrez Odoo MRP : https://www.odoo.com/page/manufacturing"
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_1
 msgid "Discover the CRM sales people love https://www.odoo.com/page/crm"
 msgstr ""
+"Découvrez le CRM que les commerciaux adorent : https://www.odoo.com/page/crm"
 
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_2
@@ -555,6 +582,9 @@ msgid ""
 "\n"
 "Learn more at https://odoo.com"
 msgstr ""
+"Découvrez la solution logicielle de gestion d'entreprise tout-en-un qui s'adapte à toutes les entreprises et situations.\n"
+"\n"
+"En savoir plus sur https://odoo.com"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_dislikes
@@ -610,6 +640,10 @@ msgid ""
 "Chrome: http://bit.ly/2613LcY\n"
 "iOS: http://bit.ly/1ZUZsZD"
 msgstr ""
+"Téléchargez Awesome Timesheet par Odoo et découvrez comme il peut être simple d'effectuer un suivi temporel et de gérer les employés ! \n"
+"\n"
+"Chrome : http://bit.ly/2613LcY\n"
+"iOS: http://bit.ly/1ZUZsZD"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_download_security
@@ -715,7 +749,7 @@ msgstr "Clé Google Doc"
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
 msgid "Google Drive API Key"
-msgstr ""
+msgstr "Clé d'API Google Drive"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_graph
@@ -817,7 +851,7 @@ msgstr "Dernières publications"
 #. module: website_slides
 #: model:slide.slide,description:website_slides.slide_8
 msgid "Learn more at https://www.odoo.com/page/sales"
-msgstr ""
+msgstr "En savoir plus sur https://www.odoo.com/page/sales"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide_likes
@@ -931,12 +965,12 @@ msgstr "Nombre de vidéos"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_2
 msgid "Odoo All-in-One Software Demonstration"
-msgstr ""
+msgstr "Démonstration du logiciel tout-en-un Odoo"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_1
 msgid "Odoo CRM"
-msgstr ""
+msgstr "Odoo CRM"
 
 #. module: website_slides
 #: model:slide.category,name:website_slides.category_2
@@ -947,27 +981,27 @@ msgstr "Journées Odoo"
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_7
 msgid "Odoo Inventory"
-msgstr ""
+msgstr "Odoo Inventory"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_0
 msgid "Odoo MRP"
-msgstr ""
+msgstr "Odoo MRP"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_6
 msgid "Odoo Marketing"
-msgstr ""
+msgstr "Odoo Marketing"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_8
 msgid "Odoo Sales"
-msgstr ""
+msgstr "Odoo Sales"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_3
 msgid "Odoo Sign Demonstration"
-msgstr ""
+msgstr "Démonstration d'Odoo Sign"
 
 #. module: website_slides
 #: model:slide.slide,name:website_slides.slide_9
@@ -1205,6 +1239,9 @@ msgid ""
 "\n"
 "Discover more at https://www.odoo.com/page/sign"
 msgstr ""
+"Plus besoin d'imprimer les documents, les signer puis les numériser. Passez à la signature électronique avec Odoo Sign ! \n"
+"\n"
+"En savoir plus sur https://www.odoo.com/page/sign"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_tag_form
@@ -1407,6 +1444,9 @@ msgid ""
 "\n"
 "Discover Odoo Inventory: https://www.odoo.com/page/warehouse"
 msgstr ""
+"Logiciel de gestion d'entrepôt pour le XXIe siècle.\n"
+"\n"
+"Découvrez Odoo Inventory : https://www.odoo.com/page/warehouse"
 
 #. module: website_slides
 #: model:ir.ui.view,arch_db:website_slides.view_slide_slide_form
diff --git a/addons/website_slides/i18n/zh_CN.po b/addons/website_slides/i18n/zh_CN.po
index 326c2dab723..f3c5bc40e50 100644
--- a/addons/website_slides/i18n/zh_CN.po
+++ b/addons/website_slides/i18n/zh_CN.po
@@ -17,13 +17,14 @@
 # liulixia <liu.lixia@elico-corp.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
 # 老窦 北京 <2662059195@qq.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\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"
@@ -50,6 +51,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:mail.template,body_html:website_slides.slide_template_published
@@ -70,6 +83,18 @@ msgid ""
 "    </a>\n"
 "</p>\n"
 msgstr ""
+"<p></p><p><strong></strong></p><p style=\"text-align: center; margin-top: "
+"10px;\"><a href=\"${object.website_url}\"><img alt=\"${object.name}\" "
+"src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" "
+"style=\"height:auto; width:150px; background-color: #cccccc; margin: "
+"16px;\"></a></p><p style=\"text-align: center; margin-top: 10px;\"><a style"
+"=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-"
+"height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; "
+"display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: "
+"center; vertical-align: middle; cursor: pointer; white-space: nowrap; "
+"background-image: none; background-color: #875A7B; border: 1px solid "
+"#875A7B; border-radius:3px\" class=\"o_default_snippet_text\" "
+"href=\"${object.website_url}\"><strong></strong></a></p>"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_embed_count_views
diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js
index 279c256c5ac..7d945e9eb28 100644
--- a/addons/website_slides/static/src/js/slides.js
+++ b/addons/website_slides/static/src/js/slides.js
@@ -7,7 +7,7 @@ var core = require('web.core');
 var time = require('web.time');
 var Widget = require('web.Widget');
 var local_storage = require('web.local_storage');
-var websiteRootInstance = require('website.WebsiteRoot.instance');
+require('root.widget');
 
 var _t = core._t;
 var page_widgets = {};
diff --git a/addons/website_theme_install/i18n/de.po b/addons/website_theme_install/i18n/de.po
index e79cd32b76a..69528650f49 100644
--- a/addons/website_theme_install/i18n/de.po
+++ b/addons/website_theme_install/i18n/de.po
@@ -3,15 +3,16 @@
 # * website_theme_install
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~14\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-02-15 11:03+0000\n"
 "PO-Revision-Date: 2017-02-15 11:03+0000\n"
-"Last-Translator: darenkster <inactive+darenkster@transifex.com>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,12 +33,12 @@ msgstr "Kategorie"
 #. module: website_theme_install
 #: model:ir.actions.act_window,name:website_theme_install.theme_install_kanban_action
 msgid "Choose Your Theme"
-msgstr ""
+msgstr "Thema wählen"
 
 #. module: website_theme_install
 #: model:ir.actions.server,name:website_theme_install.theme_install_todo_action
 msgid "Config: Choose Your Theme"
-msgstr ""
+msgstr "Config: Thema wählen"
 
 #. module: website_theme_install
 #: model:ir.ui.view,arch_db:website_theme_install.theme_view_kanban
@@ -47,7 +48,7 @@ msgstr "Installieren"
 #. module: website_theme_install
 #: model:ir.ui.view,arch_db:website_theme_install.theme_view_kanban
 msgid "Live Preview"
-msgstr ""
+msgstr "Live-Vorschau"
 
 #. module: website_theme_install
 #: model:ir.model,name:website_theme_install.model_ir_module_module
@@ -57,12 +58,12 @@ msgstr "Modul"
 #. module: website_theme_install
 #: model:ir.model.fields,field_description:website_theme_install.field_ir_module_module_image_ids
 msgid "Screenshots"
-msgstr ""
+msgstr "Screenshots"
 
 #. module: website_theme_install
 #: model:ir.ui.view,arch_db:website_theme_install.customize_modal
 msgid "See themes here"
-msgstr ""
+msgstr "Hier Themen anschauen"
 
 #. module: website_theme_install
 #: model:ir.ui.view,arch_db:website_theme_install.theme_view_search
diff --git a/addons/website_twitter/i18n/de.po b/addons/website_twitter/i18n/de.po
index 8067c3b5893..bced05914fb 100644
--- a/addons/website_twitter/i18n/de.po
+++ b/addons/website_twitter/i18n/de.po
@@ -3,21 +3,22 @@
 # * website_twitter
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
+# Martin Trigaux, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
+# darenkster <inactive+darenkster@transifex.com>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
+# e2f <projects@e2f.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.saas~18\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-20 09:54+0000\n"
 "PO-Revision-Date: 2017-09-20 09:54+0000\n"
-"Last-Translator: Henry Mineehen <info@mineehen.de>, 2017\n"
+"Last-Translator: e2f <projects@e2f.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "API-Schlüssel"
 #: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_api_secret
 #: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "API secret"
-msgstr ""
+msgstr "API Secret"
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:16
@@ -49,6 +50,8 @@ msgid ""
 "Authentication credentials were missing or incorrect. Maybe screen name "
 "tweets are protected."
 msgstr ""
+"Anmeldeinformationen zur Authentifizierung fehlen oder falsch. "
+"Möglicherweise sind Tweets mit Bildschirmnamen geschützt."
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_create_uid
@@ -69,7 +72,7 @@ msgstr "Anzeigename"
 #: model:ir.model.fields,field_description:website_twitter.field_res_config_settings_twitter_screen_name
 #: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "Favorites From"
-msgstr ""
+msgstr "Favoriten von"
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_screen_name
@@ -80,7 +83,7 @@ msgstr "Holen Sie die Favoriten von diesem Benutzernamen"
 #: code:addons/website_twitter/models/res_config_settings.py:48
 #, python-format
 msgid "HTTP Error: Something is misconfigured"
-msgstr ""
+msgstr "HTTP-Fehler: Etwas ist fehlerhaft konfiguriert."
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_id
@@ -113,7 +116,7 @@ msgstr "Zuletzt aktualisiert am"
 #: code:addons/website_twitter/models/res_config_settings.py:62
 #, python-format
 msgid "Please double-check your Twitter API Key and Secret!"
-msgstr ""
+msgstr "Bitte überprüfen Sie Twitter API Key und Secret!"
 
 #. module: website_twitter
 #: code:addons/website_twitter/controllers/main.py:27
@@ -147,6 +150,8 @@ msgid ""
 "Request cannot be served due to the applications rate limit having been "
 "exhausted for the resource."
 msgstr ""
+"Anfrage kann nicht angenommen werden, da die Anwendungsratenbegrenzung für "
+"diese Ressource erschöpft ist."
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_screen_name
@@ -173,6 +178,8 @@ msgstr "Zeige mir, woher ich Twitter API Key und Secret bekomme"
 msgid ""
 "The Twitter servers are up, but overloaded with requests. Try again later."
 msgstr ""
+"Die Twitter-Server laufen, sind aber mit Anfragen überlastet. Versuchen Sie "
+"es später erneut."
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:22
@@ -181,6 +188,8 @@ msgid ""
 "The Twitter servers are up, but the request could not be serviced due to "
 "some failure within our stack. Try again later."
 msgstr ""
+"Die Twitter-Server laufen, die Anfrage konnte jedoch aufgrund eines Fehlers "
+"unseres Stacks nicht verarbeitet werden. Versuchen Sie es später erneut."
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:17
@@ -189,6 +198,8 @@ msgid ""
 "The request is understood, but it has been refused or access is not allowed."
 " Please check your Twitter API Key and Secret."
 msgstr ""
+"Die Anfrage wurde verstanden, jedoch abgelehnt oder hat keine "
+"Zugriffsberechtigung. Bitte überprüfen Sie Twitter API Key und Secret."
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:15
@@ -197,17 +208,20 @@ msgid ""
 "The request was invalid or cannot be otherwise served. Requests without "
 "authentication are considered invalid and will yield this response."
 msgstr ""
+"Die Anfrage war ungültig oder kann anderweitig nicht verarbeitet werden. "
+"Anfragen ohne Authentifizierung werden als ungültig betrachtet und erhalten "
+"daher diese Antwort."
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:14
 #, python-format
 msgid "There was no new data to return."
-msgstr ""
+msgstr "Keine neuen Daten vorhanden."
 
 #. module: website_twitter
 #: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "Tutorial"
-msgstr ""
+msgstr "Tutorial"
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet_tweet_id
@@ -222,7 +236,7 @@ msgstr "Tweets"
 #. module: website_twitter
 #: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "Twitter API Credentials"
-msgstr ""
+msgstr "Twitter API-Anmeldeinformationen"
 
 #. module: website_twitter
 #: model:ir.model.fields,help:website_twitter.field_website_twitter_api_key
@@ -243,6 +257,8 @@ msgstr "Twitter API key"
 #: model:ir.model.fields,help:website_twitter.field_res_config_settings_twitter_api_key
 msgid "Twitter API key you can get it from https://apps.twitter.com/"
 msgstr ""
+"Der Twitter API Key kann auf der Seite https://apps.twitter.com/ generiert "
+"werden."
 
 #. module: website_twitter
 #: model:ir.model.fields,field_description:website_twitter.field_website_twitter_api_secret
@@ -253,6 +269,8 @@ msgstr "Twitter API secret"
 #: model:ir.model.fields,help:website_twitter.field_res_config_settings_twitter_api_secret
 msgid "Twitter API secret you can get it from https://apps.twitter.com/"
 msgstr ""
+"Das Twitter API Secret kann auf der Seite https://apps.twitter.com/ "
+"generiert werden."
 
 #. module: website_twitter
 #. openerp-web
@@ -276,7 +294,7 @@ msgstr "Twitter Authentifizierungsfehler!"
 #: code:addons/website_twitter/models/res_config_settings.py:20
 #, python-format
 msgid "Twitter is down or being upgraded."
-msgstr ""
+msgstr "Twitter ist down oder wird aktualisiert."
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:19
@@ -285,6 +303,9 @@ msgid ""
 "Twitter seems broken. Please retry later. You may consider posting an issue "
 "on Twitter forums to get help."
 msgstr ""
+"Twitter scheint nicht zu funktionieren. Bitte versuchen Sie es später "
+"erneut. Schreiben Sie ggf. einen Beitrag auf den Twitter-Foren, um Hilfe zu "
+"erhalten."
 
 #. module: website_twitter
 #: code:addons/website_twitter/controllers/main.py:37
@@ -302,14 +323,14 @@ msgstr ""
 #: model:ir.cron,cron_name:website_twitter.ir_cron_twitter_actions
 #: model:ir.cron,name:website_twitter.ir_cron_twitter_actions
 msgid "Twitter: Fetch new favorites"
-msgstr ""
+msgstr "Twitter: Neue Favoriten abrufen"
 
 #. module: website_twitter
 #: code:addons/website_twitter/models/res_config_settings.py:58
 #: code:addons/website_twitter/models/res_config_settings.py:59
 #, python-format
 msgid "We failed to reach a twitter server."
-msgstr ""
+msgstr "Wir haben keinen Twitter-Server erreicht."
 
 #. module: website_twitter
 #: model:ir.model,name:website_twitter.model_website
@@ -325,4 +346,4 @@ msgstr "res.config.settings"
 #. module: website_twitter
 #: model:ir.model,name:website_twitter.model_website_twitter_tweet
 msgid "website.twitter.tweet"
-msgstr ""
+msgstr "website.twitter.tweet"
author	Christophe Simonis <chs@odoo.com>	2018-02-12 18:34:43 +0100
committer	Christophe Simonis <chs@odoo.com>	2018-02-12 18:34:43 +0100
commit	adeea2a88db4443b2b426877a28bb1471c2f5db1 (patch)
tree	2f43fecc9649947d3061e8c482219fa167b3385a /addons
parent	317f5f11112266128ac2292ecfafcd92cda74fd0 (diff)
parent	0f02dcb63918228d48df50f2d5805b7fda25c14a (diff)