[MERGE] forward port branch saas-11.2 up to eefca5d492d

author: Christophe Simonis <chs@odoo.com> 2018-02-05 17:21:35 +0100
committer: Christophe Simonis <chs@odoo.com> 2018-02-05 17:21:35 +0100
commit: bba0bc6dedb96c3af8e543be8496967e3f3e68c8 (patch)
tree: 1e1df595475847c0c195452d606b5cfe95caf51d /addons
parent: 86c0045befc35804bade151799b9738d5e004d31 (diff)
parent: eefca5d492d6f35dd4b063a294b6b8a0a576e83e (diff)
154 files changed, 2632 insertions, 858 deletions
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index da03c9f4c95..6e02c98cf0f 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -3,8 +3,8 @@
 # * account
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
@@ -16,7 +16,7 @@
 # Anja Funk <anja.funk@afimage.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Mathias Neef <mn@copado.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Bülent Tiknas <btiknas@googlemail.com>, 2017
 # Felix Schubert <felix.schubert@go-erp.com>, 2017
 # Kontor Consulting <p.becker@kontor.consulting>, 2017
@@ -24,19 +24,19 @@
 # key six <mobile.umts@gmail.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
 # Andreas Stauder <andreas.stauder@brain-tec.ch>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Winfried Grieb <inactive+wigrieb@transifex.com>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # aNj <anj2j@yahoo.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Falk Scholze <inactive+falkscholze@transifex.com>, 2017
+# Falk Scholze, 2017
 # Maik Steinfeld <info@streward.de>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Markus Mattes <mmattes87@gmail.com>, 2017
 # Sören Prilop <mail@soeren-prilop.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Christopher Westburry <cricsus99@gmail.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
+# Dejan Dinic, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
 # Gab_Odoo <gab@odoo.com>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
@@ -45,13 +45,14 @@
 # Mark Lorenz <bandworm@gmail.com>, 2017
 # Pascal Künzli <p.kuenzli@pk-its.com>, 2017
 # Christoph Giesel <mail@cgiesel.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: Christoph Giesel <mail@cgiesel.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"
@@ -299,6 +300,35 @@ msgid ""
 "</table>\n"
 "</div>"
 msgstr ""
+"<div><table bgcolor=\"#ededed\" border=\"0\" cellpadding=\"0\" "
+"style=\"padding: 20px; background-color: #ededed; border-"
+"collapse:separate;\" summary=\"o_mail_notification\" "
+"width=\"100%\"><tbody><tr><td align=\"center\" style=\"min-width: "
+"590px;\"><table bgcolor=\"#875A7B\" border=\"0\" cellpadding=\"0\" style"
+"=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px; "
+"border-collapse:separate;\" width=\"590\"><tr><td valign=\"middle\"><span "
+"style=\"font-size:20px; color:white; font-weight: bold;\"/></td><td "
+"align=\"right\" valign=\"middle\"><img alt=\"${company.name}\" "
+"src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\"/></td></tr></table></td></tr><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table bgcolor=\"#ffffff\" "
+"border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(255, 255, 255); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tbody><td style=\"font-family:Arial,Helvetica,sans-serif; "
+"color: #555; font-size: 14px;\" "
+"valign=\"top\"/></tbody></table></td></tr><tr><td align=\"center\" style"
+"=\"min-width: 590px;\"><table bgcolor=\"#875A7B\" border=\"0\" "
+"cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(135,90,123); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tr><td align=\"left\" style=\"color: #fff; padding-top: 10px;"
+" padding-bottom: 10px; font-size: 12px;\" valign=\"middle\"><br/></td><td "
+"align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: "
+"10px; font-size: 12px;\" valign=\"middle\"><a "
+"href=\"mailto:${company.email}\" style=\"text-decoration:none; color: "
+"white;\"/><br/><a href=\"${company.website}\" style=\"text-decoration:none; "
+"color: white;\"/></td></tr></table></td></tr><tr><td align=\"center\"><a "
+"href=\"https://www.odoo.com\" "
+"target=\"_blank\"/></td></tr></tbody></table></div>"
 
 #. module: account
 #: model:mail.template,body_html:account.email_template_edi_invoice
@@ -348,6 +378,12 @@ msgid ""
 "</p>\n"
 "</div>"
 msgstr ""
+"<div><p><i/></p><p lilt=\"split=0\"><strong/></p><p "
+"lilt=\"split=1\"><strong/></p><br/><br/><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;\"/></center><br/><br/><p/><p/><p/><p "
+"style=\"color:#888888\"/></div>"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.portal_my_invoices
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index eb62eed9d9b..810d467a0ee 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -66,13 +66,14 @@
 # Florent de Labarre <florent@iguanayachts.com>, 2017
 # Fabri Yohann <psn@fabri.pw>, 2017
 # Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 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ôme Tanché <jerome.tanche@ouest-dsi.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"
@@ -320,6 +321,35 @@ msgid ""
 "</table>\n"
 "</div>"
 msgstr ""
+"<div><table bgcolor=\"#ededed\" border=\"0\" cellpadding=\"0\" "
+"style=\"padding: 20px; background-color: #ededed; border-"
+"collapse:separate;\" summary=\"o_mail_notification\" "
+"width=\"100%\"><tbody><tr><td align=\"center\" style=\"min-width: "
+"590px;\"><table bgcolor=\"#875A7B\" border=\"0\" cellpadding=\"0\" style"
+"=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px; "
+"border-collapse:separate;\" width=\"590\"><tr><td valign=\"middle\"><span "
+"style=\"font-size:20px; color:white; font-weight: bold;\"/></td><td "
+"align=\"right\" valign=\"middle\"><img alt=\"${company.name}\" "
+"src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\"/></td></tr></table></td></tr><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table bgcolor=\"#ffffff\" "
+"border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(255, 255, 255); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tbody><td style=\"font-family:Arial,Helvetica,sans-serif; "
+"color: #555; font-size: 14px;\" "
+"valign=\"top\"/></tbody></table></td></tr><tr><td align=\"center\" style"
+"=\"min-width: 590px;\"><table bgcolor=\"#875A7B\" border=\"0\" "
+"cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(135,90,123); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tr><td align=\"left\" style=\"color: #fff; padding-top: 10px;"
+" padding-bottom: 10px; font-size: 12px;\" valign=\"middle\"><br/></td><td "
+"align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: "
+"10px; font-size: 12px;\" valign=\"middle\"><a "
+"href=\"mailto:${company.email}\" style=\"text-decoration:none; color: "
+"white;\"/><br/><a href=\"${company.website}\" style=\"text-decoration:none; "
+"color: white;\"/></td></tr></table></td></tr><tr><td align=\"center\"><a "
+"href=\"https://www.odoo.com\" "
+"target=\"_blank\"/></td></tr></tbody></table></div>"
 
 #. module: account
 #: model:mail.template,body_html:account.email_template_edi_invoice
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 8f8e425f76c..9002c3b8a33 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,7 +7,7 @@
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Eric Geens <eric.geens@vitabiz.be>, 2016
 # Олег <pehotaolega.ru@mail.ru>, 2016
@@ -148,7 +148,7 @@ msgstr "15 dagen"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_2months
 msgid "2 Months"
-msgstr ""
+msgstr "2 maanden"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
@@ -158,7 +158,7 @@ msgstr "30 dagen"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_45days
 msgid "45 Days"
-msgstr ""
+msgstr "45 dagen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.report_generalledger
@@ -1903,7 +1903,7 @@ msgstr "Geautomatiseerde boekingen"
 #: code:addons/account/models/account_move.py:239
 #, python-format
 msgid "Automatic "
-msgstr ""
+msgstr "Automatisch"
 
 #. module: account
 #: code:addons/account/models/company.py:343
@@ -2976,7 +2976,7 @@ msgstr "Configuratiefout !"
 #: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:34
 #, python-format
 msgid "Configuration Steps"
-msgstr ""
+msgstr "Configuratie stappen"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:467
@@ -3605,7 +3605,7 @@ msgstr "Datums"
 #: model:ir.model.fields,field_description:account.field_account_payment_term_line_day_of_the_month
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_tree
 msgid "Day of the month"
-msgstr ""
+msgstr "Dag van de maand"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment_term_line_day_of_the_month
@@ -4061,7 +4061,7 @@ msgstr "Vervaldatum"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
 msgid "Due the"
-msgstr ""
+msgstr "Tegen"
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1184
@@ -5368,7 +5368,7 @@ msgstr "Facturen die toebehoren aan u"
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Invoices to Validate"
-msgstr ""
+msgstr "Te valideren facturen"
 
 #. module: account
 #: model:ir.actions.report,name:account.account_invoices_without_payment
@@ -6672,7 +6672,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
 msgid "On the"
-msgstr ""
+msgstr "Op de"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_invoice_confirm_view
@@ -7208,7 +7208,7 @@ msgstr "Betalingsconditie: 15 dagen"
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_2months
 msgid "Payment terms: 2 Months"
-msgstr ""
+msgstr "Betalingstermijn: 2 maanden"
 
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_net
@@ -7218,7 +7218,7 @@ msgstr "Betalingsconditie: 30 dagen"
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_45days
 msgid "Payment terms: 45 Days"
-msgstr ""
+msgstr "Betalingstermijn: 45 dagen"
 
 #. module: account
 #: model:account.payment.term,note:account.account_payment_term_immediate
@@ -7265,12 +7265,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Payments to Do"
-msgstr ""
+msgstr "Betalingen te doen"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Payments to Receive"
-msgstr ""
+msgstr "Te ontvangen betalingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -7981,7 +7981,7 @@ msgstr "Inkomsten afschrijving"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reverse_date
 msgid "Reversal Date"
-msgstr ""
+msgstr "Omkeringsdatum"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reversal_date
@@ -7991,7 +7991,7 @@ msgstr "Omkeringsdatum"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_auto_reverse
 msgid "Reverse Automatically"
-msgstr ""
+msgstr "Automatisch omkeren"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_reverse_entry_id
@@ -8015,7 +8015,7 @@ msgstr "Omgekeerd balans teken"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_move_form
 msgid "Reversed entry"
-msgstr ""
+msgstr "Omgekeerde mutatie"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_group_parent_right
@@ -8178,7 +8178,7 @@ msgstr "Zoek rekeningschema sjablonen"
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_position_filter
 msgid "Search Fiscal Positions"
-msgstr ""
+msgstr "Zoek fiscale posities"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -10258,7 +10258,7 @@ msgstr "Gebruik kasbasis"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa_direct_debit
 msgid "Use SEPA Direct Debit"
-msgstr "Gebruik SEPA Auto Inacsso"
+msgstr "Gebruik SEPA Auto incasso"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
@@ -11075,12 +11075,12 @@ msgstr "code"
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "day(s) after the end of the invoice month"
-msgstr ""
+msgstr "dag(en) na het einde van de gefactureerde maand"
 
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "day(s) after the invoice date"
-msgstr ""
+msgstr "dag(en) na de factureringsdatum"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -11108,17 +11108,17 @@ msgstr "o_manual_statement"
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "of the current month"
-msgstr ""
+msgstr "van de huidige maand"
 
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "of the following month"
-msgstr ""
+msgstr "van de volgende maand"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_payment_term_line_form
 msgid "of the month"
-msgstr ""
+msgstr "van de maand"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.invoice_supplier_form
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 4195aa29b6e..a7ee971b546 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -44,13 +44,14 @@
 # Jeff Yu - Elico Corp <jeff.yu@elico-corp.com>, 2017
 # Jonathon Li <jonathonli@gmail.com>, 2017
 # jack adam <jackadam@sina.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: jack adam <jackadam@sina.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"
@@ -219,6 +220,8 @@ msgid ""
 "</p>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><br/><strong></strong><strong></strong></p><p></p><p></p></data>"
 
 #. module: account
 #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
@@ -289,6 +292,35 @@ msgid ""
 "</table>\n"
 "</div>"
 msgstr ""
+"<div><table bgcolor=\"#ededed\" border=\"0\" cellpadding=\"0\" "
+"style=\"padding: 20px; background-color: #ededed; border-"
+"collapse:separate;\" summary=\"o_mail_notification\" "
+"width=\"100%\"><tbody><tr><td align=\"center\" style=\"min-width: "
+"590px;\"><table bgcolor=\"#875A7B\" border=\"0\" cellpadding=\"0\" style"
+"=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px; "
+"border-collapse:separate;\" width=\"590\"><tr><td valign=\"middle\"><span "
+"style=\"font-size:20px; color:white; font-weight: bold;\"/></td><td "
+"align=\"right\" valign=\"middle\"><img alt=\"${company.name}\" "
+"src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\"/></td></tr></table></td></tr><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table bgcolor=\"#ffffff\" "
+"border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(255, 255, 255); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tbody><td style=\"font-family:Arial,Helvetica,sans-serif; "
+"color: #555; font-size: 14px;\" "
+"valign=\"top\"/></tbody></table></td></tr><tr><td align=\"center\" style"
+"=\"min-width: 590px;\"><table bgcolor=\"#875A7B\" border=\"0\" "
+"cellpadding=\"0\" style=\"min-width: 590px; background-color: "
+"rgb(135,90,123); padding: 20px; border-collapse:separate;\" "
+"width=\"590\"><tr><td align=\"left\" style=\"color: #fff; padding-top: 10px;"
+" padding-bottom: 10px; font-size: 12px;\" valign=\"middle\"><br/></td><td "
+"align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: "
+"10px; font-size: 12px;\" valign=\"middle\"><a "
+"href=\"mailto:${company.email}\" style=\"text-decoration:none; color: "
+"white;\"/><br/><a href=\"${company.website}\" style=\"text-decoration:none; "
+"color: white;\"/></td></tr></table></td></tr><tr><td align=\"center\"><a "
+"href=\"https://www.odoo.com\" "
+"target=\"_blank\"/></td></tr></tbody></table></div>"
 
 #. module: account
 #: model:mail.template,body_html:account.email_template_edi_invoice
@@ -338,6 +370,12 @@ msgid ""
 "</p>\n"
 "</div>"
 msgstr ""
+"<div><p><i/></p><p lilt=\"split=0\"><strong/></p><p "
+"lilt=\"split=1\"><strong/></p><br/><br/><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;\"/></center><br/><br/><p/><p/><p/><p "
+"style=\"color:#888888\"/></div>"
 
 #. module: account
 #: model:ir.ui.view,arch_db:account.portal_my_invoices
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 65e5dfa8530..f85eaf1c4b7 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -3,22 +3,23 @@
 # * account_analytic_default
 # 
 # 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
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 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: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"
@@ -29,12 +30,12 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
 msgid "<i class=\"fa fa-calendar\"/> From"
-msgstr ""
+msgstr "<i class=\"fa fa-calendar\"/>"
 
 #. module: account_analytic_default
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
 msgid "<strong>Customer</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: account_analytic_default
 #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban
diff --git a/addons/account_bank_statement_import/i18n/nl.po b/addons/account_bank_statement_import/i18n/nl.po
index 74bdcbe1d93..f2b8e865b43 100644
--- a/addons/account_bank_statement_import/i18n/nl.po
+++ b/addons/account_bank_statement_import/i18n/nl.po
@@ -7,7 +7,7 @@
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # Melroy van den Berg <webmaster1989@gmail.com>, 2017
 msgid ""
@@ -29,7 +29,7 @@ msgstr ""
 #: code:addons/account_bank_statement_import/static/src/js/account_bank_statement_import.js:13
 #, python-format
 msgid " Import Template for Bank Statements"
-msgstr ""
+msgstr "Importeer sjabloon voor bankafschriften"
 
 #. module: account_bank_statement_import
 #: code:addons/account_bank_statement_import/account_bank_statement_import.py:241
diff --git a/addons/account_invoicing/__init__.py b/addons/account_invoicing/__init__.py
index 67dee8c60db..91206cf6094 100644
--- a/addons/account_invoicing/__init__.py
+++ b/addons/account_invoicing/__init__.py
@@ -1,2 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.api import Environment, SUPERUSER_ID
+
+
+def uninstall_hook(cr, registry):
+    env = Environment(cr, SUPERUSER_ID, {})
+    res_ids = env['ir.model.data'].search([
+        ('model', '=', 'ir.ui.menu'),
+        ('module', '=', 'account')
+    ]).mapped('res_id')
+    env['ir.ui.menu'].browse(res_ids).update({'active': False})
diff --git a/addons/account_invoicing/__manifest__.py b/addons/account_invoicing/__manifest__.py
index 8630df721f6..faa54037c69 100644
--- a/addons/account_invoicing/__manifest__.py
+++ b/addons/account_invoicing/__manifest__.py
@@ -27,4 +27,5 @@ You could use this simplified accounting in case you work with an (external) acc
     'qweb': [
     ],
     'application': True,
+    'uninstall_hook': 'uninstall_hook',
 }
diff --git a/addons/account_invoicing/i18n/zh_CN.po b/addons/account_invoicing/i18n/zh_CN.po
index 0c364f15062..28b1d755e7f 100644
--- a/addons/account_invoicing/i18n/zh_CN.po
+++ b/addons/account_invoicing/i18n/zh_CN.po
@@ -3,15 +3,16 @@
 # * account_invoicing
 # 
 # Translators:
-# Connie Xiao <connie.xiao@elico-corp.com>, 2017
 # 苏州远鼎 <tiexinliu@126.com>, 2017
+# Connie Xiao <connie.xiao@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: 苏州远鼎 <tiexinliu@126.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"
@@ -40,4 +41,4 @@ msgstr "点击 <b>发送发票.</b>"
 msgid ""
 "Click to <b>validate your invoice.</b> A reference will be assigned to this "
 "invoice and you will not be able to modify it anymore."
-msgstr ""
+msgstr "<b/>"
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 7f9a79c7a53..95eed45fcf3 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Eric Geens <ericgeens@yahoo.com>, 2017
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 msgid ""
@@ -91,7 +91,7 @@ msgstr "<strong>Transacties</strong>"
 #: code:addons/account_payment/models/payment.py:80
 #, python-format
 msgid "Amount Mismatch (%s)"
-msgstr ""
+msgstr "Verschil bedrag (%s)"
 
 #. module: account_payment
 #: code:addons/account_payment/controllers/payment.py:52
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index aa1819498db..8fd91ca69e8 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -5,16 +5,17 @@
 # Translators:
 # grazziano <gra.negocia@gmail.com>, 2017
 # Mateus Lopes <mateus1@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # danimaribeiro <danimaribeiro@gmail.com>, 2017
 # mariana rodrigues <mariana12v@gmail.com>, 2018
+# Raphael Rodrigues <raphael0608@gmail.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: mariana rodrigues <mariana12v@gmail.com>, 2018\n"
+"Last-Translator: Raphael Rodrigues <raphael0608@gmail.com>, 2018\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,11 +217,15 @@ msgstr ""
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid "There was an error processing your payment: transaction issue.<br/>"
 msgstr ""
+"Ocorreu um erro no processamento do seu pagamento: problema de "
+"transação.<br/>"
 
 #. module: account_payment
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid "There was en error processing your payment: invalid credit card ID."
 msgstr ""
+"Ocorreu um erro no processamento do seu pagamento: ID do cartão de crédito "
+"inválido."
 
 #. module: account_payment
 #: model:ir.model.fields,field_description:account_payment.field_account_invoice_payment_tx_ids
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 6f360b21074..0e2dde84850 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -9,13 +9,14 @@
 # Luke <cialuo@qq.com>, 2017
 # Gary Wei <Gary.wei@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"
@@ -27,19 +28,19 @@ msgstr ""
 #: code:addons/account_payment/models/payment.py:61
 #, python-format
 msgid "<%s>  transaction (%s) invoice confirmation failed : <%s>"
-msgstr ""
+msgstr "<%s><%s>"
 
 #. module: account_payment
 #: code:addons/account_payment/models/payment.py:45
 #, python-format
 msgid "<%s> transaction (%s) failed : <%s>"
-msgstr ""
+msgstr "<%s><%s>"
 
 #. module: account_payment
 #: code:addons/account_payment/models/payment.py:52
 #, python-format
 msgid "<%s> transaction (%s) invalid state : %s"
-msgstr ""
+msgstr "<%s>"
 
 #. module: account_payment
 #: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po
index 0b8616fabe1..eb8db8a9abc 100644
--- a/addons/anonymization/i18n/fr.po
+++ b/addons/anonymization/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
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Henri Cornuau <hcornuau@gmail.com>, 2016
@@ -13,13 +13,14 @@
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Richard Mathot <rim@odoo.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"
@@ -30,12 +31,12 @@ msgstr ""
 #. module: anonymization
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
 msgid "<strong>Field</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: anonymization
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
 msgid "<strong>Model</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: anonymization
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban
diff --git a/addons/auth_oauth/i18n/es.po b/addons/auth_oauth/i18n/es.po
index ece6e718003..f3f45466401 100644
--- a/addons/auth_oauth/i18n/es.po
+++ b/addons/auth_oauth/i18n/es.po
@@ -3,23 +3,24 @@
 # * auth_oauth
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
 # oihane <oihanecruce@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
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2017
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
+# JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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: JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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"
@@ -77,7 +78,7 @@ msgstr "Id. de cliente"
 #. module: auth_oauth
 #: model:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Client ID:"
-msgstr ""
+msgstr "ID Cliente:"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_create_uid
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index fc18df1a969..9ace95a74b2 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -3,25 +3,26 @@
 # * auth_signup
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Magdalena Zimprich <magdalena.zimprich@camadeus.at>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 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
-# 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"
@@ -59,6 +60,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin: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:10px 10px 10px 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 "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p></p><p></p><p></p><div style=\"text-align: center; "
+"margin-top: 16px;\"><a href=\"${object.signup_url}\" style=\"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\"></a></div><p></p><p></p></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"></a></strong></p></div>"
 
 #. module: auth_signup
 #: model:mail.template,body_html:auth_signup.set_password_email
@@ -93,6 +115,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin: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:10px 10px 10px 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 "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p></p><p></p><p></p><div style=\"text-align: center; "
+"margin-top: 16px;\"><a href=\"${object.signup_url}\" style=\"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\"></a></div><p></p></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"></a></strong></p></div>"
 
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.set_password_email
@@ -136,6 +179,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat "
+"top /100%;color:#777777\"><table cellpadding=\"0\" cellspacing=\"0\" "
+"style=\"width:600px;border-"
+"collapse:collapse;background:inherit;color:inherit\"><tbody><tr><td "
+"style=\"padding:10px 10px 10px 5px;font-size: 12px\" valign=\"center\" "
+"width=\"200\"><img alt=\"${user.company_id.name}\" src=\"/logo.png\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: "
+"80px;\"/></td></tr></tbody></table></div><div "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p/><p/><p><br/></p><p/><div style=\"text-align: "
+"center; margin-top: 16px;\"><a href=\"/web/login?${ctx['auth_login']}\" "
+"style=\"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\"/></div><p/></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"/></strong></p></div>"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
diff --git a/addons/auth_signup/i18n/es.po b/addons/auth_signup/i18n/es.po
index aa087e07a10..9a85d652ef5 100644
--- a/addons/auth_signup/i18n/es.po
+++ b/addons/auth_signup/i18n/es.po
@@ -3,8 +3,8 @@
 # * auth_signup
 # 
 # Translators:
-# 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
 # Sandra Figueroa <sandrafigvar@gmail.com>, 2016
 # Alejandro Santana <alejandrosantana@anubia.es>, 2016
@@ -14,13 +14,14 @@
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Ana Juaristi <ajuaristio@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: Ana Juaristi <ajuaristio@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"
@@ -190,6 +191,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat "
+"top /100%;color:#777777\"><table cellpadding=\"0\" cellspacing=\"0\" "
+"style=\"width:600px;border-"
+"collapse:collapse;background:inherit;color:inherit\"><tbody><tr><td "
+"style=\"padding:10px 10px 10px 5px;font-size: 12px\" valign=\"center\" "
+"width=\"200\"><img alt=\"${user.company_id.name}\" src=\"/logo.png\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: "
+"80px;\"/></td></tr></tbody></table></div><div "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p/><p/><p><br/></p><p/><div style=\"text-align: "
+"center; margin-top: 16px;\"><a href=\"/web/login?${ctx['auth_login']}\" "
+"style=\"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\"/></div><p/></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"/></strong></p></div>"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
diff --git a/addons/auth_signup/i18n/fr.po b/addons/auth_signup/i18n/fr.po
index 146ea867f33..858b7a193cf 100644
--- a/addons/auth_signup/i18n/fr.po
+++ b/addons/auth_signup/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Quentin THEURET <odoo@kerpeo.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
 # Clo <clo@odoo.com>, 2016
@@ -13,16 +13,17 @@
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Eloïse Stilmant <est@odoo.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Olivier Lenoir <olivier.lenoir@free.fr>, 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"
@@ -120,6 +121,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin: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:10px 10px 10px 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 "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p></p><p></p><p></p><div style=\"text-align: center; "
+"margin-top: 16px;\"><a href=\"${object.signup_url}\" style=\"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\"></a></div><p></p></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"></a></strong></p></div>"
 
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.set_password_email
@@ -163,6 +185,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat "
+"top /100%;color:#777777\"><table cellpadding=\"0\" cellspacing=\"0\" "
+"style=\"width:600px;border-"
+"collapse:collapse;background:inherit;color:inherit\"><tbody><tr><td "
+"style=\"padding:10px 10px 10px 5px;font-size: 12px\" valign=\"center\" "
+"width=\"200\"><img alt=\"${user.company_id.name}\" src=\"/logo.png\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: "
+"80px;\"/></td></tr></tbody></table></div><div "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p/><p/><p><br/></p><p/><div style=\"text-align: "
+"center; margin-top: 16px;\"><a href=\"/web/login?${ctx['auth_login']}\" "
+"style=\"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\"/></div><p/></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"/></strong></p></div>"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 9ef65ed401c..b56ee31362e 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Jeff Yu - Elico Corp <jeff.yu@elico-corp.com>, 2017
 # 山西清水欧度(QQ:54773801) <54773801@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-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+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"
@@ -52,6 +53,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin: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:10px 10px 10px 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 "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p></p><p></p><p></p><div style=\"text-align: center; "
+"margin-top: 16px;\"><a href=\"${object.signup_url}\" style=\"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\"></a></div><p></p><p></p></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"></a></strong></p></div>"
 
 #. module: auth_signup
 #: model:mail.template,body_html:auth_signup.set_password_email
@@ -86,6 +108,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin: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:10px 10px 10px 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 "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p></p><p></p><p></p><div style=\"text-align: center; "
+"margin-top: 16px;\"><a href=\"${object.signup_url}\" style=\"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\"></a></div><p></p></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"></a></strong></p></div>"
 
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.set_password_email
@@ -129,6 +172,27 @@ msgid ""
 "    </p>\n"
 "</div>"
 msgstr ""
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat "
+"top /100%;color:#777777\"><table cellpadding=\"0\" cellspacing=\"0\" "
+"style=\"width:600px;border-"
+"collapse:collapse;background:inherit;color:inherit\"><tbody><tr><td "
+"style=\"padding:10px 10px 10px 5px;font-size: 12px\" valign=\"center\" "
+"width=\"200\"><img alt=\"${user.company_id.name}\" src=\"/logo.png\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: "
+"80px;\"/></td></tr></tbody></table></div><div "
+"style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top "
+"/100%;color:#777777\"><p/><p/><p><br/></p><p/><div style=\"text-align: "
+"center; margin-top: 16px;\"><a href=\"/web/login?${ctx['auth_login']}\" "
+"style=\"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\"/></div><p/></div><div "
+"style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: "
+"#fff repeat top /100%;color:#777777\"><p style=\"font-size: 11px; margin-"
+"top: 10px;\"><strong><a href=\"www.odoo.com\" style=\"text-decoration:none; "
+"color: #875A7B;\"/></strong></p></div>"
 
 #. module: auth_signup
 #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
diff --git a/addons/base_import/i18n/nl.po b/addons/base_import/i18n/nl.po
index 4fcfe1a5172..968bfbac4bb 100644
--- a/addons/base_import/i18n/nl.po
+++ b/addons/base_import/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -27,7 +27,7 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import_action.js:155
 #, python-format
 msgid " Import Template for Customers"
-msgstr ""
+msgstr "Importeer sjabloon voor klanten"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js
index 513a663cfc2..11b81a6373a 100644
--- a/addons/base_import/static/src/js/import_action.js
+++ b/addons/base_import/static/src/js/import_action.js
@@ -137,6 +137,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
                 model: 'base_import.import',
                 method: 'create',
                 args: [{res_model: this.res_model}],
+                kwargs: {context: session.user_context},
             });
     },
     renderButtons: function() {
@@ -286,6 +287,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
                 model: 'base_import.import',
                 method: 'parse_preview',
                 args: [this.id, this.import_options()],
+                kwargs: {context: session.user_context},
             }).done(function (result) {
                 var signal = result.error ? 'preview_failed' : 'preview_succeeded';
                 self[signal](result);
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 9b543ff3bc3..487b54c393c 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -5,22 +5,23 @@
 # Translators:
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Anja Funk <anja.funk@afimage.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
+# Niki Waibel, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# Anja Funk <anja.funk@afimage.de>, 2017
+# Renzo Meister, 2017
+# JackTheHunter <Maximilian.N98@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: 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"
@@ -32,7 +33,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid ""
 "<strong>Save</strong> this page and come back here to set up the feature."
-msgstr ""
+msgstr "<strong/>"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 78fd430d687..a1c8c594c2c 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -4,25 +4,26 @@
 # 
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # Diego de la Torre <diego.delatorreh@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2017
+# Antonio Trueba, 2017
 # RGB Consulting <odoo@rgbconsulting.com>, 2017
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2017
 # Ruben Dario Machado <ruben@vauxoo.com>, 2017
 # Pierre-Antoine Magnet <pma@odoo.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Juan José Scarafía <scarafia.juanjose@gmail.com>, 2017
+# JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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: Juan José Scarafía <scarafia.juanjose@gmail.com>, 2017\n"
+"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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"
@@ -337,7 +338,7 @@ msgstr "Uso de proveedor de autenticación externos (OAuth)"
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use external pads in Odoo Notes"
-msgstr ""
+msgstr "Usar pads externos  en Notas de Odoo"
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/bus/i18n/nl.po b/addons/bus/i18n/nl.po
index 77fde7df969..c9b5fa9fa56 100644
--- a/addons/bus/i18n/nl.po
+++ b/addons/bus/i18n/nl.po
@@ -124,7 +124,7 @@ msgstr "Gebruikers"
 #: code:addons/bus/controllers/main.py:41
 #, python-format
 msgid "bus.Bus not available in test mode"
-msgstr ""
+msgstr "bus.Bus niet beschikbaar in test modus"
 
 #. module: bus
 #: model:ir.model,name:bus.model_bus_bus
diff --git a/addons/calendar/i18n/fr.po b/addons/calendar/i18n/fr.po
index 93e56c92af6..1b728afcfc1 100644
--- a/addons/calendar/i18n/fr.po
+++ b/addons/calendar/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
 # Alexandre Laidin <alexandre.laidin@iris-solutions.fr>, 2016
@@ -20,7 +20,7 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Nicolas JEUDY <njeudy@panda-chi.io>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
@@ -30,13 +30,14 @@
 # Natys <support@natys.fr>, 2016
 # Jérémy Donas <LeDistordu@users.noreply.github.com>, 2016
 # Arthur Latour <arl@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:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Arthur Latour <arl@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"
@@ -130,6 +131,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;\"></div><div style=\"font-size:48px;min-height:auto;font-"
+"weight:bold;text-align:center;color: #5F5F5F;background-color: "
+"#F8F8F8;width: 130px;border:1px solid #875A7B;\"></div><div style='font-"
+"size:12px;text-align:center;font-weight:bold;color:#ffffff;background-"
+"color:#875A7B'></div><div style=\"border-collapse:separate;color: #5F5F5F"
+";text-align:center;width: 130px;font-size:12px;border-bottom-right-"
+"radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-"
+"radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
@@ -216,6 +284,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;border:1px solid #875A7B;\"></div><div style=\"font-"
+"size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F"
+";background-color: #F8F8F8;width: 130px;border:1px solid "
+"#875A7B;\"></div><div style='font-size:12px;text-align:center;font-"
+"weight:bold;color:#ffffff;background-color:#875A7B'></div><div style"
+"=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px"
+";font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px "
+"solid #875A7B;border-bottom-left-radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
@@ -303,6 +438,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;\"></div><div style=\"font-size:48px;min-height:auto;font-"
+"weight:bold;text-align:center;color: #5F5F5F;background-color: "
+"#F8F8F8;width: 130px;border:1px solid #875A7B;\"></div><div style='font-"
+"size:12px;text-align:center;font-weight:bold;color:#ffffff;background-"
+"color:#875A7B'></div><div style=\"border-collapse:separate;color: #5F5F5F"
+";text-align:center;width: 130px;font-size:12px;border-bottom-right-"
+"radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-"
+"radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
diff --git a/addons/calendar/i18n/nl.po b/addons/calendar/i18n/nl.po
index 18a85ab17bb..22f689b7625 100644
--- a/addons/calendar/i18n/nl.po
+++ b/addons/calendar/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # e2f_nl_c4 <e2f_nl_c4@hotmail.com>, 2017
@@ -589,7 +589,7 @@ msgstr "1 U(u)r(en)"
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_1
 msgid "15 Minute(s)"
-msgstr "15 Minu(u)t(en) "
+msgstr "15 Minu(u)t(en)"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_4
diff --git a/addons/calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po
index 415c7674f57..38de9af129d 100644
--- a/addons/calendar/i18n/zh_CN.po
+++ b/addons/calendar/i18n/zh_CN.po
@@ -11,13 +11,14 @@
 # Martin Trigaux, 2017
 # Gary Wei <Gary.wei@elico-corp.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:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+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"
@@ -111,6 +112,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;\"></div><div style=\"font-size:48px;min-height:auto;font-"
+"weight:bold;text-align:center;color: #5F5F5F;background-color: "
+"#F8F8F8;width: 130px;border:1px solid #875A7B;\"></div><div style='font-"
+"size:12px;text-align:center;font-weight:bold;color:#ffffff;background-"
+"color:#875A7B'></div><div style=\"border-collapse:separate;color: #5F5F5F"
+";text-align:center;width: 130px;font-size:12px;border-bottom-right-"
+"radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-"
+"radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
@@ -197,6 +265,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;border:1px solid #875A7B;\"></div><div style=\"font-"
+"size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F"
+";background-color: #F8F8F8;width: 130px;border:1px solid "
+"#875A7B;\"></div><div style='font-size:12px;text-align:center;font-"
+"weight:bold;color:#ffffff;background-color:#875A7B'></div><div style"
+"=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px"
+";font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px "
+"solid #875A7B;border-bottom-left-radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
@@ -284,6 +419,73 @@ msgid ""
 "    </table>\n"
 "</div>"
 msgstr ""
+"<div summary=\"o_mail_template\" "
+"style=\"padding:0px;width:600px;margin: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:10px 10px 10px 5px;font-"
+"size: 12px\"><img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; "
+"height: auto; width: 80px;\" alt=\"${user.company_id.name}\"></td><td "
+"valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px "
+"10px 5px; font-size: 12px;\"><p><a "
+"href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or "
+"'' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a><a "
+"href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or "
+"''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and "
+"ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"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\"></a></p></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:10px 10px 10px 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;margin: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 "
+"style=\"padding:10px 10px 10px 5px;font-size: 14px;\"><p style=\"font-size: "
+"20px; text-align: center;\"><strong></strong></p><p><strong></strong><br "
+"/></p><table style=\"margin-top: 20px;\"><tr><td><div style=\"border-top-"
+"left-radius:3px;border-top-right-radius:3px;font-size:12px;border-"
+"collapse:separate;text-align:center;font-"
+"weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B"
+";padding-top: 4px;\"></div><div style=\"font-size:48px;min-height:auto;font-"
+"weight:bold;text-align:center;color: #5F5F5F;background-color: "
+"#F8F8F8;width: 130px;border:1px solid #875A7B;\"></div><div style='font-"
+"size:12px;text-align:center;font-weight:bold;color:#ffffff;background-"
+"color:#875A7B'></div><div style=\"border-collapse:separate;color: #5F5F5F"
+";text-align:center;width: 130px;font-size:12px;border-bottom-right-"
+"radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-"
+"radius:3px;\"></div></td><td "
+"width=\"20px;\"/><td><p></p><ul><li><ul><li><div style=\"display:inline-"
+"block; border-radius: 50%; width:10px; "
+"height:10px;background:${colors[attendee.state] or 'white'};\"></div><span "
+"style=\"margin-left:5px\"></span><span style=\"margin-"
+"left:5px\"></span></li></ul></li></ul></td></tr></table></td></tr></tbody></table></div><li><a"
+" target=\"_blank\" "
+"href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\"></a></li><li></li><li></li>"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index f10716d43a2..1548ddfacba 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -75,7 +75,7 @@
                 <field name="partner_ids"/>
                 <field name="location"/>
                 <field name="state" invisible="True"/>
-                <field name="duration"/>
+                <field name="duration" widget="float_time"/>
                 <field name="message_needaction" invisible="1"/>
             </tree>
         </field>
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 93847907d82..0458bdaf959 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -4,27 +4,27 @@
 # 
 # Translators:
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Magdalena Zimprich <magdalena.zimprich@camadeus.at>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Tom <github@strohmeier.email>, 2017
+# Wolfgang Taferner, 2017
+# Tom, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Patrick Belser <patrick.belser@camptocamp.com>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Dejan Dinic, 2017
+# Renzo Meister, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Nicolas Frei <nicolas.frei@braintec-group.com>, 2017
+# Nicolas Frei, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
 # key six <mobile.umts@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Martin K <martinkuenz@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # aNj <anj2j@yahoo.de>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
@@ -32,13 +32,14 @@
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 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:44+0000\n"
 "PO-Revision-Date: 2017-12-13 14:44+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"
@@ -153,7 +154,7 @@ msgid ""
 "<p>Here is the description about the opportunity : </p><p><i>${object.description}</i>\n"
 "%endif\n"
 "</p><p>Thank you!</p>\n"
-msgstr ""
+msgstr "<p/><p><strong/></p><p/><p><i/></p><p/>"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_meeting_count
@@ -174,7 +175,7 @@ msgstr "# der Aktivitäten"
 msgid ""
 "<b>Drag &amp; drop opportunities</b> between columns as you progress in your"
 " sales cycle."
-msgstr ""
+msgstr "<b/>"
 
 #. module: crm
 #. openerp-web
@@ -543,7 +544,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:53
 #, python-format
 msgid "Click on an opportunity to zoom to it."
-msgstr ""
+msgstr "Klicken Sie auf eine Chance, um die Details anzuzeigen."
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:919
@@ -570,6 +571,7 @@ msgstr "Klicken, um neues Schlagwort für Leads zu erstellen "
 #: model:ir.actions.act_window,help:crm.crm_stage_action
 msgid "Click to set a new stage in your opportunity pipeline."
 msgstr ""
+"Klicken Sie, um eine neue Stufe in Ihrer Chancen-Pipeline zu erstellen."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
@@ -722,7 +724,7 @@ msgstr "Anlegen"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
 msgid "Create & Edit"
-msgstr ""
+msgstr "Anlegen und bearbeiten"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_create_date
@@ -810,7 +812,7 @@ msgstr "Erstellungsmonat"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_your_pipeline
 msgid "Crm: My Pipeline"
-msgstr ""
+msgstr "Crm: Meine Pipeline"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_company_currency
@@ -847,7 +849,7 @@ msgstr "Kunde"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_module_web_clearbit
 msgid "Customer Autocomplete"
-msgstr ""
+msgstr "Kunden-Autovervollständigung"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1137
@@ -874,6 +876,8 @@ msgid ""
 "Dashboard graph content cannot be Pipeline if the sales channel doesn't use "
 "it. (Pipeline is unchecked.)"
 msgstr ""
+"Dashboard-Diagramm-Inhalte können keine Pipeline sein, wenn der "
+"Vertriebskanal sie nicht verwendet. (Pipeline wurde nicht geprüft.)"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_activity_report_date
@@ -988,6 +992,12 @@ msgid ""
 "Incoming emails can be automatically assigned to specific sales channels. To"
 " do so, set an email alias on the sales channel."
 msgstr ""
+"Die E-Mails, die an diese Adresse gesendet werden, bringen neue "
+"Interessenten hervor, die noch keinem Vertriebskanal zugewiesen wurden. Dies"
+" kann erreicht werden, indem sie in neue Chancen umgewandelt werden. "
+"Eingehende E-Mails können automatisch bestimmten Vertriebskanälen "
+"zugewiesen. Dies erreichen Sie dadurch, dass Sie einen E-Mail Alias auf dem "
+"Vertriebskanal festlegen."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage_requirements
@@ -1034,17 +1044,17 @@ msgstr "Erwartetes Abschlussdatum"
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Day"
-msgstr ""
+msgstr "Erwartetes Abschlussdatum"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Month"
-msgstr ""
+msgstr "Erwarteter Abschlussmonat"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Week"
-msgstr ""
+msgstr "Erwartete Abschlusswoche"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
@@ -1064,7 +1074,7 @@ msgstr "Erwarteter Umsatz"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_period_pipeline
 msgid "Expected to Close"
-msgstr ""
+msgstr "Erwarteter Abschluss"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -1129,12 +1139,12 @@ msgstr "Anstehende Aktivitäten"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 msgid "Future Activities (7 days)"
-msgstr ""
+msgstr "Anstehende Aktivitäten (7 Tage)"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 msgid "Future Activities (All)"
-msgstr ""
+msgstr "Anstehende Aktivitäten (Alle)"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -1142,6 +1152,8 @@ msgid ""
 "Generate unassigned leads from incoming emails. Leads coming from\n"
 "                                    that email will be assigned manually."
 msgstr ""
+"Nicht zugewiesene Interessenten durch eingehende E-Mails hervorbringen. Interessenten aus \n"
+"diese E-Mail wird automatisch zugewiesen."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_lost
@@ -1157,7 +1169,7 @@ msgstr "Globale CC"
 #: code:addons/crm/models/crm_lead.py:390
 #, python-format
 msgid "Go, go, go! Congrats for your first deal."
-msgstr ""
+msgstr "Geschafft! Gratulation zu Ihrem ersten Abschluss."
 
 #. module: crm
 #. openerp-web
@@ -1195,6 +1207,8 @@ msgid ""
 "Here is the list of your next activities. Those are linked to your opportunities.\n"
 "                   To set a next activity, go on an opportunity and add one. It will then appear in this list."
 msgstr ""
+"Hier ist die Liste Ihrer Folgeaktivitäten. Diese sind mit Ihren Verkaufschancen verknüpft . \n"
+"Für eine weitere Aktivität, öffnen Sie eine Chance und  fügen dort eine neue Aktion hinzu. Diese erscheint dann in dieser Liste."
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.opportunity.report,priority:0
@@ -1204,7 +1218,7 @@ msgstr "Hoch"
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_group_pipeline
 msgid "How this channel's dashboard graph will group the results."
-msgstr ""
+msgstr "So gruppiert dieses Dashboard-Diagramm des Kanals die Ergebnisse."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_id
@@ -1508,7 +1522,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 "Lesen Sie mehr über das Unternehmen (Name, Logo, etc.)"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1097
@@ -1544,12 +1558,12 @@ msgstr "Niedrig"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_generate_lead_from_alias
 msgid "Manual Assignation of Emails"
-msgstr ""
+msgstr "Manuelle E-Mail-Zuordnung"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Manually Assignation of Incoming Emails"
-msgstr ""
+msgstr "Manuelle Zuordnung einkommender E-Mails"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -1734,7 +1748,7 @@ msgstr "Meine Verkaufschancen"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "My Pipeline"
-msgstr ""
+msgstr "Meine Pipeline"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_group_by_name
@@ -1762,12 +1776,12 @@ msgstr "Nächste Aktivitäten"
 #. module: crm
 #: selection:crm.lead,kanban_state:0
 msgid "Next activity is planned"
-msgstr ""
+msgstr "Nächste Aktivität ist geplant"
 
 #. module: crm
 #: selection:crm.lead,kanban_state:0
 msgid "Next activity late"
-msgstr ""
+msgstr "Nächste Aktivität zu spät"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1157
@@ -1778,7 +1792,7 @@ msgstr "Kein Betreff"
 #. module: crm
 #: selection:crm.lead,kanban_state:0
 msgid "No next activity planned"
-msgstr ""
+msgstr "Keine nächste Aktivität geplant"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -1814,7 +1828,7 @@ msgstr "Anzahl Tage bis Eröffnung"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team_opportunities_count
 msgid "Number of open opportunities"
-msgstr ""
+msgstr "Anzahl der offenen Chancen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
@@ -1854,12 +1868,12 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Offene Chancen"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Open Opportunity"
-msgstr ""
+msgstr "Offene Chance"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_form_view_salesteams_opportunity
@@ -1895,6 +1909,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the"
 " channels of the sales pipeline."
 msgstr ""
+"Chancenanalyse bietet Ihnen sofortigen Zugang zu Ihren Chancen mit "
+"Informationen, wie der erwartete Umsatz, die eingeplanten Kosten, verpasste "
+"Fristen oder die Anzahl der Interaktionen pro Chance. Diese Berichte werden "
+"vorrangig von Vertriebsmanagern verwendet, um regelmäßige Berichte mit den "
+"Chancen der Vertriebspipeline zu erstellen."
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_opportunity_opportunities_cohort
@@ -2055,7 +2074,7 @@ msgstr "Telefon"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings_module_crm_phone_validation
 msgid "Phone Validation"
-msgstr ""
+msgstr "Telefonische Validierung"
 
 #. module: crm
 #: code:addons/crm/models/crm_team.py:165
@@ -2101,6 +2120,11 @@ msgid ""
 "mainly used by the sales manager in order to periodically review the pipeline\n"
 "with the the sales channel."
 msgstr ""
+"Eine Pipeline-Analyse ermöglicht einen sofortigen Zugriff \n"
+"auf Ihre Chancen mit Informationen zum erwarteten Umsatz, \n"
+"geplanten Kosten, verpassten Deadlines oder die Anzahl der Interaktionen pro Chance. \n"
+"Dieser Bericht wird hauptsächlich von den Vertriebsmanagern genutzt, \n"
+"um gemeinsam mit Ihrem Vertriebskanal periodische Prüfungen der Pipeline vorzunehmen. "
 
 #. module: crm
 #: code:addons/crm/models/crm_team.py:231
@@ -2175,7 +2199,7 @@ msgstr "Qualifiziert"
 msgid ""
 "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under "
 "<b>CRM</b> app."
-msgstr ""
+msgstr "<b/><b/>"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lost_reason
@@ -2613,7 +2637,7 @@ msgstr "Dieser Monat"
 #, python-format
 msgid ""
 "This opportunity has <b>no activity planned</b>. <i>Click to check them.</i>"
-msgstr ""
+msgstr "<i/><b/>"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage_probability
@@ -2774,7 +2798,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:65
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to your sales pipeline</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_user_login
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index e68b26bb518..7447d815a48 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/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
 # Clo <clo@odoo.com>, 2016
 # Christophe Dubuit <cdubuit@yahoo.com>, 2016
@@ -28,11 +28,11 @@
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # Agathe Mollé <molleagathe@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Magali <mch@openerp.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Olivier Dony <odo@odoo.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Jérémy Donas <LeDistordu@users.noreply.github.com>, 2016
 # Jeanjean Noname <monsieur.spock@gmail.com>, 2016
@@ -47,13 +47,14 @@
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Félix Desjardins <felixinx@gmail.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:44+0000\n"
 "PO-Revision-Date: 2017-12-13 14:44+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"
@@ -2211,7 +2212,7 @@ msgstr "Qualifié"
 msgid ""
 "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under "
 "<b>CRM</b> app."
-msgstr ""
+msgstr "<b/><b/>"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lost_reason
@@ -2827,7 +2828,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:65
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to your sales pipeline</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead_user_login
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 39eeb0a58b7..73ab63e83fa 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -6,7 +6,7 @@
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Melroy van den Berg <webmaster1989@gmail.com>, 2017
@@ -121,6 +121,98 @@ msgid ""
 "            </div>\n"
 "        </div>"
 msgstr ""
+"\n"
+"\n"
+"            <div style=\"margin: 10px auto;\">\n"
+"            % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n"
+"            <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td style=\"padding:2px;width:30%;\">\n"
+"                            <img src=\"web/static/src/img/logo.png\"/>\n"
+"                        </td>\n"
+"                        <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
+"                            <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;\">Auto Login</a>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"            <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
+"                <tbody>\n"
+"                    <tr>\n"
+"                        <td style=\"padding:15px 10px;font-size:20px\">\n"
+"                            <p style=\"color:#875A7B;margin:0\" >Hoera!</p><br>\n"
+"                            <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                <span>Uw Odoo CRM applicatie is klaar.</span></p><br>\n"
+"                            <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+"                                <span style=\"font-size:13px;font-weight:bold; \">Wat nu?</span></p>\n"
+"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                        <span>Probeer een lead aan te maken door een e-mail te sturen naar </span>\n"
+"                                        <a href=\"mailto:${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}\">\n"
+"                                            <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}</span>\n"
+"                                        </a>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+"                                        Volg uw opportuniteiten op in uw verkoop funnel door simpelweg de kaarten van de ene kolom naar de andere te slepen</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                            </ul> <br>\n"
+"                            <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                        <span>Automatisch uw leads aan verkopers toewijzen met lead scoring,</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                        <span>Blijf in contact met uw potentiële klant met efficiënte e-mail campagnes,</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                        <span>Krijg waardevolle inzichten van enquêtes,</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+"                                        <span>Krijg slimme rapportering en accurate dashboards,</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                                <li dir=\"ltr\">\n"
+"                                    <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+"                                        <span>En nog veel meer...</span>\n"
+"                                    </p>\n"
+"                                </li>\n"
+"                            </ul>\n"
+"                            <br>\n"
+"                            <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
+"                                <span style=\"font-weight:bold;\">Hulp nodig?</span>\n"
+"                                <span style=\"font-style:italic;\">U bent niet alleen</span>\n"
+"                            </p>\n"
+"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+"                                <span>We zouden het geweldig vinden om je te ondersteunen. Contacteer ons via ons\n"
+"                                <a href=\"https://www.odoo.com/help\">support formulier</a> indien u vragen heeft.\n"
+"                                U kan ook ontdekken hoe u het beste uit de Odoo CRM haalt met onze  </span>\n"
+"                                <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/10.0/crm.html\">\n"
+"                                <span style=\"text-decoration:underline;\">Gebruikers documentatie</span></a>\n"
+"                                </span><span> of met onze</span>\n"
+"                                <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n"
+"                                <span style=\"text-decoration:underline;\">API documentatie</span></a>\n"
+"                            </p>\n"
+"                            <br>\n"
+"                            <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Geniet van uw Odoo Experience,</span></p>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </tbody>\n"
+"            </table>\n"
+"            <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
+"                <span><br/>-- <br/>Het Odoo team<br/>PS: Mensen houden van Odoo, controleer </span><a target=\"_blank\" href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">wat ze erover zeggen.</span></a></span>\n"
+"            </div>\n"
+"        </div>"
 
 #. module: crm
 #: model:mail.template,body_html:crm.email_template_opportunity_reminder_mail
@@ -1042,7 +1134,7 @@ msgstr "Verwachte omzet"
 #. module: crm
 #: model:ir.filters,name:crm.filter_opportunity_expected_revenue
 msgid "Expected Revenue by Channel"
-msgstr ""
+msgstr "Verwachte omzet per kanaal"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
@@ -1154,7 +1246,7 @@ msgstr "Ga, ga ga! Proficiat met uw eerste deal."
 #: code:addons/crm/static/src/js/tour.js:79
 #, python-format
 msgid "Good job! Your completed the tour of the CRM."
-msgstr ""
+msgstr "Goed gedaan! U heeft de CRM toer voltooid."
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
@@ -2667,17 +2759,17 @@ msgstr "Titel"
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "To Close This Month"
-msgstr ""
+msgstr "Te sluiten deze maand"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "To Close This Week"
-msgstr ""
+msgstr "Te sluiten deze week"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "To Close Today"
-msgstr ""
+msgstr "Vandaag te sluiten"
 
 #. module: crm
 #: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -2901,12 +2993,12 @@ msgstr "Gewonnen"
 #. module: crm
 #: model:ir.filters,name:crm.filter_opportunity_opportunities_won_per_team
 msgid "Won by Channel"
-msgstr ""
+msgstr "Gewonnen per kanaal"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_opportunity_country
 msgid "Won by Country"
-msgstr ""
+msgstr "Gewonnen per land"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_users_target_sales_won
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index eccfdd823ea..52128e5d2ce 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -13,13 +13,14 @@
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Jeff Yu - Elico Corp <jeff.yu@elico-corp.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:44+0000\n"
 "PO-Revision-Date: 2017-12-13 14:44+0000\n"
-"Last-Translator: Jeff Yu - Elico Corp <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"
@@ -2096,7 +2097,7 @@ msgstr "验证"
 msgid ""
 "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under "
 "<b>CRM</b> app."
-msgstr ""
+msgstr "<b/><b/>"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lost_reason
@@ -2518,7 +2519,7 @@ msgstr "本月"
 #, python-format
 msgid ""
 "This opportunity has <b>no activity planned</b>. <i>Click to check them.</i>"
-msgstr ""
+msgstr "<i/><b/>"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage_probability
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index 642451ba107..1a5a8bb6dc1 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -909,29 +909,23 @@ class Lead(models.Model):
 
     @api.model
     def get_empty_list_help(self, help):
-        if help:
-            help_title = ""
-            if self._context.get('default_type') == 'lead':
-                help_title = _('Click here to add new Leads')
-            else:
-                help_title = _('Create a new opportunity to add it to your pipeline')
-            alias_record = self.env['mail.alias'].search([
-                ('alias_name', '!=', False),
-                ('alias_name', '!=', ''),
-                ('alias_model_id.model', '=', 'crm.lead'),
-                ('alias_parent_model_id.model', '=', 'crm.team'),
-                ('alias_force_thread_id', '=', False)
-            ], limit=1)
-            if alias_record and alias_record.alias_domain and alias_record.alias_name:
-                email = '%s@%s' % (alias_record.alias_name, alias_record.alias_domain)
-                email_link = "<a href='mailto:%s'>%s</a>" % (email, email)
-                help_title = _('%s or send an email to %s') % (help_title, email_link)
-            return '<p class="o_view_nocontent_smiling_face">%s</p><p>%s</p>' % (help_title, help)
-        return super(Lead, self.with_context(
-            empty_list_help_model='crm.team',
-            empty_list_help_id=self._context.get('default_team_id', False),
-            empty_list_help_document_name= _('leads') if self._context.get('default_type') == 'lead' else _('opportunity'),
-        )).get_empty_list_help(help)
+        help_title, sub_title = "", ""
+        if self._context.get('default_type') == 'lead':
+            help_title = _('Click here to add new Leads')
+        else:
+            help_title = _('Create a new opportunity to add it to your pipeline')
+        alias_record = self.env['mail.alias'].search([
+            ('alias_name', '!=', False),
+            ('alias_name', '!=', ''),
+            ('alias_model_id.model', '=', 'crm.lead'),
+            ('alias_parent_model_id.model', '=', 'crm.team'),
+            ('alias_force_thread_id', '=', False)
+        ], limit=1)
+        if alias_record and alias_record.alias_domain and alias_record.alias_name:
+            email = '%s@%s' % (alias_record.alias_name, alias_record.alias_domain)
+            email_link = "<a href='mailto:%s'>%s</a>" % (email, email)
+            sub_title = _('or send an email to %s') % (email_link)
+        return '<p class="o_view_nocontent_smiling_face">%s</p><p>%s</p>' % (help_title, sub_title)
 
     @api.multi
     def log_meeting(self, meeting_subject, meeting_date, duration):
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 94cdb72bdd0..1aa2517c745 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -840,16 +840,6 @@ for rec in records:
                     'search_default_to_process':1,
                 }
             </field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    Create a new lead
-                </p><p>
-                    Use leads if you need a qualification step before creating an
-                    opportunity or a customer. It can be a business card you received,
-                    a contact form filled in your website, or a file of unqualified
-                    prospects you import, etc.
-                </p>
-            </field>
         </record>
 
         <menuitem
@@ -872,18 +862,6 @@ for rec in records:
                 }
             </field>
             <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    Create a new opportunity
-                </p><p>
-                    Odoo helps you keep track of your sales pipeline to follow
-                    up potential sales and better forecast your future revenues.
-                </p><p>
-                    You will be able to plan meetings and phone calls from
-                    opportunities, convert them into quotations, attach related
-                    documents, track all discussions, and much more.
-                </p>
-            </field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_oppor11">
@@ -933,18 +911,6 @@ for rec in records:
                           (0, 0, {'view_mode': 'pivot'}),
                           (0, 0, {'view_mode': 'graph'})]"/>
             <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    Create a new opportunity
-                </p><p>
-                    Odoo helps you keep track of your sales pipeline to follow
-                    up potential sales and better forecast your future revenues.
-                </p><p>
-                    You will be able to plan meetings and phone calls from
-                    opportunities, convert them into quotations, attach related
-                    documents, track all discussions, and much more.
-                </p>
-            </field>
         </record>
 
         <menuitem
diff --git a/addons/crm_project/i18n/de.po b/addons/crm_project/i18n/de.po
index d1f2702aa77..47c2f39b18e 100644
--- a/addons/crm_project/i18n/de.po
+++ b/addons/crm_project/i18n/de.po
@@ -7,15 +7,16 @@
 # Tina Rittmüller <tr@ife.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Niki Waibel, 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: 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 ""
 msgid ""
 "<span class=\"o_stat_text\">Convert To</span>\n"
 "                            <span class=\"o_stat_text\">Task</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
diff --git a/addons/crm_project/i18n/fr.po b/addons/crm_project/i18n/fr.po
index df2a4fe78eb..c2f8dcedd9b 100644
--- a/addons/crm_project/i18n/fr.po
+++ b/addons/crm_project/i18n/fr.po
@@ -3,16 +3,18 @@
 # * crm_project
 # 
 # Translators:
+# Florian Hatat, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
+# Bertrand LATOUR <divoir@gmail.com>, 2017
 # Xavier Belmere <Info@cartmeleon.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:52+0000\n"
 "PO-Revision-Date: 2017-09-20 09:52+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"
@@ -25,7 +27,7 @@ msgstr ""
 msgid ""
 "<span class=\"o_stat_text\">Convert To</span>\n"
 "                            <span class=\"o_stat_text\">Task</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
diff --git a/addons/crm_project/i18n/zh_CN.po b/addons/crm_project/i18n/zh_CN.po
index 2b9d021df83..5095b5fc4a3 100644
--- a/addons/crm_project/i18n/zh_CN.po
+++ b/addons/crm_project/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # waveyeung <waveyeung@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.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, 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"
@@ -27,7 +28,7 @@ msgstr ""
 msgid ""
 "<span class=\"o_stat_text\">Convert To</span>\n"
 "                            <span class=\"o_stat_text\">Task</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: crm_project
 #: model:ir.ui.view,arch_db:crm_project.crm_lead_convert2task_view_form
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index a511738f8fc..da4c841d4a7 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -10,13 +10,14 @@
 # Martin Trigaux, 2016
 # Xiaoming Deng <sumandeng@hotmail.com>, 2016
 # 老窦 北京 <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"
@@ -60,6 +61,9 @@ msgid ""
 "<p>Thank you,</p>\n"
 "      </data>"
 msgstr ""
+"<?xml version=\"1.0\"?><data><p></p><p></p><p><a "
+"href=\"${object.carrier_tracking_url}\" "
+"target=\"_blank\"></a></p><p></p><p></p></data>"
 
 #. module: delivery
 #: model:mail.template,body_html:delivery.mail_template_data_delivery_notification
@@ -117,6 +121,33 @@ msgid ""
 "        </table>\n"
 "      "
 msgstr ""
+"<?xml version=\"1.0\"?><table border=\"0\" width=\"100%\" cellpadding=\"0\" "
+"bgcolor=\"#ededed\" style=\"font-family:Arial,Helvetica,sans-serif; padding:"
+" 20px; background-color: #ededed\" "
+"summary=\"o_mail_notification\"><tbody><!-- HEADER --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"650\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px;"
+" background-color: rgb(135,90,123); padding: 20px;\"><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\" style=\"padding: 0px; margin: 0px; height: auto; width: "
+"80px;\" alt=\"${user.company_id.name}\"/></td></tr></table></td></tr><!-- "
+"CONTENT --><tr><td align=\"center\" style=\"min-width: 590px;\"><table "
+"width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style"
+"=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: "
+"20px;\"><tbody><td valign=\"top\" style=\"color: #555; font-size: "
+"14px;\"></td></tbody></table></td></tr><!-- FOOTER --><tr><td "
+"align=\"center\" style=\"min-width: 590px;\"><table width=\"650\" "
+"border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px;"
+" background-color: rgb(135,90,123); padding: 20px;\"><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:${user.company_id.email}\" style"
+"=\"text-decoration:none; color: white;\"></a><br/><a "
+"href=\"${user.company_id.website}\" style=\"text-decoration:none; color: "
+"white;\"></a></td></tr></table></td></tr><tr><td align=\"center\"><a "
+"href=\"https://www.odoo.com\"></a></td></tr></tbody></table>"
 
 #. module: delivery
 #: code:addons/delivery/models/delivery_carrier.py:76
@@ -742,7 +773,7 @@ msgstr ""
 msgid ""
 "Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: "
 "%.2f %s"
-msgstr ""
+msgstr "<br/>"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_price
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 513a5b2423c..5b993bc68a1 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -105,16 +105,12 @@ class StockPicking(models.Model):
 
     @api.multi
     def action_done(self):
-        # TDE FIXME: should work in batch
-        self.ensure_one()
         res = super(StockPicking, self).action_done()
-
-        if self.carrier_id and self.carrier_id.integration_level == 'rate_and_ship':
-            self.send_to_shipper()
-
-        if self.carrier_id:
-            self._add_delivery_cost_to_so()
-
+        for pick in self:
+            if pick.carrier_id:
+                if pick.carrier_id.integration_level == 'rate_and_ship':
+                    pick.send_to_shipper()
+                pick._add_delivery_cost_to_so()
         return res
 
     @api.multi
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index d9d9af6f75c..548d55cee72 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -3,14 +3,14 @@
 # * event
 # 
 # Translators:
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Renzo Meister, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Thomas Neu <t.neu@runbox.com>, 2017
@@ -20,13 +20,14 @@
 # Thomas Lengyel <lexustec_fn@yahoo.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Anja Funk <anja.funk@afimage.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: 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"
@@ -202,6 +203,72 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-"
+"align:baseline;max-width:100px;\" /></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.event_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"></a></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background:white;border:1px solid "
+"#e1e1e1;\"><tbody><tr><td style=\"padding:15px 20px 0px 20px; font-"
+"size:16px; font-weight:300;\"><p style=\"font-size:16px;\"></p><p style"
+"=\"font-size:16px;\"></p><ul></ul><p style=\"font-size:16px;\"></p><p style"
+"=\"font-size:16px; margin-bottom: 30px\"><i><br/></i></p></td></tr><tr><td "
+"style=\"padding:15px 20px 0px 20px;\"><table style=\"width:100%;border-"
+"top:1px solid #e1e1e1;\"><tr><td style=\"padding:25px 0px; text-"
+"align:center;\"><p><strong></strong></p><a "
+"href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin,"
+" tz='UTC', "
+"format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, "
+"tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px "
+"solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" "
+"target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\""
+" style=\"vertical-align:middle;\" height=\"16\"></a></td></tr></table><table"
+" style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:25px 10px 25px "
+"10px;width:50%;line-height:20px;vertical-"
+"align:top;\"><div><strong></strong></div><div><strong></strong></div><div "
+"style=\"font-"
+"size:12px;color:#9e9e9e\"><i><strong></strong></i></div></td><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:30px 10px 25px "
+"10px;width:50%;vertical-align:top;\"><p style=\"margin:0px 0px 0px "
+"0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p style=\"margin:0px "
+"0px 0px 0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p "
+"style=\"margin:0px 0px 0px 0px;\"></p></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:10px 0px 25px 0px;\"><h2 style=\"font-weight:300;margin:10px"
+" "
+"0px\"></h2><p></p><ul><li></li></ul></td></tr></table></td></tr></tbody></table><div"
+" style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\" /></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div></div><div><a "
+"href=\"/event\" style=\"text-"
+"decoration:none;color:#717188;\"></a></div></td></tr></tbody></table></div><li><a"
+" href=\"${object.event_id.website_url}\" style=\"color:#875A7B;text-"
+"decoration:none;\"></a><strong></strong></li><li/><li/><li><a "
+"href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-"
+"decoration:none;color:#875A7B;\"/></li>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_reminder
@@ -365,6 +432,71 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-"
+"align:baseline;max-width:100px;\" /></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.event_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"></a></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background:white;border:1px solid "
+"#e1e1e1;\"><tbody><tr><td style=\"padding:15px 20px 0px 20px; font-"
+"size:16px;\"><p style=\"font-size:16px;\"></p><p style=\"font-"
+"size:16px;\"><a href=\"${object.event_id.website_url}\" "
+"style=\"color:#875A7B;text-decoration:none;\"></a><strong></strong></p><p "
+"style=\"font-size:16px;\"></p><p style=\"font-size:16px; margin-bottom: "
+"30px\"><i><br/></i></p></td></tr><tr><td style=\"padding:15px 20px 0px "
+"20px;\"><table style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:25px 10px 25px "
+"10px;width:50%;line-height:20px;vertical-"
+"align:top;\"><div><strong></strong></div><div><strong></strong></div><div "
+"style=\"font-"
+"size:12px;color:#9e9e9e\"><i><strong></strong></i></div></td><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:30px 10px 25px "
+"10px;width:50%;vertical-align:top;\"><p style=\"margin:0px 0px 0px "
+"0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p style=\"margin:0px "
+"0px 0px 0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p "
+"style=\"margin:0px 0px 0px 0px;\"></p></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:10px 0px 25px 0px;\"><h2 style=\"font-weight:300;margin:10px"
+" 0px\"></h2><p></p><ul><li></li></ul></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;\"><strong></strong><a "
+"href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin,"
+" tz='UTC', "
+"format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, "
+"tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px "
+"solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" "
+"target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\""
+" style=\"vertical-align:middle;\" "
+"height=\"16\"></a></td></tr></table></td></tr></tbody></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\" /></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><p style=\"margin:0px 0px 9px "
+"0px;padding-top:10px;\"></p><div><a href=\"/event\" style=\"text-"
+"decoration:none;color:#717188;\"></a></div></td></tr></tbody></table></div><li></li><li><a"
+" href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-"
+"decoration:none;color:#875A7B;\"></a></li>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_registration_mail_template_badge
@@ -375,7 +507,7 @@ msgid ""
 "<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
 "<p>If you have any questions, please let us know.</p>\n"
 "<p>Best regards,</p>"
-msgstr ""
+msgstr "<p/><p/><p/><p/><p/>"
 
 #. module: event
 #: model:mail.template,subject:event.event_reminder
@@ -404,6 +536,8 @@ msgid ""
 "                                        to \n"
 "                                    </span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" "
+"class=\"oe_read_only\"/>"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_active
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 133a74d0958..dca4aef2770 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/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
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
@@ -20,15 +20,16 @@
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # mathieu betton <mathieu.betton@gmail.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 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"
@@ -531,6 +532,71 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-"
+"align:baseline;max-width:100px;\" /></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.event_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"></a></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background:white;border:1px solid "
+"#e1e1e1;\"><tbody><tr><td style=\"padding:15px 20px 0px 20px; font-"
+"size:16px;\"><p style=\"font-size:16px;\"></p><p style=\"font-"
+"size:16px;\"><a href=\"${object.event_id.website_url}\" "
+"style=\"color:#875A7B;text-decoration:none;\"></a><strong></strong></p><p "
+"style=\"font-size:16px;\"></p><p style=\"font-size:16px; margin-bottom: "
+"30px\"><i><br/></i></p></td></tr><tr><td style=\"padding:15px 20px 0px "
+"20px;\"><table style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:25px 10px 25px "
+"10px;width:50%;line-height:20px;vertical-"
+"align:top;\"><div><strong></strong></div><div><strong></strong></div><div "
+"style=\"font-"
+"size:12px;color:#9e9e9e\"><i><strong></strong></i></div></td><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:30px 10px 25px "
+"10px;width:50%;vertical-align:top;\"><p style=\"margin:0px 0px 0px "
+"0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p style=\"margin:0px "
+"0px 0px 0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p "
+"style=\"margin:0px 0px 0px 0px;\"></p></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:10px 0px 25px 0px;\"><h2 style=\"font-weight:300;margin:10px"
+" 0px\"></h2><p></p><ul><li></li></ul></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;\"><strong></strong><a "
+"href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin,"
+" tz='UTC', "
+"format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, "
+"tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px "
+"solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" "
+"target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\""
+" style=\"vertical-align:middle;\" "
+"height=\"16\"></a></td></tr></table></td></tr></tbody></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\" /></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><p style=\"margin:0px 0px 9px "
+"0px;padding-top:10px;\"></p><div><a href=\"/event\" style=\"text-"
+"decoration:none;color:#717188;\"></a></div></td></tr></tbody></table></div><li></li><li><a"
+" href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-"
+"decoration:none;color:#875A7B;\"></a></li>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_registration_mail_template_badge
@@ -576,6 +642,8 @@ msgid ""
 "                                        to \n"
 "                                    </span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" "
+"class=\"oe_read_only\"/>"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_active
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index c45e011b274..2e01af4019d 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -1820,7 +1820,7 @@ msgstr "Aankomende evenementen vanaf vandaag"
 #. module: event
 #: model:ir.ui.view,arch_db:event.view_event_search
 msgid "Upcoming/Running"
-msgstr ""
+msgstr "Aankomend/Bezig"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type_use_hashtag
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index b1bc9031981..6d5ff08e951 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -10,13 +10,14 @@
 # Michael Chong <michaelchong2005@gmail.com>, 2017
 # SHOM <shanmuxin@yeah.net>, 2017
 # liAnGjiA <liangjia@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: liAnGjiA <liangjia@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"
@@ -192,6 +193,72 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-"
+"align:baseline;max-width:100px;\" /></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.event_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"></a></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background:white;border:1px solid "
+"#e1e1e1;\"><tbody><tr><td style=\"padding:15px 20px 0px 20px; font-"
+"size:16px; font-weight:300;\"><p style=\"font-size:16px;\"></p><p style"
+"=\"font-size:16px;\"></p><ul></ul><p style=\"font-size:16px;\"></p><p style"
+"=\"font-size:16px; margin-bottom: 30px\"><i><br/></i></p></td></tr><tr><td "
+"style=\"padding:15px 20px 0px 20px;\"><table style=\"width:100%;border-"
+"top:1px solid #e1e1e1;\"><tr><td style=\"padding:25px 0px; text-"
+"align:center;\"><p><strong></strong></p><a "
+"href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin,"
+" tz='UTC', "
+"format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, "
+"tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px "
+"solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" "
+"target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\""
+" style=\"vertical-align:middle;\" height=\"16\"></a></td></tr></table><table"
+" style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:25px 10px 25px "
+"10px;width:50%;line-height:20px;vertical-"
+"align:top;\"><div><strong></strong></div><div><strong></strong></div><div "
+"style=\"font-"
+"size:12px;color:#9e9e9e\"><i><strong></strong></i></div></td><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:30px 10px 25px "
+"10px;width:50%;vertical-align:top;\"><p style=\"margin:0px 0px 0px "
+"0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p style=\"margin:0px "
+"0px 0px 0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p "
+"style=\"margin:0px 0px 0px 0px;\"></p></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:10px 0px 25px 0px;\"><h2 style=\"font-weight:300;margin:10px"
+" "
+"0px\"></h2><p></p><ul><li></li></ul></td></tr></table></td></tr></tbody></table><div"
+" style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\" /></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div></div><div><a "
+"href=\"/event\" style=\"text-"
+"decoration:none;color:#717188;\"></a></div></td></tr></tbody></table></div><li><a"
+" href=\"${object.event_id.website_url}\" style=\"color:#875A7B;text-"
+"decoration:none;\"></a><strong></strong></li><li/><li/><li><a "
+"href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-"
+"decoration:none;color:#875A7B;\"/></li>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_reminder
@@ -355,6 +422,71 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:5px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-"
+"align:baseline;max-width:100px;\" /></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.event_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"></a></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background:white;border:1px solid "
+"#e1e1e1;\"><tbody><tr><td style=\"padding:15px 20px 0px 20px; font-"
+"size:16px;\"><p style=\"font-size:16px;\"></p><p style=\"font-"
+"size:16px;\"><a href=\"${object.event_id.website_url}\" "
+"style=\"color:#875A7B;text-decoration:none;\"></a><strong></strong></p><p "
+"style=\"font-size:16px;\"></p><p style=\"font-size:16px; margin-bottom: "
+"30px\"><i><br/></i></p></td></tr><tr><td style=\"padding:15px 20px 0px "
+"20px;\"><table style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:25px 10px 25px "
+"10px;width:50%;line-height:20px;vertical-"
+"align:top;\"><div><strong></strong></div><div><strong></strong></div><div "
+"style=\"font-"
+"size:12px;color:#9e9e9e\"><i><strong></strong></i></div></td><td "
+"style=\"padding:25px 0px;vertical-align:top;\"><img "
+"src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px"
+";max-width:inherit;\" height=\"34\"></td><td style=\"padding:30px 10px 25px "
+"10px;width:50%;vertical-align:top;\"><p style=\"margin:0px 0px 0px "
+"0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p style=\"margin:0px "
+"0px 0px 0px;\"></p><p style=\"margin:0px 0px 0px 0px;\"></p><p "
+"style=\"margin:0px 0px 0px 0px;\"></p></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:10px 0px 25px 0px;\"><h2 style=\"font-weight:300;margin:10px"
+" 0px\"></h2><p></p><ul><li></li></ul></td></tr></table><table "
+"style=\"width:100%;border-top:1px solid #e1e1e1;\"><tr><td "
+"style=\"padding:25px 0px;\"><strong></strong><a "
+"href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\""
+" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-"
+"decoration:none;border-radius:3px;\" target=\"new\"><img "
+"src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-"
+"align:middle;\" height=\"16\"></a><a "
+"href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin,"
+" tz='UTC', "
+"format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, "
+"tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px "
+"solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" "
+"target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\""
+" style=\"vertical-align:middle;\" "
+"height=\"16\"></a></td></tr></table></td></tr></tbody></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\" /></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><p style=\"margin:0px 0px 9px "
+"0px;padding-top:10px;\"></p><div><a href=\"/event\" style=\"text-"
+"decoration:none;color:#717188;\"></a></div></td></tr></tbody></table></div><li></li><li><a"
+" href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-"
+"decoration:none;color:#875A7B;\"></a></li>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_registration_mail_template_badge
@@ -365,7 +497,7 @@ msgid ""
 "<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
 "<p>If you have any questions, please let us know.</p>\n"
 "<p>Best regards,</p>"
-msgstr ""
+msgstr "<p/><p/><p/><p/><p/>"
 
 #. module: event
 #: model:mail.template,subject:event.event_reminder
@@ -394,6 +526,8 @@ msgid ""
 "                                        to \n"
 "                                    </span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" "
+"class=\"oe_read_only\"/>"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event_active
diff --git a/addons/fleet/i18n/nl.po b/addons/fleet/i18n/nl.po
index 40a6b8cd611..e3c351553b8 100644
--- a/addons/fleet/i18n/nl.po
+++ b/addons/fleet/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 msgid ""
@@ -308,7 +308,7 @@ msgstr "Klik om een voertuigstatus aan te maken."
 #. module: fleet
 #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 msgid "Close Contract"
-msgstr "Sluiten contract"
+msgstr "Contract sluiten"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -585,7 +585,7 @@ msgstr ""
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date
 msgid "Date when the vehicle has been immatriculated"
-msgstr "Datum waar op het voertuig is geregistreerd"
+msgstr "Datum waarop het voertuig is geregistreerd"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_2
diff --git a/addons/gamification/i18n/de.po b/addons/gamification/i18n/de.po
index d6bbd0e60ef..622b9b2afac 100644
--- a/addons/gamification/i18n/de.po
+++ b/addons/gamification/i18n/de.po
@@ -3,28 +3,29 @@
 # * gamification
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Wolfgang Taferner, 2017
+# Martin Trigaux, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Dejan Dinic <dejan.dinic@bluewin.ch>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Dejan Dinic, 2017
+# Renzo Meister, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 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:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+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"
@@ -613,7 +614,7 @@ msgstr ""
 #: code:addons/gamification/models/challenge.py:655
 #, python-format
 msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
-msgstr ""
+msgstr "<br/>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:652
diff --git a/addons/gamification/i18n/es.po b/addons/gamification/i18n/es.po
index 0633e031404..7e3734618f7 100644
--- a/addons/gamification/i18n/es.po
+++ b/addons/gamification/i18n/es.po
@@ -3,14 +3,14 @@
 # * gamification
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
@@ -20,13 +20,14 @@
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2017
 # Nicole Kist <nki@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:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Nicole Kist <nki@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"
@@ -274,6 +275,8 @@ msgid ""
 "            \n"
 "\n"
 msgstr ""
+"<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"font-family: 'Helvetica'; background-color: #EEE; border-collapse: collapse;\"><tr><td valign=\"top\" align=\"center\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td valign=\"middle\" align=\"left\" style=\"padding:30px 15px;\"><img width=\"90\" src=\"/logo.png?company=${user.company_id.id}\" style=\"width:80px;\"/></td><td style=\"padding:15px;\"><p style=\"font-size:20px;color:#666666;\" align=\"right\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\"><tr><td style=\"padding: 15px;\"><span style=\"color:#666666;font-size:13px;\"><strong></strong></span><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:20px;\"><tr><td align=\"center\"><p style=\"font-size:27px;color:#666666;\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th align=\"left\" style=\"padding-bottom: 0px;width:40%;text-align:left;\"></th><th style=\"width:20%;text-align:right;\" align=\"left\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr\n"
+" % if line['completeness'] ><td style=\"padding: 20px 0;\" align=\"left\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;font-size:25px;color:#9A6C8E;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"></td></tr></tbody></table><span style=\"color:#A8A8A8;font-size:13px;\"><strong></strong></span><!-- Header + Button table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"style=\"margin-top:35px;\"><tr><td width=\"50%\"><p style=\"font-size:22px;color:#666666;\"><strong></strong></p></td></tr></table><!-- Podium --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\"><tr><td style=\"padding:0 30px;\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"table-layout: fixed;\"><tr><td align=\"center\" style=\"width:32%;\"><div style=\"height:40px;\"></div><div style=\"height:60px;\"></div><div style=\"margin:0 3px 0 3px;height:220px;\"><div style=\"height:${heightA}px;\"><div style=\"height:55px;\"><img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"data:image/jpeg;base64,${path}\" alt=\"${goal['name']}\"/></div><div align=\"center\" style =\"color:${bgColor};height:20px\"></div><div style=\"background-color:${bgColor | safe};height:${heightB}px;\"><strong><span style=\"color:#fff;font-size:${fontSize}px;\"></span></strong></div><div style=\"height:30px;\"><p style=\"color:#9A6C8E;font-size:20px;margin-top:10px;\"></p></div></div></td></tr></table></td></tr></table><!-- data table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-bottom:5px\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th style=\"width:15%;text-align:center;\"></th><th style=\"width:25%;text-align:left;\"></th><th style=\"width:30%;text-align:right;\"></th><th style=\"width:30%;text-align:right;\"\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr><td width=\"15%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\"></td><td width=\"25%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\"></td><td width=\"30%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\"><br/><span style=\"font-size:13px;color:${mutedColor};\"></span></td><td width=\"30%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td></tr></tbody></table></td></tr></table></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"padding: 15px; color: #666666;margin-bottom: 5px;\"><tr><td align=\"center\" style=\"min-width: 590px;\"><table width=\"580\" border=\"0\" cellpadding=\"0\" style=\"min-width: 580px; font-size: 12px;\"><tr><td valign=\"middle\" align=\"left\" style=\"padding-top: 10px; padding-bottom: 10px;\"><br/></td><td valign=\"middle\" align=\"right\" style=\"padding-top: 10px; padding-bottom: 10px;\"><a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: #666666;\"></a><br/><a href=\"${company.website}\" style=\"text-decoration:none; color: #666666;\"></a></td></tr></table></td></tr><tr><td align=\"center\"><a target=\"_blank\" href=\"https://www.odoo.com\"></a></td></tr></table></td></tr></table></td></tr></table>"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_goal_reminder
@@ -337,6 +340,14 @@ msgid ""
 "</div>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><div><p></p><p><strong></strong></p></div><div><table"
+" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; "
+"margin-top: 5px;\"><tbody><tr><td valign=\"center\"><img "
+"src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"/></td><td "
+"valign=\"center\"><cite></cite></td></tr></tbody></table></div><div><p><strong></strong></p><p><em></em></p></div></data>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:655
diff --git a/addons/gamification/i18n/fr.po b/addons/gamification/i18n/fr.po
index 69e016948d8..da6bf0d3a86 100644
--- a/addons/gamification/i18n/fr.po
+++ b/addons/gamification/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
 # Lucas Deliege <lud@odoo.com>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
@@ -13,21 +13,22 @@
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Clo <clo@odoo.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2016
 # Saad Thaifa <saad.thaifa@gmail.com>, 2016
 # Melanie Bernard <mbe@odoo.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:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+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"
@@ -275,6 +276,8 @@ msgid ""
 "            \n"
 "\n"
 msgstr ""
+"<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"font-family: 'Helvetica'; background-color: #EEE; border-collapse: collapse;\"><tr><td valign=\"top\" align=\"center\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td valign=\"middle\" align=\"left\" style=\"padding:30px 15px;\"><img width=\"90\" src=\"/logo.png?company=${user.company_id.id}\" style=\"width:80px;\"/></td><td style=\"padding:15px;\"><p style=\"font-size:20px;color:#666666;\" align=\"right\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\"><tr><td style=\"padding: 15px;\"><span style=\"color:#666666;font-size:13px;\"><strong></strong></span><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:20px;\"><tr><td align=\"center\"><p style=\"font-size:27px;color:#666666;\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th align=\"left\" style=\"padding-bottom: 0px;width:40%;text-align:left;\"></th><th style=\"width:20%;text-align:right;\" align=\"left\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr\n"
+" % if line['completeness'] ><td style=\"padding: 20px 0;\" align=\"left\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;font-size:25px;color:#9A6C8E;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"></td></tr></tbody></table><span style=\"color:#A8A8A8;font-size:13px;\"><strong></strong></span><!-- Header + Button table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"style=\"margin-top:35px;\"><tr><td width=\"50%\"><p style=\"font-size:22px;color:#666666;\"><strong></strong></p></td></tr></table><!-- Podium --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\"><tr><td style=\"padding:0 30px;\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"table-layout: fixed;\"><tr><td align=\"center\" style=\"width:32%;\"><div style=\"height:40px;\"></div><div style=\"height:60px;\"></div><div style=\"margin:0 3px 0 3px;height:220px;\"><div style=\"height:${heightA}px;\"><div style=\"height:55px;\"><img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"data:image/jpeg;base64,${path}\" alt=\"${goal['name']}\"/></div><div align=\"center\" style =\"color:${bgColor};height:20px\"></div><div style=\"background-color:${bgColor | safe};height:${heightB}px;\"><strong><span style=\"color:#fff;font-size:${fontSize}px;\"></span></strong></div><div style=\"height:30px;\"><p style=\"color:#9A6C8E;font-size:20px;margin-top:10px;\"></p></div></div></td></tr></table></td></tr></table><!-- data table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-bottom:5px\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th style=\"width:15%;text-align:center;\"></th><th style=\"width:25%;text-align:left;\"></th><th style=\"width:30%;text-align:right;\"></th><th style=\"width:30%;text-align:right;\"\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr><td width=\"15%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\"></td><td width=\"25%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\"></td><td width=\"30%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\"><br/><span style=\"font-size:13px;color:${mutedColor};\"></span></td><td width=\"30%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td></tr></tbody></table></td></tr></table></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"padding: 15px; color: #666666;margin-bottom: 5px;\"><tr><td align=\"center\" style=\"min-width: 590px;\"><table width=\"580\" border=\"0\" cellpadding=\"0\" style=\"min-width: 580px; font-size: 12px;\"><tr><td valign=\"middle\" align=\"left\" style=\"padding-top: 10px; padding-bottom: 10px;\"><br/></td><td valign=\"middle\" align=\"right\" style=\"padding-top: 10px; padding-bottom: 10px;\"><a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: #666666;\"></a><br/><a href=\"${company.website}\" style=\"text-decoration:none; color: #666666;\"></a></td></tr></table></td></tr><tr><td align=\"center\"><a target=\"_blank\" href=\"https://www.odoo.com\"></a></td></tr></table></td></tr></table></td></tr></table>"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_goal_reminder
@@ -343,12 +346,20 @@ msgid ""
 "</div>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><div><p></p><p><strong></strong></p></div><div><table"
+" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; "
+"margin-top: 5px;\"><tbody><tr><td valign=\"center\"><img "
+"src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"/></td><td "
+"valign=\"center\"><cite></cite></td></tr></tbody></table></div><div><p><strong></strong></p><p><em></em></p></div></data>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:655
 #, python-format
 msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
-msgstr ""
+msgstr "<br/>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:652
@@ -383,7 +394,7 @@ msgstr ""
 msgid ""
 "<span class=\"o_stat_text\">Related</span>\n"
 "                                <span class=\"o_stat_text\">Goals</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: gamification
 #: model:ir.actions.act_window,help:gamification.badge_list_action
diff --git a/addons/gamification/i18n/zh_CN.po b/addons/gamification/i18n/zh_CN.po
index 94111533404..e2cf5427e7b 100644
--- a/addons/gamification/i18n/zh_CN.po
+++ b/addons/gamification/i18n/zh_CN.po
@@ -6,13 +6,14 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 卓忆科技 <zhanghao@jointd.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-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+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"
@@ -260,6 +261,8 @@ msgid ""
 "            \n"
 "\n"
 msgstr ""
+"<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"font-family: 'Helvetica'; background-color: #EEE; border-collapse: collapse;\"><tr><td valign=\"top\" align=\"center\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td valign=\"middle\" align=\"left\" style=\"padding:30px 15px;\"><img width=\"90\" src=\"/logo.png?company=${user.company_id.id}\" style=\"width:80px;\"/></td><td style=\"padding:15px;\"><p style=\"font-size:20px;color:#666666;\" align=\"right\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\"><tr><td style=\"padding: 15px;\"><span style=\"color:#666666;font-size:13px;\"><strong></strong></span><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:20px;\"><tr><td align=\"center\"><p style=\"font-size:27px;color:#666666;\"></p></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th align=\"left\" style=\"padding-bottom: 0px;width:40%;text-align:left;\"></th><th style=\"width:20%;text-align:right;\" align=\"left\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th><th style=\"width:20%;text-align:right;\" align=\"right\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr\n"
+" % if line['completeness'] ><td style=\"padding: 20px 0;\" align=\"left\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;\" align=\"right\"></td><td style=\"padding: 20px 0;font-size:25px;color:#9A6C8E;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"></td></tr></tbody></table><span style=\"color:#A8A8A8;font-size:13px;\"><strong></strong></span><!-- Header + Button table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"style=\"margin-top:35px;\"><tr><td width=\"50%\"><p style=\"font-size:22px;color:#666666;\"><strong></strong></p></td></tr></table><!-- Podium --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\"><tr><td style=\"padding:0 30px;\"><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"table-layout: fixed;\"><tr><td align=\"center\" style=\"width:32%;\"><div style=\"height:40px;\"></div><div style=\"height:60px;\"></div><div style=\"margin:0 3px 0 3px;height:220px;\"><div style=\"height:${heightA}px;\"><div style=\"height:55px;\"><img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"data:image/jpeg;base64,${path}\" alt=\"${goal['name']}\"/></div><div align=\"center\" style =\"color:${bgColor};height:20px\"></div><div style=\"background-color:${bgColor | safe};height:${heightB}px;\"><strong><span style=\"color:#fff;font-size:${fontSize}px;\"></span></strong></div><div style=\"height:30px;\"><p style=\"color:#9A6C8E;font-size:20px;margin-top:10px;\"></p></div></div></td></tr></table></td></tr></table><!-- data table --><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-bottom:5px\"><tr><td><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\"><thead><tr style=\"color:#9A6C8E; font-size:12px;\"><th style=\"width:15%;text-align:center;\"></th><th style=\"width:25%;text-align:left;\"></th><th style=\"width:30%;text-align:right;\"></th><th style=\"width:30%;text-align:right;\"\"></th></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td></tr></thead><tbody><tr><td width=\"15%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\"></td><td width=\"25%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\"></td><td width=\"30%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\"><br/><span style=\"font-size:13px;color:${mutedColor};\"></span></td><td width=\"30%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong></strong></td></tr><tr><td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td></tr></tbody></table></td></tr></table></td></tr></table><table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"padding: 15px; color: #666666;margin-bottom: 5px;\"><tr><td align=\"center\" style=\"min-width: 590px;\"><table width=\"580\" border=\"0\" cellpadding=\"0\" style=\"min-width: 580px; font-size: 12px;\"><tr><td valign=\"middle\" align=\"left\" style=\"padding-top: 10px; padding-bottom: 10px;\"><br/></td><td valign=\"middle\" align=\"right\" style=\"padding-top: 10px; padding-bottom: 10px;\"><a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: #666666;\"></a><br/><a href=\"${company.website}\" style=\"text-decoration:none; color: #666666;\"></a></td></tr></table></td></tr><tr><td align=\"center\"><a target=\"_blank\" href=\"https://www.odoo.com\"></a></td></tr></table></td></tr></table></td></tr></table>"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.email_template_goal_reminder
@@ -271,7 +274,7 @@ msgid ""
 "    \n"
 "    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
 "            "
-msgstr ""
+msgstr "<p><strong/></p><p/>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:589
@@ -321,12 +324,20 @@ msgid ""
 "</div>\n"
 "</data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><div><p></p><p><strong></strong></p></div><div><table"
+" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; "
+"margin-top: 5px;\"><tbody><tr><td valign=\"center\"><img "
+"src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" "
+"style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" "
+"alt=\"${user.company_id.name}\"/></td><td "
+"valign=\"center\"><cite></cite></td></tr></tbody></table></div><div><p><strong></strong></p><p><em></em></p></div></data>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:655
 #, python-format
 msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
-msgstr ""
+msgstr "<br/>"
 
 #. module: gamification
 #: code:addons/gamification/models/challenge.py:652
diff --git a/addons/google_drive/i18n/de.po b/addons/google_drive/i18n/de.po
index bb124ac4152..919a93b9a40 100644
--- a/addons/google_drive/i18n/de.po
+++ b/addons/google_drive/i18n/de.po
@@ -3,8 +3,8 @@
 # * google_drive
 # 
 # Translators:
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Niki Waibel, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
@@ -13,13 +13,14 @@
 # Henry Mineehen <info@mineehen.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 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"
@@ -47,7 +48,7 @@ msgstr ""
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Active</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
@@ -57,7 +58,7 @@ msgstr "<strong>Model</strong>"
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Template</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_active
diff --git a/addons/google_drive/i18n/fr.po b/addons/google_drive/i18n/fr.po
index 090dd436b48..9d1b2135b3d 100644
--- a/addons/google_drive/i18n/fr.po
+++ b/addons/google_drive/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
@@ -15,13 +15,14 @@
 # Daniel & Delphine <dd2013@leschoupinous.net>, 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 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"
@@ -49,17 +50,17 @@ msgstr ""
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Active</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Model</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Template</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_active
diff --git a/addons/google_drive/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
index fd3659c5c0d..b50063ddfdf 100644
--- a/addons/google_drive/i18n/zh_CN.po
+++ b/addons/google_drive/i18n/zh_CN.po
@@ -6,13 +6,14 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 老窦 北京 <2662059195@qq.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 - Elico Corp <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"
@@ -50,7 +51,7 @@ msgstr "<strong>模型</strong>"
 #. module: google_drive
 #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban
 msgid "<strong>Template</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config_active
diff --git a/addons/hr/models/hr.py b/addons/hr/models/hr.py
index 7e4c2060a9d..49d8a9e0859 100644
--- a/addons/hr/models/hr.py
+++ b/addons/hr/models/hr.py
@@ -5,7 +5,7 @@ import logging
 
 from odoo import api, fields, models
 from odoo import tools, _
-from odoo.exceptions import ValidationError
+from odoo.exceptions import ValidationError, AccessError
 from odoo.modules.module import get_module_resource
 
 _logger = logging.getLogger(__name__)
@@ -116,7 +116,6 @@ class Employee(models.Model):
     is_address_home_a_company = fields.Boolean(
         'The employee adress has a company linked',
         compute='_compute_is_address_home_a_company',
-        groups="hr.group_hr_user",
     )
     country_id = fields.Many2one(
         'res.country', 'Nationality (Country)', groups="hr.group_hr_user")
@@ -271,7 +270,11 @@ class Employee(models.Model):
         """Checks that choosen address (res.partner) is not linked to a company.
         """
         for employee in self:
-            employee.is_address_home_a_company = employee.address_home_id.parent_id.id is not False
+            try:
+                employee.is_address_home_a_company = employee.address_home_id.parent_id.id is not False
+            except AccessError:
+                employee.is_address_home_a_company = False
+
 
 class Department(models.Model):
     _name = "hr.department"
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index ace9e0e1078..7e29db54ca1 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -87,8 +87,9 @@
                                         <field name="address_home_id"
                                             context="{'show_address': 1}"
                                             options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="is_address_home_a_company" invisible="1" />
-                                        <div class="text-warning" attrs="{'invisible': [('is_address_home_a_company','=', False)]}">
+                                        <field name="is_address_home_a_company" invisible="1"/>
+                                        <div class="text-warning" groups="hr.group_hr_user"
+                                             attrs="{'invisible': [('is_address_home_a_company','=', False)]}">
                                             Use here the home address of the employee.
                                             This private address is used in the expense report reimbursement document.
                                             It should be different from the work address.
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index b6f733a23a6..f297c488963 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -4,9 +4,9 @@
 # 
 # Translators:
 # aNj <anj2j@yahoo.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Niki Waibel, 2017
+# Martin Trigaux, 2017
+# Renzo Meister, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
@@ -15,16 +15,17 @@
 # Henry Mineehen <info@mineehen.de>, 2017
 # Thomas Neu <t.neu@runbox.com>, 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
 # Jan Brodersen <4rmitxes@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: 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"
@@ -53,7 +54,7 @@ msgstr "%(empl_name)s von %(check_in)s bis %(check_out)s"
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
 msgid "<span class=\"o_stat_text\">Attendance</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: hr_attendance
 #. openerp-web
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 4f09139dde6..0e20d0e7245 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 msgid ""
@@ -595,12 +595,12 @@ msgstr "Instellingen"
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.view_employee_filter_inherit_hr_attendance
 msgid "Signed In"
-msgstr ""
+msgstr "Aangemeld"
 
 #. module: hr_attendance
 #: model:ir.ui.view,arch_db:hr_attendance.view_employee_filter_inherit_hr_attendance
 msgid "Signed Out"
-msgstr ""
+msgstr "Afgemeld"
 
 #. module: hr_attendance
 #: sql_constraint:hr.employee:0
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 2b6277c894e..86e9cc52245 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -5,27 +5,29 @@
 # Translators:
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Renzo Meister, 2017
+# Martin Trigaux, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 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
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Markus Menner <markus.menner@axxelia.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # DE T2 <e2f48d4s5vd1s2@outlook.com>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
+# Jan Brodersen <4rmitxes@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:37+0000\n"
 "PO-Revision-Date: 2017-12-13 14:37+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"
@@ -36,12 +38,12 @@ msgstr ""
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "<span class=\"text-muted\">(If fixed-term contract)</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\"/>"
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "<span>/ month</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_advantages
@@ -87,7 +89,7 @@ msgstr "Vertragsreferenz"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "Contract Terms"
-msgstr ""
+msgstr "Vertragsbedingungen"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_contract_type
@@ -121,7 +123,7 @@ msgstr "Vertrag abgelaufen"
 #: code:addons/hr_contract/models/hr_contract.py:100
 #, python-format
 msgid "Contract start date must be less than contract end date."
-msgstr ""
+msgstr "Der Vertragsbeginn muss vor dem Vertragsende stattfinden."
 
 #. module: hr_contract
 #: model:mail.message.subtype,name:hr_contract.mt_department_contract_pending
@@ -188,7 +190,7 @@ msgstr "Anzeigename"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
 msgid "Edit Contract"
-msgstr ""
+msgstr "Vertrag bearbeiten"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_employee
@@ -205,7 +207,7 @@ msgstr "Arbeitsvertrag"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
 msgid "Employee's monthly gross wage."
-msgstr ""
+msgstr "Monatsbruttogehalt des Mitarbeiters"
 
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id
@@ -230,7 +232,7 @@ msgstr ""
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
 msgid "End of Trial Period"
-msgstr ""
+msgstr "Ende der Probezeit"
 
 #. module: hr_contract
 #: selection:hr.contract,state:0
@@ -358,7 +360,7 @@ msgstr "Laufend"
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "Salary Information"
-msgstr ""
+msgstr "Gehaltsinformationen"
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
@@ -384,7 +386,7 @@ msgstr "Startdatum"
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract_date_start
 msgid "Start date of the contract."
-msgstr ""
+msgstr "Vertragsbeginn"
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 7b29be55be4..7428e3892df 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/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
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
@@ -17,13 +17,14 @@
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Clo <clo@odoo.com>, 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"
@@ -34,12 +35,12 @@ msgstr ""
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "<span class=\"text-muted\">(If fixed-term contract)</span>"
-msgstr ""
+msgstr "<span class=\"text-muted\"/>"
 
 #. module: hr_contract
 #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
 msgid "<span>/ month</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_advantages
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 10cf02ebe80..8885b223e55 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -5,30 +5,31 @@
 # Translators:
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Laurent Meuwly <laurent.meuwly@camptocamp.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Christian Körner <fipes.de@gmail.com>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Stefan Hartenfels <stefan.hartenfels@camptocamp.com>, 2017
 # Anja Funk <anja.funk@afimage.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: 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"
@@ -41,7 +42,7 @@ msgstr ""
 msgid ""
 "<i class=\"text-muted oe_edit_only\">Use [Reference] as a subject prefix for"
 " incoming receipts</i>"
-msgstr ""
+msgstr "<i class=\"text-muted oe_edit_only\"/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -50,14 +51,14 @@ msgstr ""
 msgid ""
 "<p>Approve the sheet here.</p><p>Tip: if you refuse, don’t forget to give "
 "the reason thanks to the hereunder message tool</p>"
-msgstr ""
+msgstr "<p/><p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:21
 #, python-format
 msgid "<p>Click here to create your first expense and add it under here.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -66,21 +67,21 @@ msgstr ""
 msgid ""
 "<p>Click on <b> Action Submit To Manager </b> to submit selected expenses to"
 " your manager</p>"
-msgstr ""
+msgstr "<p><b/></p>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:31
 #, python-format
 msgid "<p>Once your Expense is ready, you can save it.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:39
 #, python-format
 msgid "<p>Select expenses to submit them to your manager</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -89,7 +90,7 @@ msgstr ""
 msgid ""
 "<p>The accountant receive approved expense reports.</p><p>He can post "
 "journal entries in one click if taxes and accounts are right.</p>"
-msgstr ""
+msgstr "<p/><p/>"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -127,7 +128,7 @@ msgstr "<strong>Bestätigt von:</strong>"
 msgid ""
 "A payment of %s %s with the reference <a href='/mail/view?%s'>%s</a> related"
 " to your expense %s has been made."
-msgstr ""
+msgstr "<a href=\"/mail/view?%s\"/>"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_account_id
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index b5a9e41a34e..630c26880f8 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/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
 # Melanie Bernard <mbe@odoo.com>, 2016
@@ -18,9 +18,9 @@
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Henri Cornuau <hcornuau@gmail.com>, 2017
-# yterrettaz <yael.terrettaz@live.com>, 2017
+# yterrettaz, 2017
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2017
 # Thib vdh <thv@odoo.com>, 2017
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
@@ -28,13 +28,14 @@
 # Eloïse Stilmant <est@odoo.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 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:36+0000\n"
 "PO-Revision-Date: 2017-12-13 14:36+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"
@@ -58,14 +59,14 @@ msgstr ""
 msgid ""
 "<p>Approve the sheet here.</p><p>Tip: if you refuse, don’t forget to give "
 "the reason thanks to the hereunder message tool</p>"
-msgstr ""
+msgstr "<p/><p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:21
 #, python-format
 msgid "<p>Click here to create your first expense and add it under here.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -74,21 +75,21 @@ msgstr ""
 msgid ""
 "<p>Click on <b> Action Submit To Manager </b> to submit selected expenses to"
 " your manager</p>"
-msgstr ""
+msgstr "<p><b/></p>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:31
 #, python-format
 msgid "<p>Once your Expense is ready, you can save it.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:39
 #, python-format
 msgid "<p>Select expenses to submit them to your manager</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index ef164d0e953..490a304852b 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -671,7 +671,7 @@ msgstr "HR afdeling"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_is_multiple_currency
 msgid "Handle lines with different currencies"
-msgstr ""
+msgstr "Handel lijnen met verschillende valuta's af"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard_hide_payment_method
@@ -964,7 +964,7 @@ msgstr "Prijs"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
 msgid "Price in Company Currency"
-msgstr ""
+msgstr "Prijs in bedrijfsvaluta"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_product_id
@@ -1061,7 +1061,7 @@ msgstr "Rapport"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_company_currency_id
 msgid "Report Company Currency"
-msgstr ""
+msgstr "Rapport bedrijf valuta"
 
 #. module: hr_expense
 #: selection:hr.expense,state:0
@@ -1255,7 +1255,7 @@ msgstr "Totaal"
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_total_amount_company
 msgid "Total (Company Currency)"
-msgstr ""
+msgstr "Totaal (valuta bedrijf)"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_total_amount
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index df350bac70b..17d6d3d9d51 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -3,20 +3,21 @@
 # * hr_expense
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # 苏州远鼎 <tiexinliu@126.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Martin Lin <whinelin@gmail.com>, 2017
 # Talway <9010446@qq.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
-# fausthuang <faust_huang@hotmail.com>, 2017
+# fausthuang, 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: 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"
@@ -29,7 +30,7 @@ msgstr ""
 msgid ""
 "<i class=\"text-muted oe_edit_only\">Use [Reference] as a subject prefix for"
 " incoming receipts</i>"
-msgstr ""
+msgstr "<i class=\"text-muted oe_edit_only\"/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -38,14 +39,14 @@ msgstr ""
 msgid ""
 "<p>Approve the sheet here.</p><p>Tip: if you refuse, don’t forget to give "
 "the reason thanks to the hereunder message tool</p>"
-msgstr ""
+msgstr "<p/><p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:21
 #, python-format
 msgid "<p>Click here to create your first expense and add it under here.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -54,21 +55,21 @@ msgstr ""
 msgid ""
 "<p>Click on <b> Action Submit To Manager </b> to submit selected expenses to"
 " your manager</p>"
-msgstr ""
+msgstr "<p><b/></p>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:31
 #, python-format
 msgid "<p>Once your Expense is ready, you can save it.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
 #: code:addons/hr_expense/static/src/js/tour.js:39
 #, python-format
 msgid "<p>Select expenses to submit them to your manager</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: hr_expense
 #. openerp-web
@@ -77,7 +78,7 @@ msgstr ""
 msgid ""
 "<p>The accountant receive approved expense reports.</p><p>He can post "
 "journal entries in one click if taxes and accounts are right.</p>"
-msgstr ""
+msgstr "<p/><p/>"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -97,7 +98,7 @@ msgstr "<strong>员工：</strong>"
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
 msgid "<strong>Payment By:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: hr_expense
 #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
@@ -115,7 +116,7 @@ msgstr "<strong>验证于:</strong>"
 msgid ""
 "A payment of %s %s with the reference <a href='/mail/view?%s'>%s</a> related"
 " to your expense %s has been made."
-msgstr ""
+msgstr "<a href=\"/mail/view?%s\"/>"
 
 #. module: hr_expense
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_account_id
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 81312d70e06..5275988c647 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -3,28 +3,29 @@
 # * hr_holidays
 # 
 # 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
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Krakataua Katarajtu <shlok@hotmail.de>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 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: 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"
@@ -107,12 +108,12 @@ msgstr "&lt;th class=\"text-center\" colspan="
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
 msgid "<small class=\"text-muted\">from</small>"
-msgstr ""
+msgstr "<small class=\"text-muted\"/>"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
 msgid "<small class=\"text-muted\">to</small>"
-msgstr ""
+msgstr "<small class=\"text-muted\"/>"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index a43fffbfca7..4f889bc9751 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
@@ -23,13 +23,14 @@
 # Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 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 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: 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"
@@ -112,12 +113,12 @@ msgstr "&lt;th class=\"text-center\" colspan="
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
 msgid "<small class=\"text-muted\">from</small>"
-msgstr ""
+msgstr "<small class=\"text-muted\"/>"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban
 msgid "<small class=\"text-muted\">to</small>"
-msgstr ""
+msgstr "<small class=\"text-muted\"/>"
 
 #. module: hr_holidays
 #: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 1d718fbb07f..6ccf634b4ec 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -113,7 +113,7 @@ msgstr "<strong>Afdelingen en personeel</strong>"
 #: code:addons/hr_holidays/models/hr_holidays.py:388
 #, python-format
 msgid "A leave cannot be duplicated."
-msgstr ""
+msgstr "Een verlof kan niet gedupliceerd worden."
 
 #. module: hr_holidays
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_employee_show_leaves
@@ -795,7 +795,7 @@ msgstr "Resterende verlofdagen"
 #: model:ir.actions.act_window,name:hr_holidays.open_employee_leaves
 #: model:ir.ui.menu,name:hr_holidays.menu_open_employee_leave
 msgid "Leaves Overview"
-msgstr ""
+msgstr "Vakantie overzicht"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index be722834cbb..703fe3d69c3 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -3,18 +3,18 @@
 # * hr_recruitment
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Andreas Stauder <andreas.stauder@brain-tec.ch>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Thomas Neu <t.neu@runbox.com>, 2017
@@ -22,16 +22,18 @@
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # DE R1 <e2fes1@hotmail.com>, 2017
+# e2f <projects@e2f.com>, 2018
+# DE T1 <e2f8846@yahoo.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: DE R1 <e2fes1@hotmail.com>, 2017\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"
@@ -122,6 +124,28 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-color:white;padding:8px; "
+"border:1px solid #e1e1e1;\"><tr><td style=\"font-size:16px; font-"
+"weight:300;\"><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"lilt=\"split=0\" style=\"font-size:16px;\"/><p lilt=\"split=1\" style"
+"=\"font-size:16px;\"/><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"style=\"font-size:16px;\"/><p style=\"font-size:16px;\"><b/></p><p "
+"style=\"color:grey;\"><br/><strong/><br/><br/><br/></p><b/></td></tr></table><p"
+" lilt=\"split=0\" style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"/><p lilt=\"split=0\" style=\"font-size:16px;\"/><td style"
+"=\"padding-top:10px;font-size: 12px;\"><div/><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><div><a "
+"href=\"/jobs\" style=\"text-"
+"decoration:none;color:#717188;\"/></div></tr></tbody></table></td></div>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
@@ -265,6 +289,49 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><div style=\"text-align: center\"><h2/><div "
+"style=\"color:grey;\"/><img alt=\"Congratulations!\" "
+"src=\"/hr_recruitment/static/src/img/congratulations.png\" "
+"style=\"width:175px;margin:20px 0;\"/></div><p style=\"font-size:16px;\"/><p"
+" style=\"font-size:16px;\"/><table style=\"width:100%; border:0px solid "
+"white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><p style"
+"=\"font-size:16px;margin:24px 0;\"/><p style=\"font-size:16px;color: "
+"grey;\"><br/></p><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p style=\"font-"
+"size:16px;\"><strong/></p><p style=\"font-size:16px;\"><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
@@ -399,6 +466,47 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><p style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"><a href=\"${object.job_id.website_url or ''}\" "
+"style=\"color:#9A6C8E;\"><strong/></a><strong/></p><p style=\"font-"
+"size:16px;\"/><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><table style=\"width:100%; border:0px"
+" solid white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p><strong/></p><p><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee
@@ -412,7 +520,7 @@ msgid ""
 "%endif\n"
 ".</p>\n"
 "<p>Please welcome him/her and help him/her finding his/her marks.</p>"
-msgstr ""
+msgstr "<p/><p><strong/></p><p/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
@@ -437,12 +545,12 @@ msgstr "<span class=\"o_stat_text\">Meetings</span>"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
 msgid "<span class=\"o_stat_text\">Trackers</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
 msgid "<span>Folded in Recruitment Pipe: </span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
@@ -480,7 +588,7 @@ msgstr "Aktiv"
 msgid ""
 "Add columns to define the <b>interview stages</b>.<br/><i>e.g. New &gt; "
 "Qualified &gt; First Interview &gt; Recruited</i>"
-msgstr ""
+msgstr "<b/><br/><i/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_job_address_id
@@ -759,7 +867,7 @@ msgstr "Anlegen"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
 msgid "Create & Edit"
-msgstr ""
+msgstr "Anlegen und bearbeiten"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
@@ -1273,7 +1381,7 @@ msgstr "Verspätete Aktivitäten"
 #, python-format
 msgid ""
 "Let's have a look at the <b>applications pipeline</b> for this job position."
-msgstr ""
+msgstr "<b/>"
 
 #. module: hr_recruitment
 #: model:res.groups,name:hr_recruitment.group_hr_recruitment_manager
@@ -1922,7 +2030,7 @@ msgstr ""
 #: code:addons/hr_recruitment/static/src/js/tour.js:25
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to the dashboard</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_user_email
@@ -1939,7 +2047,7 @@ msgstr "Sehr Gut"
 #: code:addons/hr_recruitment/static/src/js/tour.js:11
 #, python-format
 msgid "Want to <b>start recruiting</b> like a pro? <i>Start here.</i>"
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_email_cc
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 86b31111ed4..417057377d3 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/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
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
@@ -12,7 +12,7 @@
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Benedicte HANET <hanetb@gmail.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2016
@@ -29,13 +29,14 @@
 # fr rev <e2ffr02@hotmail.com>, 2017
 # Jeanjean Noname <monsieur.spock@gmail.com>, 2017
 # nthnnl <nathan070@me.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: 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"
@@ -126,6 +127,28 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-color:white;padding:8px; "
+"border:1px solid #e1e1e1;\"><tr><td style=\"font-size:16px; font-"
+"weight:300;\"><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"lilt=\"split=0\" style=\"font-size:16px;\"/><p lilt=\"split=1\" style"
+"=\"font-size:16px;\"/><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"style=\"font-size:16px;\"/><p style=\"font-size:16px;\"><b/></p><p "
+"style=\"color:grey;\"><br/><strong/><br/><br/><br/></p><b/></td></tr></table><p"
+" lilt=\"split=0\" style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"/><p lilt=\"split=0\" style=\"font-size:16px;\"/><td style"
+"=\"padding-top:10px;font-size: 12px;\"><div/><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><div><a "
+"href=\"/jobs\" style=\"text-"
+"decoration:none;color:#717188;\"/></div></tr></tbody></table></td></div>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
@@ -269,6 +292,49 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><div style=\"text-align: center\"><h2/><div "
+"style=\"color:grey;\"/><img alt=\"Congratulations!\" "
+"src=\"/hr_recruitment/static/src/img/congratulations.png\" "
+"style=\"width:175px;margin:20px 0;\"/></div><p style=\"font-size:16px;\"/><p"
+" style=\"font-size:16px;\"/><table style=\"width:100%; border:0px solid "
+"white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><p style"
+"=\"font-size:16px;margin:24px 0;\"/><p style=\"font-size:16px;color: "
+"grey;\"><br/></p><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p style=\"font-"
+"size:16px;\"><strong/></p><p style=\"font-size:16px;\"><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
@@ -403,6 +469,47 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><p style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"><a href=\"${object.job_id.website_url or ''}\" "
+"style=\"color:#9A6C8E;\"><strong/></a><strong/></p><p style=\"font-"
+"size:16px;\"/><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><table style=\"width:100%; border:0px"
+" solid white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p><strong/></p><p><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee
@@ -416,7 +523,7 @@ msgid ""
 "%endif\n"
 ".</p>\n"
 "<p>Please welcome him/her and help him/her finding his/her marks.</p>"
-msgstr ""
+msgstr "<p/><p><strong/></p><p/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
@@ -446,7 +553,7 @@ msgstr "<span class=\"o_stat_text\">Trackers</span>"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
 msgid "<span>Folded in Recruitment Pipe: </span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
@@ -1275,7 +1382,7 @@ msgstr "Activités en retard"
 #, python-format
 msgid ""
 "Let's have a look at the <b>applications pipeline</b> for this job position."
-msgstr ""
+msgstr "<b/>"
 
 #. module: hr_recruitment
 #: model:res.groups,name:hr_recruitment.group_hr_recruitment_manager
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 97a79799599..0eab300fddd 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -12,13 +12,14 @@
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # fausthuang, 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: fausthuang, 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"
@@ -109,6 +110,28 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-color:white;padding:8px; "
+"border:1px solid #e1e1e1;\"><tr><td style=\"font-size:16px; font-"
+"weight:300;\"><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"lilt=\"split=0\" style=\"font-size:16px;\"/><p lilt=\"split=1\" style"
+"=\"font-size:16px;\"/><p lilt=\"split=1\" style=\"font-size:16px;\"/><p "
+"style=\"font-size:16px;\"/><p style=\"font-size:16px;\"><b/></p><p "
+"style=\"color:grey;\"><br/><strong/><br/><br/><br/></p><b/></td></tr></table><p"
+" lilt=\"split=0\" style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"/><p lilt=\"split=0\" style=\"font-size:16px;\"/><td style"
+"=\"padding-top:10px;font-size: 12px;\"><div/><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><div><a "
+"href=\"/jobs\" style=\"text-"
+"decoration:none;color:#717188;\"/></div></tr></tbody></table></td></div>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
@@ -252,6 +275,49 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><div style=\"text-align: center\"><h2/><div "
+"style=\"color:grey;\"/><img alt=\"Congratulations!\" "
+"src=\"/hr_recruitment/static/src/img/congratulations.png\" "
+"style=\"width:175px;margin:20px 0;\"/></div><p style=\"font-size:16px;\"/><p"
+" style=\"font-size:16px;\"/><table style=\"width:100%; border:0px solid "
+"white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><p style"
+"=\"font-size:16px;margin:24px 0;\"/><p style=\"font-size:16px;color: "
+"grey;\"><br/></p><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p style=\"font-"
+"size:16px;\"><strong/></p><p style=\"font-size:16px;\"><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
@@ -386,6 +452,47 @@ msgid ""
 "          </div>\n"
 "        "
 msgstr ""
+"<div style=\"background-color:#F3F5F6;color:#515166;font-"
+"family:Arial,Helvetica,sans-serif;font-size:14px;\"><table "
+"style=\"width:600px;margin:10px auto;\"><tbody><tr><td><a href=\"/\"><img "
+"alt=\"${object.company_id.name}\" src=\"/logo\" style=\"vertical-"
+"align:baseline;max-width:100px;\"/></a></td><td style=\"text-align:right"
+";vertical-align:middle;\"><a href=\"${object.job_id.website_url}\" style"
+"=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-"
+"decoration: none; color: #fff; border-radius: 5px; font-"
+"size:16px;\"/></td></tr></tbody></table><table "
+"style=\"width:600px;margin:0px auto;background-"
+"color:white;padding:8px;border:1px solid #e1e1e1;\"><tr><td style=\"font-"
+"size:16px; font-weight:300;\"><p style=\"font-size:16px;\"/><p style=\"font-"
+"size:16px;\"><a href=\"${object.job_id.website_url or ''}\" "
+"style=\"color:#9A6C8E;\"><strong/></a><strong/></p><p style=\"font-"
+"size:16px;\"/><hr style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><table style=\"width:100%; border:0px"
+" solid white;\"><tr><td width=\"75\"><img alt=\"Avatar\" "
+"src=\"/web/image/res.users/${object.user_id.id}/image_small\" style"
+"=\"vertical-align:baseline;max-width:64px;\"/></td><td style=\"font-"
+"size:15px;\"><strong/><br/><span/><br/><span/></td></tr></table><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><p><strong/></p><p><strong/></p><hr "
+"style=\"margin: 30px 0\"/><h3 "
+"style=\"color:#9A6C8E;\"><strong/></h3><ol><li><a "
+"href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\" "
+"style=\"color:#1CC5A9\"/></li><li><a href=\"https://www.odoo.com/page/about-"
+"us\" style=\"color:#1CC5A9\"/></li></ol><hr style=\"margin: 30px 0\"/><p "
+"style=\"margin:0px 0px 0px 0px;\"><strong/></p><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/><p style=\"margin:0px 0px 0px"
+" 0px;\"/><p style=\"margin:0px 0px 0px 0px;\"/></td></tr></table><div "
+"style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-"
+"right:1px solid #dddddd;border-bottom:1px solid #dddddd;\"><a "
+"href=\"https://maps.google.com/maps?q=${location}\" target=\"new\"><img "
+"src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\""
+" style=\"vertical-align:bottom;\"/></a></div><table "
+"style=\"width:600px;margin:0px auto;text-align:center;\"><tbody><tr><td "
+"style=\"padding-top:10px;font-size: 12px;\"><div/><div><a href=\"/jobs\" "
+"style=\"text-"
+"decoration:none;color:#717188;\"/></div></td></tr></tbody></table></div><li><a"
+" href=\"https://www.slideshare.net/openobject/the-odoo-culture\" "
+"style=\"color:#1CC5A9\"/></li>"
 
 #. module: hr_recruitment
 #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee
@@ -399,7 +506,7 @@ msgid ""
 "%endif\n"
 ".</p>\n"
 "<p>Please welcome him/her and help him/her finding his/her marks.</p>"
-msgstr ""
+msgstr "<p/><p><strong/></p><p/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
@@ -429,7 +536,7 @@ msgstr "<span class=\"o_stat_text\">跟踪器</span>"
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
 msgid "<span>Folded in Recruitment Pipe: </span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_recruitment
 #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
@@ -465,7 +572,7 @@ msgstr "有效"
 msgid ""
 "Add columns to define the <b>interview stages</b>.<br/><i>e.g. New &gt; "
 "Qualified &gt; First Interview &gt; Recruited</i>"
-msgstr ""
+msgstr "<b/><br/><i/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_job_address_id
@@ -1238,7 +1345,7 @@ msgstr "逾期活动"
 #, python-format
 msgid ""
 "Let's have a look at the <b>applications pipeline</b> for this job position."
-msgstr ""
+msgstr "<b/>"
 
 #. module: hr_recruitment
 #: model:res.groups,name:hr_recruitment.group_hr_recruitment_manager
@@ -1863,7 +1970,7 @@ msgstr ""
 #: code:addons/hr_recruitment/static/src/js/tour.js:25
 #, python-format
 msgid "Use the breadcrumbs to <b>go back to the dashboard</b>."
-msgstr ""
+msgstr "<b/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_user_email
@@ -1880,7 +1987,7 @@ msgstr "非常好"
 #: code:addons/hr_recruitment/static/src/js/tour.js:11
 #, python-format
 msgid "Want to <b>start recruiting</b> like a pro? <i>Start here.</i>"
-msgstr ""
+msgstr "<b/><i/>"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_email_cc
diff --git a/addons/hr_recruitment_survey/i18n/de.po b/addons/hr_recruitment_survey/i18n/de.po
index fa60fbf693f..65287abffc5 100644
--- a/addons/hr_recruitment_survey/i18n/de.po
+++ b/addons/hr_recruitment_survey/i18n/de.po
@@ -3,17 +3,18 @@
 # * hr_recruitment_survey
 # 
 # Translators:
-# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Thomas Neu <t.neu@runbox.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: Thomas Neu <t.neu@runbox.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"
@@ -66,14 +67,14 @@ msgstr "71+"
 msgid ""
 "<span class=\"o_stat_text\">Print</span>\n"
 "                        <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
 msgid ""
 "<span class=\"o_stat_text\">Start</span>\n"
 "                        <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment_survey
 #: model:survey.question,question:hr_recruitment_survey.recruitment_2_4
diff --git a/addons/hr_recruitment_survey/i18n/fr.po b/addons/hr_recruitment_survey/i18n/fr.po
index 8bccc9d4ba2..5af05386668 100644
--- a/addons/hr_recruitment_survey/i18n/fr.po
+++ b/addons/hr_recruitment_survey/i18n/fr.po
@@ -3,25 +3,26 @@
 # * hr_recruitment_survey
 # 
 # Translators:
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Melanie Bernard <mbe@odoo.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Miguel Vidali <mvidali129@gmail.com>, 2017
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
+# Florian Hatat, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Melanie Bernard <mbe@odoo.com>, 2016
+# Martin Trigaux, 2016
+# Miguel Vidali <mvidali129@gmail.com>, 2016
+# Fabien Pinckaers <fp@openerp.com>, 2016
+# Nancy Bolognesi <nb@microcom.ca>, 2016
+# Xavier Symons <xsy@openerp.com>, 2016
 # Richard Mathot <rim@odoo.com>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
-# Fabien Pinckaers <fp@openerp.com>, 2017
-# Nancy Bolognesi <nb@microcom.ca>, 2017
-# Xavier Symons <xsy@openerp.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: Xavier Symons <xsy@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"
@@ -74,7 +75,7 @@ msgstr "71+"
 msgid ""
 "<span class=\"o_stat_text\">Print</span>\n"
 "                        <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
diff --git a/addons/hr_recruitment_survey/i18n/zh_CN.po b/addons/hr_recruitment_survey/i18n/zh_CN.po
index d37e6fca454..fdd7dada8cd 100644
--- a/addons/hr_recruitment_survey/i18n/zh_CN.po
+++ b/addons/hr_recruitment_survey/i18n/zh_CN.po
@@ -3,20 +3,21 @@
 # * hr_recruitment_survey
 # 
 # Translators:
-# fausthuang <faust_huang@hotmail.com>, 2016
+# fausthuang, 2016
 # Talway <9010446@qq.com>, 2016
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # liAnGjiA <liangjia@qq.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # waveyeung <waveyeung@qq.com>, 2016
-# xiangye xiao <xiangye.xiao@gmail.com>, 2016
+# xiangye xiao, 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: xiangye xiao <xiangye.xiao@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"
@@ -69,14 +70,14 @@ msgstr "71+"
 msgid ""
 "<span class=\"o_stat_text\">Print</span>\n"
 "                        <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment_survey
 #: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
 msgid ""
 "<span class=\"o_stat_text\">Start</span>\n"
 "                        <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: hr_recruitment_survey
 #: model:survey.question,question:hr_recruitment_survey.recruitment_2_4
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index ba0b67135c3..d692bfdbab5 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -3,23 +3,24 @@
 # * hr_timesheet
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
+# Renzo Meister, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
+# JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Fabian Liesch <fabian.liesch@gmail.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
-# JackTheHunter <Maximilian.N98@gmail.com>, 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-11-16 08:08+0000\n"
 "PO-Revision-Date: 2017-11-16 08:08+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"
@@ -30,22 +31,22 @@ msgstr ""
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
 msgid "<span class=\"o_label\">Timesheets</span>"
-msgstr ""
+msgstr "<span class=\"o_label\"/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
 msgid "<span class=\"o_stat_text\">Timesheets</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
 msgid "<span>Timesheet Entries</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.view_kanban_account_analytic_line
 msgid "<strong>Duration: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 28941aba110..2fba4793d71 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -3,30 +3,30 @@
 # * hr_timesheet
 # 
 # Translators:
-# Bertrand LATOUR <divoir@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Fabien Pinckaers <fp@openerp.com>, 2017
+# Xavier Belmere <Info@cartmeleon.com>, 2016
+# Martin Trigaux, 2016
+# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
+# Melanie Bernard <mbe@odoo.com>, 2016
+# Leo Schmitt <inactive+lschmitt@transifex.com>, 2016
+# Frédéric LIETART <stuff@tifred.fr>, 2016
+# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
+# Fabien Pinckaers <fp@openerp.com>, 2016
+# Jérémy Donas <LeDistordu@users.noreply.github.com>, 2016
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
-# Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
-# Miguel Vidali <mvidali129@gmail.com>, 2017
+# yterrettaz, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2017
-# Melanie Bernard <mbe@odoo.com>, 2017
-# Leo Schmitt <inactive+lschmitt@transifex.com>, 2017
-# Xavier Belmere <Info@cartmeleon.com>, 2017
-# Benedicte HANET <hanetb@gmail.com>, 2017
-# yterrettaz <yael.terrettaz@live.com>, 2017
-# Frédéric LIETART <stuff@tifred.fr>, 2017
+# Miguel Vidali <mvidali129@gmail.com>, 2017
 # David Halgand <david.halgand@gmail.com>, 2017
+# Benedicte HANET <hanetb@gmail.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"
@@ -42,7 +42,7 @@ msgstr "<span class=\"o_label\">Feuilles de temps</span>"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
 msgid "<span class=\"o_stat_text\">Timesheets</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\"/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
@@ -52,7 +52,7 @@ msgstr "<span>Entrées de la feuille de temps</span>"
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.view_kanban_account_analytic_line
 msgid "<strong>Duration: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: hr_timesheet
 #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
diff --git a/addons/im_livechat/i18n/de.po b/addons/im_livechat/i18n/de.po
index 84eea703a9b..8a0a5629e43 100644
--- a/addons/im_livechat/i18n/de.po
+++ b/addons/im_livechat/i18n/de.po
@@ -3,16 +3,16 @@
 # * im_livechat
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# n3niu <neniu@mailbox.org>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Martin Trigaux, 2017
+# n3niu, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # aNj <anj2j@yahoo.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Niki Waibel, 2017
+# Andi, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
@@ -20,13 +20,14 @@
 # Philipp Hug <philipp@hug.cx>, 2017
 # Henry Mineehen <info@mineehen.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-30 13:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+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"
@@ -66,7 +67,7 @@ msgid ""
 "button available) for the given URL, and per country.<br/>To identify the "
 "country, GeoIP must be installed on your server, otherwise, the countries of"
 " the rule will not be taken into account.</span>"
-msgstr ""
+msgstr "<span/><br/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_action
@@ -143,7 +144,7 @@ msgid ""
 "                your messages by typing <i>:shortcut</i>. The shortcut is\n"
 "                replaced directly in your message, so that you can still edit\n"
 "                it before sending."
-msgstr ""
+msgstr "<i/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id
diff --git a/addons/im_livechat/i18n/es.po b/addons/im_livechat/i18n/es.po
index 8c0727198d6..d8f40445b2f 100644
--- a/addons/im_livechat/i18n/es.po
+++ b/addons/im_livechat/i18n/es.po
@@ -3,7 +3,7 @@
 # * im_livechat
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
@@ -14,7 +14,7 @@
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
 # Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Jose Manuel <admin@jaboweb.com>, 2016
 # David Perez <david@closemarketing.es>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -26,13 +26,14 @@
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # e2f_es_ t7 <e2f_es_t7@outlook.com>, 2017
 # Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 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: Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 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"
@@ -72,7 +73,7 @@ msgid ""
 "button available) for the given URL, and per country.<br/>To identify the "
 "country, GeoIP must be installed on your server, otherwise, the countries of"
 " the rule will not be taken into account.</span>"
-msgstr ""
+msgstr "<span/><br/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_action
@@ -148,7 +149,7 @@ msgid ""
 "                your messages by typing <i>:shortcut</i>. The shortcut is\n"
 "                replaced directly in your message, so that you can still edit\n"
 "                it before sending."
-msgstr ""
+msgstr "<i/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id
diff --git a/addons/im_livechat/i18n/fr.po b/addons/im_livechat/i18n/fr.po
index 355965ecd8b..5c6bde41566 100644
--- a/addons/im_livechat/i18n/fr.po
+++ b/addons/im_livechat/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
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
@@ -23,13 +23,14 @@
 # Sébastien Le Ray <sebastien-github@orniz.org>, 2017
 # Eloïse Stilmant <est@odoo.com>, 2017
 # Frédéric LIETART <stuff@tifred.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-11-30 13:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Frédéric LIETART <stuff@tifred.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"
@@ -72,7 +73,7 @@ msgid ""
 "button available) for the given URL, and per country.<br/>To identify the "
 "country, GeoIP must be installed on your server, otherwise, the countries of"
 " the rule will not be taken into account.</span>"
-msgstr ""
+msgstr "<span/><br/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_action
@@ -148,7 +149,7 @@ msgid ""
 "                your messages by typing <i>:shortcut</i>. The shortcut is\n"
 "                replaced directly in your message, so that you can still edit\n"
 "                it before sending."
-msgstr ""
+msgstr "<i/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id
diff --git a/addons/im_livechat/i18n/zh_CN.po b/addons/im_livechat/i18n/zh_CN.po
index dde9f188574..bfb4d1664a2 100644
--- a/addons/im_livechat/i18n/zh_CN.po
+++ b/addons/im_livechat/i18n/zh_CN.po
@@ -6,14 +6,15 @@
 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
 # ZIHAN LI <lizihan0419@126.com>, 2016
 # Maie <m@maie.name>, 2017
-# fausthuang <faust_huang@hotmail.com>, 2017
+# fausthuang, 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: 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"
@@ -53,7 +54,7 @@ msgid ""
 "button available) for the given URL, and per country.<br/>To identify the "
 "country, GeoIP must be installed on your server, otherwise, the countries of"
 " the rule will not be taken into account.</span>"
-msgstr ""
+msgstr "<span/><br/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_action
@@ -129,7 +130,7 @@ msgid ""
 "                your messages by typing <i>:shortcut</i>. The shortcut is\n"
 "                replaced directly in your message, so that you can still edit\n"
 "                it before sending."
-msgstr ""
+msgstr "<i/>"
 
 #. module: im_livechat
 #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 95a126694e5..4ce5c9456a7 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -3,32 +3,33 @@
 # * lunch
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
-# Henry Mineehen <info@mineehen.de>, 2017
-# JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# darenkster <inactive+darenkster@transifex.com>, 2017
-# Malte Jansen <work@maltejansen.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
 # Jasper Torlitz <inactive+jtorlitz@transifex.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Martin Trigaux, 2017
+# Renzo Meister, 2017
+# Wolfgang Taferner, 2017
+# darenkster <inactive+darenkster@transifex.com>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Thomas Lengyel <lexustec_fn@yahoo.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
+# Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
+# Malte Jansen <work@maltejansen.de>, 2017
+# Henry Mineehen <info@mineehen.de>, 2017
+# JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Martin K <martinkuenz@gmail.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"
@@ -43,6 +44,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> red X to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
@@ -51,6 +55,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form
@@ -348,7 +355,7 @@ msgid ""
 "                - Recurency: Everyday<br>\n"
 "                - Time interval: from 00h00 am to 11h59 pm<br>\n"
 "                - Message: \"You must order before 10h30 am\""
-msgstr ""
+msgstr "<br><br><br>"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form
@@ -399,7 +406,7 @@ msgstr "Hier sehen Sie die heutigen Bestellungen nach Lieferanten gruppiert."
 msgid ""
 "Here you can see your cash moves.<br>A cash moves can be either an expense or a payment.\n"
 "                An expense is automatically created when an order is received while a payment is a reimbursement to the company encoded by the manager."
-msgstr ""
+msgstr "<br>"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.view_lunch_order_line_lucky
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index 2b17d1b8bf1..69822687d5c 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -3,7 +3,7 @@
 # * lunch
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
@@ -11,7 +11,7 @@
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -21,13 +21,14 @@
 # Gelo Joga Landoo <gj@landoo.es>, 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 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"
@@ -42,6 +43,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> red X to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
@@ -50,6 +54,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index ea65acfd000..a9a25439563 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -8,13 +8,14 @@
 # Martin Trigaux, 2017
 # Jeff Yu - Elico Corp <jeff.yu@elico-corp.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-10-02 11:26+0000\n"
 "PO-Revision-Date: 2017-10-02 11:26+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"
@@ -29,6 +30,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> red X to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
@@ -37,6 +41,9 @@ msgid ""
 "                - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
 "                - Click on the <span class=\"fa fa-times-circle text-danger\"></span> to announce that the order isn't available"
 msgstr ""
+"<span class=\"fa fa-phone text-success\"></span><br><span class=\"fa fa-"
+"check text-success\"></span><br><span class=\"fa fa-times-circle text-"
+"danger\"></span>"
 
 #. module: lunch
 #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index edde935a7eb..2e26bf050ea 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -3,11 +3,11 @@
 # * mail
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Galileo Sanchez <galileopy@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
@@ -37,13 +37,14 @@
 # Fernando San Martín Woerner <fsnmartin@gmail.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Eduardo Magdalena <emagdalena@close2circle.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: Eduardo Magdalena <emagdalena@close2circle.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"
@@ -514,7 +515,7 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_activity_done
 msgid "<strong> Feedback</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 7853c0ce679..2836fe7d31d 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -17,13 +17,14 @@
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # 老窦 北京 <2662059195@qq.com>, 2017
 # ShiGang Chen <jjfxb@live.cn>, 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: ShiGang Chen <jjfxb@live.cn>, 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"
@@ -121,6 +122,8 @@ msgid ""
 "</p>\n"
 "</div>"
 msgstr ""
+"<div><div itemscope itemtype=\"http://schema.org/EmailMessage\"><div itemprop=\"potentialAction\" 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']}\"/></div></div><div summary=\"o_mail_notification\" style=\"padding: 0px; width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; margin-top: 5px;\"><tbody><tr><td valign=\"center\"><a href=\"${ctx['button_access']['url']}\" 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><a href=\"${ctx['button_follow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\"></a><a href=\"${ctx['button_unfollow']['url']}\" style=\"color: #875A7B; text-decoration: none !important;\"></a><a href=\"${action['url']}\" style=\"color: #875A7B; text-decoration:none !important;\"></a></td><td valign=\"center\" align=\"right\"><img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${company.name}\"></td></tr><tr><td colspan=\"2\" style=\"text-align:center;\"><hr width=\"100%\"\n"
+" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\"><p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\"><strong></strong></p></td></tr></tbody></table></div><div></div><ul><li></li></ul><br/><p style=\"color: #555555;\"><a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #875A7B;\"></a><a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\"></a></p></div>"
 
 #. module: mail
 #: code:addons/mail/models/mail_channel.py:674
@@ -243,7 +246,7 @@ msgid ""
 "            You can mention a channel by typing <b>#channel</b>.<br>\n"
 "            You can execute a command by typing <b>/command</b>.<br>\n"
 "            You can insert canned responses in your message by typing <b>:shortcut</b>.<br>"
-msgstr ""
+msgstr "<br><br><b></b><br><b></b><br><b></b><br><b></b><br>"
 
 #. module: mail
 #: code:addons/mail/models/mail_channel.py:584
@@ -298,7 +301,7 @@ msgid ""
 "<p><b>Chat with coworkers</b> in real-time using direct "
 "messages.</p><p><i>You might need to invite users from the Settings app "
 "first.</i></p>"
-msgstr ""
+msgstr "<p><b/></p><p><i/></p>"
 
 #. module: mail
 #. openerp-web
@@ -308,7 +311,7 @@ msgid ""
 "<p><b>Write a message</b> to the members of the channel here.</p> <p>You can"
 " notify someone with <i>'@'</i> or link another channel with <i>'#'</i>. "
 "Start your message with <i>'/'</i> to get the list of possible commands.</p>"
-msgstr ""
+msgstr "<p><b/></p><p><i/><i/><i/></p>"
 
 #. module: mail
 #. openerp-web
@@ -318,7 +321,7 @@ msgid ""
 "<p>Channels make it easy to organize information across different topics and"
 " groups.</p> <p>Try to <b>create your first channel</b> (e.g. sales, "
 "marketing, product XYZ, after work party, etc).</p>"
-msgstr ""
+msgstr "<p/><p><b/></p>"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -347,6 +350,8 @@ msgid ""
 "                                    If you want to use only selected records please uncheck this selection box :\n"
 "                                </span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\"/><span "
+"attrs=\"{'invisible': [('use_active_domain', '=', False)]}\"/>"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.email_template_form
@@ -375,7 +380,7 @@ msgid ""
 "                                </strong><br/>\n"
 "                                The email will be sent for all the records selected in the list.<br/>\n"
 "                                Confirming this wizard will probably take a few minutes blocking your browser."
-msgstr ""
+msgstr "<strong/><br/><br/>"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.message_activity_done
@@ -387,7 +392,7 @@ msgstr "<strong> 反馈</strong>"
 msgid ""
 "<strong>Only records checked in list view will be used.</strong><br/>\n"
 "                                The email will be sent for all the records selected in the list."
-msgstr ""
+msgstr "<strong/><br/>"
 
 #. module: mail
 #: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 2798a8364a3..37903e3861f 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -141,7 +141,8 @@ var Activity = AbstractActivityField.extend({
                     nbPlannedActivities: nbActivities.planned,
                     nbTodayActivities: nbActivities.today,
                     nbOverdueActivities: nbActivities.overdue,
-                    date_format: time.getLangDatetimeFormat(),
+                    date_format: time.getLangDateFormat(),
+                    datetime_format: time.getLangDatetimeFormat(),
                 }));
             } else {
                 self.$el.empty();
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index da3e63772a6..fadb93dfa7d 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -40,7 +40,7 @@
                                     </dd>
                                     <dt>Created on</dt>
                                     <dd class="mb8">
-                                        <t t-esc="activity.create_date.format(date_format)"/>
+                                        <t t-esc="activity.create_date.format(datetime_format)"/>
                                     </dd>
                                     <dt>Assigned to</dt>
                                     <dd class="mb8">
diff --git a/addons/maintenance/i18n/es.po b/addons/maintenance/i18n/es.po
index a8a5c4144dc..3e9bc25105f 100644
--- a/addons/maintenance/i18n/es.po
+++ b/addons/maintenance/i18n/es.po
@@ -3,11 +3,11 @@
 # * maintenance
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
@@ -30,13 +30,14 @@
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Fernando San Martín Woerner <fsnmartin@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-30 13:12+0000\n"
 "PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Fernando San Martín Woerner <fsnmartin@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"
@@ -82,12 +83,12 @@ msgstr "<span>Ver</span>"
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
 msgid "<strong>Equipments:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: maintenance
 #: model:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
 msgid "<strong>Maintenance:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_defaults
diff --git a/addons/mass_mailing/i18n/es.po b/addons/mass_mailing/i18n/es.po
index 3a7972a06f7..da36471d535 100644
--- a/addons/mass_mailing/i18n/es.po
+++ b/addons/mass_mailing/i18n/es.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Roberto Lizana <robertolizana@trey.es>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Carlos rodriguez <carlosalbertor436@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # David Perez <david@closemarketing.es>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
@@ -24,13 +24,14 @@
 # Jose Manuel <admin@jaboweb.com>, 2017
 # e2f_EPV Translator <e2f_EPV@outlook.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"
@@ -53,14 +54,14 @@ msgstr "20$"
 msgid ""
 "% <br/>\n"
 "                                                <strong>Clicks</strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
 msgid ""
 "%<br/>\n"
 "                                                <strong>Replied</strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: mass_mailing
 #: code:addons/mass_mailing/models/mass_mailing.py:541
@@ -203,7 +204,7 @@ msgstr "<span class=\"fa fa-copyright\"/> 2016 Todos los derechos reservados"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_form
 msgid "<span> times</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
@@ -933,7 +934,7 @@ msgid ""
 "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim"
 " veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
 "commodo consequat."
-msgstr ""
+msgstr "<br/><br/>"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_mail_mail_id
diff --git a/addons/mass_mailing/i18n/nl.po b/addons/mass_mailing/i18n/nl.po
index 564662f1acf..52b58092bfe 100644
--- a/addons/mass_mailing/i18n/nl.po
+++ b/addons/mass_mailing/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -1162,32 +1162,32 @@ msgstr "Samenvoegen"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.mass_mailing_list_merge_view_form
 msgid "Merge Mass Mailing List"
-msgstr ""
+msgstr "Bulk mailing lijst samenvoegen"
 
 #. module: mass_mailing
 #: model:ir.model,name:mass_mailing.model_mass_mailing_list_merge
 msgid "Merge Mass Mailing Lists"
-msgstr ""
+msgstr "Bulk mailing lijst samenvoegen"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge_merge_options
 msgid "Merge Option"
-msgstr ""
+msgstr "Samenvoeg optie"
 
 #. module: mass_mailing
 #: model:ir.actions.act_window,name:mass_mailing.mass_mailing_list_merge_action
 msgid "Merge Selected Mailing Lists"
-msgstr ""
+msgstr "Geselecteerde bulk mailing lijsten samenvoegen"
 
 #. module: mass_mailing
 #: selection:mass.mailing.list.merge,merge_options:0
 msgid "Merge into a new mailing list"
-msgstr ""
+msgstr "Samenvoegen in een nieuwe maillijst"
 
 #. module: mass_mailing
 #: selection:mass.mailing.list.merge,merge_options:0
 msgid "Merge into an existing mailing list"
-msgstr ""
+msgstr "Samenvoegen in een bestaande maillijst"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_message_id
@@ -1229,7 +1229,7 @@ msgstr "Naam / E-mail"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge_new_list_name
 msgid "New Mailing List Name"
-msgstr ""
+msgstr "Nieuwe mailinglijst naam"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
@@ -1254,7 +1254,7 @@ msgstr "Aantal contacten"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.mass_mailing_list_merge_view_form
 msgid "Number of Recipients"
-msgstr ""
+msgstr "Aantal ontvangers"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_kanban
diff --git a/addons/mass_mailing/i18n/zh_CN.po b/addons/mass_mailing/i18n/zh_CN.po
index 23fbbde7ef7..43b5427730c 100644
--- a/addons/mass_mailing/i18n/zh_CN.po
+++ b/addons/mass_mailing/i18n/zh_CN.po
@@ -18,13 +18,14 @@
 # Talway <9010446@qq.com>, 2017
 # liAnGjiA <liangjia@qq.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"
@@ -47,14 +48,14 @@ msgstr "$20"
 msgid ""
 "% <br/>\n"
 "                                                <strong>Clicks</strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
 msgid ""
 "%<br/>\n"
 "                                                <strong>Replied</strong>"
-msgstr ""
+msgstr "<br/><strong/>"
 
 #. module: mass_mailing
 #: code:addons/mass_mailing/models/mass_mailing.py:541
@@ -87,7 +88,7 @@ msgid ""
 "&amp;nbsp;\n"
 "                                        <span class=\"fa fa-credit-card fa-2x text-delta\"/>\n"
 "                                        &amp;nbsp;"
-msgstr ""
+msgstr "<span class=\"fa fa-credit-card fa-2x text-delta\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
@@ -95,7 +96,7 @@ msgid ""
 "&amp;nbsp;\n"
 "                                        <span class=\"fa fa-smile-o fa-2x text-delta\"/>\n"
 "                                        &amp;nbsp;"
-msgstr ""
+msgstr "<span class=\"fa fa-smile-o fa-2x text-delta\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
@@ -113,22 +114,22 @@ msgid ""
 "<font>7</font>\n"
 "    <strong>Business Hacks</strong>\n"
 "    <span> to<br>boost your marketing</span>"
-msgstr ""
+msgstr "<font></font><strong></strong><span><br></span>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
 msgid "<i class=\"fa fa-angle-double-down\"/> Footers"
-msgstr ""
+msgstr "<i class=\"fa fa-angle-double-down\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
 msgid "<i class=\"fa fa-angle-double-up\"/> Headers"
-msgstr ""
+msgstr "<i class=\"fa fa-angle-double-up\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
 msgid "<i class=\"fa fa-clone\"/> Body"
-msgstr ""
+msgstr "<i class=\"fa fa-clone\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.snippet_options
@@ -138,7 +139,7 @@ msgstr "<i class=\"fa fa-eyedropper\"/>背景颜色"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
 msgid "<i class=\"fa fa-plus\"/> Marketing Content"
-msgstr ""
+msgstr "<i class=\"fa fa-plus\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
@@ -147,12 +148,12 @@ msgid ""
 "                                    <strong>Michael Fletcher</strong><br/>\n"
 "                                    <small>Community Manager</small>\n"
 "                                </small>"
-msgstr ""
+msgstr "<small><strong/><br/><small/></small>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
 msgid "<small>CODE</small>:   <strong class=\"o_code h3\">45A9E77DGW8455</strong>"
-msgstr ""
+msgstr "<small/><strong class=\"o_code h3\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
@@ -162,7 +163,7 @@ msgstr "<small>第一步：</small>"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
 msgid "<small>Step 2:</small>"
-msgstr ""
+msgstr "<small/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
@@ -172,23 +173,23 @@ msgstr "<small>步骤3:</small>"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "<small>user / month (billed annually)</small>"
-msgstr ""
+msgstr "<small/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
 msgid "<span class=\"fa fa-copyright\"/> 2016 All Rights Reserved"
-msgstr ""
+msgstr "<span class=\"fa fa-copyright\"/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_form
 msgid "<span> times</span>"
-msgstr ""
+msgstr "<span/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "<strong>24/7 Support</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
@@ -198,7 +199,7 @@ msgstr "<strong>高级</strong> 功能"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "<strong>Fully customizable</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
@@ -208,7 +209,7 @@ msgstr "<strong>打开的</strong>"
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "<strong>Total</strong> management"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
@@ -519,7 +520,7 @@ msgstr "创建月份"
 msgid ""
 "Cyber-threats continue to increase.<br/>\n"
 "                                The discussion will examine how to develop new norms and integrate them into EU"
-msgstr ""
+msgstr "<br/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
@@ -810,7 +811,7 @@ msgstr "排队"
 msgid ""
 "Join our Marketing newsletter and get <strong>this white paper "
 "instantly</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_keep_archives
@@ -899,7 +900,7 @@ msgid ""
 "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim"
 " veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
 "commodo consequat."
-msgstr ""
+msgstr "<br/><br/>"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_mail_mail_id
@@ -1823,7 +1824,7 @@ msgstr ""
 msgid ""
 "We want to take this opportunity to welcome you to our ever-growing "
 "community!<br/>"
-msgstr ""
+msgstr "<br/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
@@ -1837,7 +1838,7 @@ msgstr ""
 msgid ""
 "With strong technical foundations, Odoo's framework is unique. It provides "
 "<strong>top notch usability that scales across all apps</strong>."
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_two_cols
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
index 62f2062b75c..8ebec45da2b 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -326,30 +326,31 @@ snippets_editor.Class.include({
 
             $body.removeClass(all_classes).addClass(theme_params.className);
 
-            var $old_layout = $editable_area.find(".o_layout");
-            var $new_wrapper, $new_wrapper_content;
+            var $old_layout = $editable_area.find('.o_layout');
 
+            var $new_wrapper;
+            var $new_wrapper_content;
             if (theme_params.nowrap) {
-                $new_wrapper = $new_wrapper_content = $("<div/>", {"class": "oe_structure"});
-            }
-            else {
-                // This wrapper structure is the only way to have a responsive and
-                // centered fixed-width content column on all mail clients
+                $new_wrapper = $('<div/>', {class: 'oe_structure'});
+                $new_wrapper_content = $new_wrapper;
+            } else {
+                // This wrapper structure is the only way to have a responsive
+                // and centered fixed-width content column on all mail clients
                 $new_wrapper = $('<table/>', {class: 'o_mail_wrapper'});
-                $new_wrapper_content = $("<td/>", {class: 'o_mail_no_resize o_mail_no_colorpicker o_mail_wrapper_td oe_structure'});
+                $new_wrapper_content = $('<td/>', {class: 'o_mail_no_options o_mail_wrapper_td oe_structure'});
                 $new_wrapper.append($('<tr/>').append(
-                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'}),
+                    $('<td/>', {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'}),
                     $new_wrapper_content,
-                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'})
+                    $('<td/>', {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'})
                 ));
             }
-            var $new_layout = $("<div/>", {"class": "o_layout " + theme_params.className}).append($new_wrapper);
+            var $new_layout = $('<div/>', {class: 'o_layout ' + theme_params.className}).append($new_wrapper);
 
             var $contents;
             if (first_choice) {
                 $contents = theme_params.template;
             } else if ($old_layout.length) {
-                $contents = ($old_layout.hasClass("oe_structure") ? $old_layout : $old_layout.find(".oe_structure").first()).contents();
+                $contents = ($old_layout.hasClass('oe_structure') ? $old_layout : $old_layout.find('.oe_structure').first()).contents();
             } else {
                 $contents = $editable_area.contents();
             }
diff --git a/addons/mass_mailing/static/src/less/themes/theme_basic.less b/addons/mass_mailing/static/src/less/themes/theme_basic.less
index c5c88e8144b..00f3a6304bc 100644
--- a/addons/mass_mailing/static/src/less/themes/theme_basic.less
+++ b/addons/mass_mailing/static/src/less/themes/theme_basic.less
@@ -19,7 +19,7 @@
         }
 
         ul, ol {
-            margin: 13px 0;
+            margin: 0;
         }
     }
 }
diff --git a/addons/mass_mailing/views/snippets_themes_options.xml b/addons/mass_mailing/views/snippets_themes_options.xml
index 5e5055a60b2..3caafae46d5 100644
--- a/addons/mass_mailing/views/snippets_themes_options.xml
+++ b/addons/mass_mailing/views/snippets_themes_options.xml
@@ -7,47 +7,40 @@
 
     <div data-js="sizing_x"
         data-selector="img, .mv, .col_mv, td, th"
-        data-exclude=".o_mail_no_resize, .o_mail_wrapper_td"/>
+        data-exclude=".o_mail_no_resize, .o_mail_no_options"/>
 
     <div data-js="table_item"
         data-selector="td, th"
-        data-exclude=".o_mail_wrapper_td"/>
+        data-exclude=".o_mail_no_options"/>
 
     <div data-js="table_row"
         data-selector="tr:has(> .row), tr:has(> .col_mv)"
-        data-drop-near="tr:has(> .row), tr:has(> .col_mv)">
-    </div>
+        data-exclude=".o_mail_no_options"
+        data-drop-near="tr:has(> .row), tr:has(> .col_mv)"/>
 
     <div data-js="table_column"
         data-selector=".col>td, .col>th"
-        data-exclude=".o_mail_wrapper_td"
-        data-drop-near=".col>td, .col>th">
-    </div>
+        data-exclude=".o_mail_no_options"
+        data-drop-near=".col>td, .col>th"/>
 
     <div data-js="table_column_mv"
         data-selector=".col_mv, td, th"
-        data-exclude=".o_mail_wrapper_td"
-        data-drop-near=".col_mv, td, th">
-    </div>
+        data-exclude=".o_mail_no_options"
+        data-drop-near=".col_mv, td, th"/>
 
     <div data-js="content"
         data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, .oe_snippet_body"
+        data-exclude=".o_mail_no_options"
         data-drop-near="[data-oe-field='body_html']:not(:has(.o_layout)) > *, .oe_structure > *"
-        data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure">
-    </div>
+        data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure"/>
 
     <div data-js="sizing_y"
-        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, th"
-        data-exclude=".o_mail_no_resize, .o_mail_wrapper_td">
-    </div>
+        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td, th"
+        data-exclude=".o_mail_no_resize, .o_mail_no_options"/>
 
     <div data-js="colorpicker"
-        data-selector="
-            [data-oe-field='body_html'] > div:not(.o_layout),
-            [data-oe-field='body_html'] .oe_structure > div,
-            td, th
-        "
-        data-exclude=".o_mail_no_colorpicker">
+        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td, th"
+        data-exclude=".o_mail_no_colorpicker, .o_mail_no_options">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a>
             <ul class="dropdown-menu">
diff --git a/addons/mass_mailing/views/themes_templates.xml b/addons/mass_mailing/views/themes_templates.xml
index 277791828e8..d6ce5a3aebf 100644
--- a/addons/mass_mailing/views/themes_templates.xml
+++ b/addons/mass_mailing/views/themes_templates.xml
@@ -2,7 +2,7 @@
 <odoo>
     <!-- Theme "Basic" template -->
     <template id="theme_basic_template">
-        <div>
+        <div class="o_mail_no_options">
             <p>
                 <br/>
             </p>
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index d8c32cef045..49f280cb662 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -3,25 +3,26 @@
 # * membership
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# Tina Rittmüller <tr@ife.de>, 2017
+# Martin Trigaux, 2017
+# Renzo Meister, 2017
+# Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Ermin Trevisan <trevi@twanda.com>, 2017
-# Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
+# Tina Rittmüller <tr@ife.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
-# Walter Müller <inactive+WILL.I.AM@transifex.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
+# Ermin Trevisan <trevi@twanda.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: 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"
@@ -47,12 +48,12 @@ msgstr "Wartend"
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<i class=\"fa fa-clock-o\" aria-hidden=\"true\"/><strong> From: </strong>"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-clock-o\"/><strong/>"
 
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<strong> To:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_associate_member
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index 9e2f5b0b14f..49302b3432b 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -3,14 +3,14 @@
 # * membership
 # 
 # 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
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
@@ -19,13 +19,14 @@
 # Gelo Joga Landoo <gj@landoo.es>, 2017
 # Alejandro Santana <alejandrosantana@anubia.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"
@@ -51,12 +52,12 @@ msgstr "Núm. esperando"
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<i class=\"fa fa-clock-o\" aria-hidden=\"true\"/><strong> From: </strong>"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-clock-o\"/><strong/>"
 
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<strong> To:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_associate_member
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 351a35a82f8..7ec12709700 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/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
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
@@ -14,16 +14,17 @@
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Clo <clo@odoo.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
-# Friderici Claude <claude@friderici.org>, 2016
+# Friderici Claude, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # 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-09-20 09:53+0000\n"
 "PO-Revision-Date: 2017-09-20 09:53+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,12 +50,12 @@ msgstr "Nb. en attente"
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<i class=\"fa fa-clock-o\" aria-hidden=\"true\"/><strong> From: </strong>"
-msgstr ""
+msgstr "<i aria-hidden=\"true\" class=\"fa fa-clock-o\"/><strong/>"
 
 #. module: membership
 #: model:ir.ui.view,arch_db:membership.membership_products_kanban
 msgid "<strong> To:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_res_partner_associate_member
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 7b24d248574..a59dfce3518 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -3,11 +3,11 @@
 # * mrp
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # Luis Pomar <luis.pomar@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
@@ -32,13 +32,14 @@
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
 # e2f_es_ t6 <e2f_es_t6@outlook.com>, 2017
 # Julio Fiallos <jfiallos@vision-estrategica.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: Julio Fiallos <jfiallos@vision-estrategica.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"
@@ -201,7 +202,7 @@ msgstr "<strong class=\"mr8\">a</strong>"
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
 msgid "<strong>Effectiveness Category: </strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index f5eafb94623..8f17816ec2e 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -187,7 +187,7 @@ msgstr "<strong>Effectiviteit categorie:</strong>"
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
 msgid "<strong>Is a Blocking Reason? </strong>"
-msgstr "<strong>Is a blokkerende reden? </strong>"
+msgstr "<strong>Is een blokkerende reden? </strong>"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.report_mrporder
@@ -308,7 +308,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
 msgid "Add quality checks to your work orders"
-msgstr ""
+msgstr "Voeg kwaliteitscontroles toe aan uw werk orders"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
@@ -1439,7 +1439,7 @@ msgstr "Laatst bijgewerkt op"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_last_working_user_id
 msgid "Last user that worked on this work order."
-msgstr ""
+msgstr "Laatste gebruiker die aan dit werkorder heeft gewerkt."
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
@@ -1801,7 +1801,7 @@ msgstr "Volgende werkorder"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_production_lot_use_next_on_work_order_id
 msgid "Next Work Order to Use"
-msgstr ""
+msgstr "Volgende werkorder om te gebruiken"
 
 #. module: mrp
 #: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
@@ -3612,7 +3612,7 @@ msgstr "Werktijd"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_working_user_ids
 msgid "Working user on this work order."
-msgstr ""
+msgstr "Werknemer werkend aan dit werkorder."
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_messages
diff --git a/addons/mrp/tests/test_oee.py b/addons/mrp/tests/test_oee.py
index 80a4dcc8cd6..4fbed9b6d5f 100644
--- a/addons/mrp/tests/test_oee.py
+++ b/addons/mrp/tests/test_oee.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import datetime
+from datetime import datetime, timedelta
 
 from odoo.addons.mrp.tests.common import TestMrpCommon
 
@@ -18,7 +18,10 @@ class TestOee(TestMrpCommon):
 
     def test_wrokcenter_oee(self):
         """  Test case workcenter oee. """
-        day = datetime.date.today()
+        day = datetime.date(datetime.today())
+        # Make the test work the weekend. It will fails due to workcenter working hours.
+        if day.weekday() in (5, 6):
+            day -= timedelta(days=2)
 
         # Productive time duration (13 min)
         self.create_productivity_line(self.env.ref('mrp.block_reason7'), str(day) + " " + "10:43:22", str(day) + " " + "10:56:22")
diff --git a/addons/pad/models/pad.py b/addons/pad/models/pad.py
index aebcff24918..a1e31bf485a 100644
--- a/addons/pad/models/pad.py
+++ b/addons/pad/models/pad.py
@@ -10,7 +10,6 @@ import requests
 
 from odoo import api, models, _
 from odoo.exceptions import UserError
-from odoo.tools import html2plaintext
 
 from ..py_etherpad import EtherpadLiteClient
 
@@ -65,9 +64,7 @@ class PadCommon(models.AbstractModel):
             # get content of the real field
             for record in model.browse([self.env.context["object_id"]]):
                 if record[real_field]:
-                    myPad.setText(path, (html2plaintext(record[real_field]).encode('utf-8')))
-                    # Etherpad for html not functional
-                    # myPad.setHTML(path, record[real_field])
+                    myPad.setHtmlFallbackText(path, record[real_field])
 
         return {
             "server": pad["server"],
@@ -77,17 +74,25 @@ class PadCommon(models.AbstractModel):
 
     @api.model
     def pad_get_content(self, url):
+        company = self.env.user.sudo().company_id
+        myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api')
         content = ''
         if url:
+            split_url = url.split('/p/')
+            path = len(split_url) == 2 and split_url[1]
             try:
-                r = requests.get('%s/export/html' % url)
-                r.raise_for_status()
-            except:
-                _logger.warning("No url found '%s'.", url)
-            else:
-                mo = re.search('<body>(.*)</body>', r.content.decode(), re.DOTALL)
-                if mo:
-                    content = mo.group(1)
+                content = myPad.getHtml(path).get('html', '')
+            except IOError:
+                _logger.warning('Http Error: the credentials might be absent for url: "%s". Falling back.' % url)
+                try:
+                    r = requests.get('%s/export/html' % url)
+                    r.raise_for_status()
+                except Exception:
+                    _logger.warning("No pad found with url '%s'.", url)
+                else:
+                    mo = re.search('<body>(.*)</body>', r.content.decode(), re.DOTALL)
+                    if mo:
+                        content = mo.group(1)
 
         return content
 
@@ -128,7 +133,7 @@ class PadCommon(models.AbstractModel):
                 company = self.env.user.sudo().company_id
                 myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api')
                 path = self[k].split('/p/')[1]
-                myPad.setText(path, (html2plaintext(vals[field.pad_content_field]).encode('utf-8')))
+                myPad.setHtmlFallbackText(path, vals[field.pad_content_field])
 
         # Update the `pad_content_field` if the pad is modified
         for k, v in list(vals.items()):
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index fc9721eb9c8..2d4872f3bb9 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,5 +1,10 @@
 """Module to talk to EtherpadLite API."""
 import requests
+import logging
+
+from odoo.tools import html2plaintext
+
+_logger = logging.getLogger(__name__)
 
 
 class EtherpadLiteClient:
@@ -171,6 +176,15 @@ class EtherpadLiteClient:
             "text": text
         })
 
+    def setHtmlFallbackText(self, padID, html):
+        try:
+            # Prevents malformed HTML errors
+            html_wellformed = '<html><body>' + html + '</body></html>'
+            return self.setHtml(padID, html_wellformed)
+        except Exception:
+            _logger.exception('Falling back to setText. SetHtml failed with message:')
+            return self.setText(padID, html2plaintext(html).encode('UTF-8'))
+
     def setHtml(self, padID, html):
         """sets the text of a pad from html"""
         return self.call("setHTML", {
diff --git a/addons/pad_project/i18n/es.po b/addons/pad_project/i18n/es.po
index a244829355a..c042ec5956f 100644
--- a/addons/pad_project/i18n/es.po
+++ b/addons/pad_project/i18n/es.po
@@ -3,16 +3,17 @@
 # * pad_project
 # 
 # Translators:
-# oihane <oihanecruce@gmail.com>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# oihane <oihanecruce@gmail.com>, 2016
+# Martin Trigaux, 2016
+# Antonio Trueba, 2017
+# JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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: JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.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,15 +39,15 @@ msgstr "Tarea"
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_task_use_pad
 msgid "Use collaborative pad"
-msgstr ""
+msgstr "Usar pad colaborativo"
 
 #. 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 "Usar pads colaborativos para tareas en este proyecto."
 
 #. module: pad_project
 #: model:ir.model.fields,field_description:pad_project.field_project_project_use_pads
 msgid "Use collaborative pads"
-msgstr ""
+msgstr "Usar pads colaborativos"
diff --git a/addons/payment/i18n/de.po b/addons/payment/i18n/de.po
index 42f90106e08..23b81921d2c 100644
--- a/addons/payment/i18n/de.po
+++ b/addons/payment/i18n/de.po
@@ -3,17 +3,17 @@
 # * payment
 # 
 # Translators:
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # key six <mobile.umts@gmail.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Andi, 2017
+# Martin Trigaux, 2017
 # Torsten Wichmann <t.wichmann@intero-technologies.de>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Mathias Neef <mn@copado.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
@@ -22,13 +22,14 @@
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 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: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"
@@ -49,7 +50,7 @@ msgstr "<i class=\"fa fa-arrow-circle-right\"/> Zurück zu Mein Konto"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-lock\"> Pay</i>"
-msgstr ""
+msgstr "<i class=\"fa fa-lock\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
@@ -191,7 +192,7 @@ msgid ""
 "transaction. The order has been confirmed but will not be paid. Do not "
 "hesitate to contact us if you have any questions on the status of your "
 "order.</span>"
-msgstr ""
+msgstr "<span><i/></span>"
 
 #. module: payment
 #: model:payment.acquirer,pending_msg:payment.payment_acquirer_adyen
diff --git a/addons/payment/i18n/es.po b/addons/payment/i18n/es.po
index 779fe4bc5e4..c8a3fcc81a1 100644
--- a/addons/payment/i18n/es.po
+++ b/addons/payment/i18n/es.po
@@ -5,14 +5,14 @@
 # Translators:
 # oihane <oihanecruce@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
 # Humberto Garza De Koster <garzadekoster@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Alejandro Die Sanchis <marketing@domatix.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
@@ -27,13 +27,14 @@
 # Alejandro Santana <alejandrosantana@anubia.es>, 2017
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2017
 # Daniel Santibáñez Polanco <dansanti@gmail.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: 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"
@@ -59,7 +60,7 @@ msgstr "<i class=\"fa fa-lock\"> Pagar</i>"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-plus-circle\"> Add new card</i>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
@@ -72,28 +73,28 @@ msgstr "<i class=\"fa fa-trash\"/> Eliminar"
 #: code:addons/payment/static/src/js/payment_form.js:219
 #, python-format
 msgid "<p>Please fill all the inputs required.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:180
 #, python-format
 msgid "<p>Please select a payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:274
 #, python-format
 msgid "<p>Please select the option to add a new payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:315
 #, python-format
 msgid "<p>This card is currently linked to the following records:<p/>"
-msgstr ""
+msgstr "<p><p/>"
 
 #. module: payment
 #. openerp-web
@@ -103,7 +104,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:267
 #, python-format
 msgid "<p>We are not able to add your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -111,7 +112,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:333
 #, python-format
 msgid "<p>We are not able to delete your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -119,14 +120,14 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:161
 #, python-format
 msgid "<p>We are not able to redirect you to the payment form.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:169
 #, python-format
 msgid "<p>We're unable to process your payment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
diff --git a/addons/payment/i18n/fr.po b/addons/payment/i18n/fr.po
index ba6016d08a2..8adcd9519e7 100644
--- a/addons/payment/i18n/fr.po
+++ b/addons/payment/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
 # Clo <clo@odoo.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
@@ -14,8 +14,8 @@
 # Xavier Symons <xsy@openerp.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
-# Hamid Darabi <hamid.darabi@gmail.com>, 2016
+# Florian Hatat, 2016
+# Hamid Darabi, 2016
 # Daniel & Delphine <dd2013@leschoupinous.net>, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Simon CARRIER <carrier.sim@gmail.com>, 2016
@@ -27,13 +27,14 @@
 # Eloïse Stilmant <est@odoo.com>, 2017
 # nthnnl <nathan070@me.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"
@@ -54,17 +55,17 @@ msgstr "<i class=\"fa fa-arrow-circle-right\"/> Retour à mon compte"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-lock\"> Pay</i>"
-msgstr ""
+msgstr "<i class=\"fa fa-lock\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-plus-circle\"> Add new card</i>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-trash\"/> Delete"
-msgstr ""
+msgstr "<i class=\"fa fa-trash\"/>"
 
 #. module: payment
 #. openerp-web
@@ -72,28 +73,28 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:219
 #, python-format
 msgid "<p>Please fill all the inputs required.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:180
 #, python-format
 msgid "<p>Please select a payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:274
 #, python-format
 msgid "<p>Please select the option to add a new payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:315
 #, python-format
 msgid "<p>This card is currently linked to the following records:<p/>"
-msgstr ""
+msgstr "<p><p/>"
 
 #. module: payment
 #. openerp-web
@@ -103,7 +104,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:267
 #, python-format
 msgid "<p>We are not able to add your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -111,7 +112,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:333
 #, python-format
 msgid "<p>We are not able to delete your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -119,28 +120,28 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:161
 #, python-format
 msgid "<p>We are not able to redirect you to the payment form.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:169
 #, python-format
 msgid "<p>We're unable to process your payment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid ""
 "<span class=\"o_warning_text\">Test</span>\n"
 "                                    <span class=\"o_stat_text\">Environment</span>"
-msgstr ""
+msgstr "<span class=\"o_warning_text\"/><span class=\"o_stat_text\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
 msgid ""
 "<span class=\"text-success\">Production</span>\n"
 "                                    <span class=\"o_stat_text\">Environment</span>"
-msgstr ""
+msgstr "<span class=\"text-success\"/><span class=\"o_stat_text\"/>"
 
 #. module: payment
 #: model:payment.acquirer,cancel_msg:payment.payment_acquirer_adyen
diff --git a/addons/payment/i18n/zh_CN.po b/addons/payment/i18n/zh_CN.po
index a37b908f3d1..a574ac94023 100644
--- a/addons/payment/i18n/zh_CN.po
+++ b/addons/payment/i18n/zh_CN.po
@@ -12,13 +12,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # fausthuang, 2017
 # 山西清水欧度(QQ:54773801) <54773801@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: 山西清水欧度(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"
@@ -44,7 +45,7 @@ msgstr "<i class=\"fa fa-lock\">付款</i>"
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
 msgid "<i class=\"fa fa-plus-circle\"> Add new card</i>"
-msgstr ""
+msgstr "<i class=\"fa fa-plus-circle\"/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.payment_tokens_list
@@ -57,28 +58,28 @@ msgstr "<i class=\"fa fa-trash\"/>删除"
 #: code:addons/payment/static/src/js/payment_form.js:219
 #, python-format
 msgid "<p>Please fill all the inputs required.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:180
 #, python-format
 msgid "<p>Please select a payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:274
 #, python-format
 msgid "<p>Please select the option to add a new payment method.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:315
 #, python-format
 msgid "<p>This card is currently linked to the following records:<p/>"
-msgstr ""
+msgstr "<p><p/>"
 
 #. module: payment
 #. openerp-web
@@ -88,7 +89,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:267
 #, python-format
 msgid "<p>We are not able to add your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -96,7 +97,7 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:333
 #, python-format
 msgid "<p>We are not able to delete your payment method at the moment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
@@ -104,14 +105,14 @@ msgstr ""
 #: code:addons/payment/static/src/js/payment_form.js:161
 #, python-format
 msgid "<p>We are not able to redirect you to the payment form.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #. openerp-web
 #: code:addons/payment/static/src/js/payment_form.js:169
 #, python-format
 msgid "<p>We're unable to process your payment.</p>"
-msgstr ""
+msgstr "<p/>"
 
 #. module: payment
 #: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -177,7 +178,7 @@ msgid ""
 "transaction. The order has been confirmed but will not be paid. Do not "
 "hesitate to contact us if you have any questions on the status of your "
 "order.</span>"
-msgstr ""
+msgstr "<span><i/></span>"
 
 #. module: payment
 #: model:payment.acquirer,pending_msg:payment.payment_acquirer_adyen
diff --git a/addons/payment_sips/i18n/nl.po b/addons/payment_sips/i18n/nl.po
index 594383f6a34..9067457f71f 100644
--- a/addons/payment_sips/i18n/nl.po
+++ b/addons/payment_sips/i18n/nl.po
@@ -3,8 +3,8 @@
 # * payment_sips
 # 
 # Translators:
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
-# Eric Geens <ericgeens@yahoo.com>, 2017
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
+# Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 msgid ""
 msgstr ""
@@ -52,7 +52,7 @@ msgstr "Interface versie"
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer_sips_merchant_id
 msgid "Merchant ID"
-msgstr "Merchant ID"
+msgstr "Handelaar ID"
 
 #. module: payment_sips
 #: model:ir.model,name:payment_sips.model_payment_acquirer
diff --git a/addons/payment_stripe/i18n/nl.po b/addons/payment_stripe/i18n/nl.po
index 6438c26845b..00a5e623a8f 100644
--- a/addons/payment_stripe/i18n/nl.po
+++ b/addons/payment_stripe/i18n/nl.po
@@ -46,7 +46,7 @@ msgstr "CVC"
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
 msgid "Card number"
-msgstr "Kaartnumme"
+msgstr "Kaartnummer"
 
 #. module: payment_stripe
 #: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
@@ -82,7 +82,7 @@ msgstr "Vervalt (MM / JJ)"
 #: code:addons/payment_stripe/static/src/js/stripe.js:32
 #, python-format
 msgid "Just one more second, confirming your payment..."
-msgstr "Nog even geduld, bevestigen van uw betaling..."
+msgstr "Nog even geduld,  bezig met bevestigen van uw betaling..."
 
 #. module: payment_stripe
 #: model:ir.model,name:payment_stripe.model_payment_acquirer
diff --git a/addons/payment_stripe/models/payment.py b/addons/payment_stripe/models/payment.py
index 888cc021b83..e097f4b2e89 100644
--- a/addons/payment_stripe/models/payment.py
+++ b/addons/payment_stripe/models/payment.py
@@ -270,6 +270,10 @@ class PaymentTokenStripe(models.Model):
 
 
     def _stripe_create_customer(self, token, description=None, acquirer_id=None):
+        if token.get('error'):
+            _logger.error('payment.token.stripe_create_customer: Token error:\n%s', pprint.pformat(token['error']))
+            raise Exception(token['error']['message'])
+
         if token['object'] != 'token':
             _logger.error('payment.token.stripe_create_customer: Cannot create a customer for object type "%s"', token.get('object'))
             raise Exception('We are unable to process your credit card information.')
@@ -278,10 +282,6 @@ class PaymentTokenStripe(models.Model):
             _logger.error('payment.token.stripe_create_customer: Cannot create a customer for token type "%s"', token.get('type'))
             raise Exception('We are unable to process your credit card information.')
 
-        if token.get('error'):
-            _logger.error('payment.token.stripe_create_customer: Token error:\n%s', pprint.pformat(token['error']))
-            raise Exception(token['error']['message'])
-
         payment_acquirer = self.env['payment.acquirer'].browse(acquirer_id or self.acquirer_id.id)
         url_customer = 'https://%s/customers' % payment_acquirer._get_stripe_api_url()
 
diff --git a/addons/payment_stripe/static/src/js/stripe.js b/addons/payment_stripe/static/src/js/stripe.js
index 13f8f91bfcd..2c22dcfa0f4 100644
--- a/addons/payment_stripe/static/src/js/stripe.js
+++ b/addons/payment_stripe/static/src/js/stripe.js
@@ -97,7 +97,10 @@ odoo.define('payment_stripe.stripe', function(require) {
         if (so_id) {
             so_id = parseInt(so_id[1]);
         }
-
+        var invoice_id = $("input[name='return_url']").val().match(/invoices\/([0-9]+)/) || undefined;
+        if (invoice_id) {
+            invoice_id = parseInt(invoice_id[1]);
+        }
 
         var currency = $("input[name='currency']").val();
         var currency_id = $("input[name='currency_id']").val();
@@ -121,8 +124,14 @@ odoo.define('payment_stripe.stripe', function(require) {
                 try { provider_form[0].innerHTML = data; } catch (e) {};
             });
         } else if (window.location.href.includes("/my/orders/")) {
-            var create_tx = ajax.jsonRpc('/pay/sale/' + acquirer_id + '/form_tx/', 'call', {
-                so_id: so_id,
+            var create_tx = ajax.jsonRpc('/pay/sale/' + so_id + '/form_tx/', 'call', {
+                access_token: access_token,
+                acquirer_id: acquirer_id
+            }).then(function (data) {
+                try { provider_form.innerHTML = data; } catch (e) {};
+            });
+        } else if (window.location.href.includes("/my/invoices/")) {
+            var create_tx = ajax.jsonRpc('/invoice/pay/' + invoice_id + '/form_tx/', 'call', {
                 access_token: access_token,
                 acquirer_id: acquirer_id
             }).then(function (data) {
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index b076e65d59f..4f6db6c29ce 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -2654,7 +2654,7 @@ msgstr "POS orderlijn"
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_duration
 msgid "Pos Session Duration"
-msgstr ""
+msgstr "POS sessie duur"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_state
@@ -3661,6 +3661,8 @@ msgid ""
 "The session has been opened for an unusually long period. Please consider "
 "closing."
 msgstr ""
+"De sessie is geopend voor een ongewoon lange periode. Overweeg om deze af te"
+" sluiten."
 
 #. module: point_of_sale
 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
diff --git a/addons/pos_cache/i18n/nl.po b/addons/pos_cache/i18n/nl.po
index f59b3cf528a..af6fb8f917e 100644
--- a/addons/pos_cache/i18n/nl.po
+++ b/addons/pos_cache/i18n/nl.po
@@ -32,7 +32,7 @@ msgstr "Cache bereken gebruiker"
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_config_id
 msgid "Config"
-msgstr ""
+msgstr "Configuratie"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_create_uid
@@ -91,17 +91,17 @@ msgstr "Oudste cache tijd"
 #: model:ir.cron,cron_name:pos_cache.refresh_pos_cache_cron
 #: model:ir.cron,name:pos_cache.refresh_pos_cache_cron
 msgid "PoS: refresh cache"
-msgstr ""
+msgstr "PoS: vernieuw cache"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_product_domain
 msgid "Product Domain"
-msgstr ""
+msgstr "Product domein"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_product_fields
 msgid "Product Fields"
-msgstr ""
+msgstr "Product velden"
 
 #. module: pos_cache
 #: model:ir.model,name:pos_cache.model_pos_cache
diff --git a/addons/pos_sale/i18n/de.po b/addons/pos_sale/i18n/de.po
index 5423fa6b3e6..58658bae7ae 100644
--- a/addons/pos_sale/i18n/de.po
+++ b/addons/pos_sale/i18n/de.po
@@ -3,22 +3,23 @@
 # * pos_sale
 # 
 # Translators:
-# Renzo Meister <info@jamotion.ch>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Renzo Meister, 2017
+# Martin Trigaux, 2017
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Wolfgang Taferner, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
 # Jan Brodersen <4rmitxes@gmail.com>, 2017
+# 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: Jan Brodersen <4rmitxes@gmail.com>, 2017\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"
@@ -50,7 +51,7 @@ msgstr "Gruppiert nach"
 #. module: pos_sale
 #: model:ir.model.fields,help:pos_sale.field_crm_team_dashboard_graph_group_pos
 msgid "How this channel's dashboard graph will group the results."
-msgstr ""
+msgstr "So gruppiert dieses Dashboard-Diagramm des Kanals die Ergebnisse."
 
 #. module: pos_sale
 #: selection:crm.team,dashboard_graph_group_pos:0
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 33c73ad4f39..99f84f8c39a 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -6,7 +6,7 @@
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Melroy van den Berg <webmaster1989@gmail.com>, 2018
 msgid ""
@@ -28,7 +28,7 @@ msgstr ""
 #: code:addons/product/static/src/js/product_template_import.js:13
 #, python-format
 msgid " Import Template for Products"
-msgstr ""
+msgstr "Import sjabloon voor producten"
 
 #. module: product
 #: selection:product.pricelist.item,applied_on:0
@@ -1366,7 +1366,7 @@ msgstr "Product verpakkingen"
 #: model:ir.model.fields,field_description:product.field_res_config_settings_group_stock_packaging
 #: model:ir.ui.view,arch_db:product.product_packaging_tree_view
 msgid "Product Packagings"
-msgstr ""
+msgstr "Product verpakkingen"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -1897,7 +1897,7 @@ msgstr "Dit is de som van de extra prijs van alle kenmerken"
 #. module: product
 #: model:ir.ui.view,arch_db:product.product_template_form_view
 msgid "This note will show up on sales orders & invoices."
-msgstr ""
+msgstr "Deze notitie wordt getoond op verkooporders & facturen."
 
 #. module: product
 #: model:ir.model.fields,help:product.field_res_partner_property_product_pricelist
diff --git a/addons/product/models/product_attribute.py b/addons/product/models/product_attribute.py
index cffefbbda13..e47297da52f 100644
--- a/addons/product/models/product_attribute.py
+++ b/addons/product/models/product_attribute.py
@@ -107,7 +107,6 @@ class ProductAttributeLine(models.Model):
         # search on a m2o and one on a m2m, probably this will quickly become
         # difficult to compute - check if performance optimization is required
         if name and operator in ('=', 'ilike', '=ilike', 'like', '=like'):
-            new_args = ['|', ('attribute_id', operator, name), ('value_ids', operator, name)]
-        else:
-            new_args = args
-        return super(ProductAttributeLine, self).name_search(name=name, args=new_args, operator=operator, limit=limit)
+            args = ['|', ('attribute_id', operator, name), ('value_ids', operator, name)]
+            return self.search(args, limit=limit).name_get()
+        return super(ProductAttributeLine, self).name_search(name=name, args=args, operator=operator, limit=limit)
diff --git a/addons/product/tests/test_variants.py b/addons/product/tests/test_variants.py
index fbf3073377d..813f5f9e28d 100644
--- a/addons/product/tests/test_variants.py
+++ b/addons/product/tests/test_variants.py
@@ -2,6 +2,43 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import common
+from odoo.tests.common import TransactionCase
+
+class TestVariants(TransactionCase):
+
+    def setUp(self):
+        res = super(TestVariants, self).setUp()
+        self.size_attr = self.env['product.attribute'].create({'name': 'Size'})
+        self.size_attr_value_s = self.env['product.attribute.value'].create({'name': 'S', 'attribute_id': self.size_attr.id})
+        self.size_attr_value_m = self.env['product.attribute.value'].create({'name': 'M', 'attribute_id': self.size_attr.id})
+        self.size_attr_value_l = self.env['product.attribute.value'].create({'name': 'L', 'attribute_id': self.size_attr.id})
+        self.product_shirt_template = self.env['product.template'].create({
+            'name': 'Shirt',
+            'attribute_line_ids': [(0, 0, {
+                'attribute_id': self.size_attr.id,
+                'value_ids': [(6, 0, [self.size_attr_value_l.id])],
+            })]
+        })
+        return res
+
+    def test_attribute_line_search(self):
+        search_not_to_be_found = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'M')]
+        )
+        self.assertNotIn(self.product_shirt_template, search_not_to_be_found,
+                         'Shirt should not be found searching M')
+
+        search_attribute = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'Size')]
+        )
+        self.assertIn(self.product_shirt_template, search_attribute,
+                      'Shirt should be found searching Size')
+
+        search_value = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'L')]
+        )
+        self.assertIn(self.product_shirt_template, search_value,
+                      'Shirt should be found searching L')
 
 
 class TestVariants(common.TestProductCommon):
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 10e227b5648..0fa571b54a8 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -5,12 +5,12 @@
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 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
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
+# Niki Waibel, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # key six <mobile.umts@gmail.com>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
@@ -18,7 +18,7 @@
 # Martin K <martinkuenz@gmail.com>, 2017
 # Marvin Elia Hoppe <marvin_elia@web.de>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # Katharina Moritz <kmo@e2f.com>, 2017
@@ -27,13 +27,14 @@
 # Philipp Hug <philipp@hug.cx>, 2017
 # Fabian Liesch <fabian.liesch@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: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"
@@ -446,7 +447,7 @@ msgstr "<strong>Zugewiesen an</strong>"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_project
 msgid "<strong>Customer</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -2022,7 +2023,7 @@ msgstr "Suchen"
 #: code:addons/project/controllers/portal.py:92
 #, python-format
 msgid "Search <span class=\"nolabel\"> (in Content)</span>"
-msgstr ""
+msgstr "<span class=\"nolabel\"/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 98b369ccce5..15efdf4e402 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Melroy van den Berg <webmaster1989@gmail.com>, 2018
 msgid ""
@@ -408,7 +408,7 @@ msgstr ""
 #: code:addons/project/static/src/js/tour.js:59
 #, python-format
 msgid "<p>Once your task is ready, you can save it.</p>"
-msgstr ""
+msgstr "<p>Eenmaal u taak klaar is kan u ze bewaren.</p>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form
@@ -463,7 +463,7 @@ msgstr "<strong>Project:</strong>"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_project_rating_popover
 msgid "<strong>Rated by: </strong>"
-msgstr ""
+msgstr "<strong>Beoordeeld door: </strong>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_my_task
@@ -1149,7 +1149,7 @@ msgstr "Geeft de volgorde weer wanneer de lijst van taken wordt weergegeven."
 #: code:addons/project/static/src/js/tour.js:114
 #, python-format
 msgid "Good job! Your completed the Project Management tour."
-msgstr ""
+msgstr "Goed gedaan! U heeft de project beheer toer voltooid."
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1444,7 +1444,7 @@ msgstr "Maak uw eerste project aan."
 #: code:addons/project/static/src/js/tour.js:47
 #, python-format
 msgid "Let's create your first task."
-msgstr ""
+msgstr "Laten we uw eerste taak aanmaken."
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.res_config_settings_view_form
@@ -1580,7 +1580,7 @@ msgstr "Geen onderwerp"
 #. module: project
 #: model:ir.ui.view,arch_db:project.rating_index
 msgid "No project rating puslished for now."
-msgstr ""
+msgstr "Geen project beoordeling gepubliceerd voor nu."
 
 #. module: project
 #: selection:project.project,rating_status:0
@@ -1912,7 +1912,7 @@ msgstr "Beoordeling aanvraag deadline"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_portal_show_rating
 msgid "Rating visible publicly"
-msgstr ""
+msgstr "Beoordeling publiekelijk beschikbaar"
 
 #. module: project
 #: selection:project.project,rating_status:0
@@ -2168,7 +2168,7 @@ msgstr "Sub-taken"
 #. module: project
 #: sql_constraint:project.tags:0
 msgid "Tag name already exists!"
-msgstr ""
+msgstr "Label naam bestaat al!"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.project_tags_action
@@ -2306,7 +2306,7 @@ msgstr "Takenanalyse"
 #. module: project
 #: model:ir.ui.view,arch_db:project.res_config_settings_view_form
 msgid "Tasks Management"
-msgstr ""
+msgstr "Taakbeheer"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_type_ids
@@ -2317,7 +2317,7 @@ msgstr "Taken fases"
 #. module: project
 #: model:ir.model,name:project.model_project_tags
 msgid "Tasks Tags"
-msgstr ""
+msgstr "Labels taken"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -2441,6 +2441,8 @@ msgstr "Deze taak is samengevoegd in de volgende taak:"
 #, python-format
 msgid "This will create new project and redirect us to its tasks."
 msgstr ""
+"Dit maakt een nieuw project en verwijst ons door naar de taken van dit "
+"project."
 
 #. module: project
 #: model:ir.model.fields,help:project.field_account_analytic_account_company_uom_id
@@ -2493,7 +2495,7 @@ msgstr "Activiteiten van vandaag"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
 msgid "Top 5 partner ratings of last 15 days."
-msgstr ""
+msgstr "Top 5 partner beoordelingen van de laatste 15 dagen."
 
 #. module: project
 #: model:ir.model.fields,help:project.field_project_task_remaining_hours
@@ -2536,18 +2538,18 @@ msgstr "Ongelezen berichten"
 #: code:addons/project/static/src/js/project.js:72
 #, python-format
 msgid "Upload and Set"
-msgstr ""
+msgstr "Uploaden en instellen"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_res_config_settings_group_project_rating
 #: model:res.groups,name:project.group_project_rating
 msgid "Use Rating on Project"
-msgstr ""
+msgstr "Gebruik beoordeling op project"
 
 #. module: project
 #: model:res.groups,name:project.group_subtask_project
 msgid "Use Subtasks"
-msgstr ""
+msgstr "Gebruik subtaken"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project_label_tasks
@@ -2737,7 +2739,7 @@ msgstr "Bijv. Bedrijfsfeest"
 #. module: project
 #: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
 msgid "happy"
-msgstr ""
+msgstr "blij"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_task_kanban
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 569b1c3f790..5e0e3a0fb85 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -17,13 +17,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # fausthuang, 2017
 # Luke <cialuo@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: Luke <cialuo@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"
@@ -1857,7 +1858,7 @@ msgstr "搜索"
 #: code:addons/project/controllers/portal.py:92
 #, python-format
 msgid "Search <span class=\"nolabel\"> (in Content)</span>"
-msgstr ""
+msgstr "<span class=\"nolabel\"/>"
 
 #. module: project
 #: model:ir.ui.view,arch_db:project.view_project_project_filter
diff --git a/addons/project_timesheet_holidays/tests/test_timesheet_holidays.py b/addons/project_timesheet_holidays/tests/test_timesheet_holidays.py
index fbfdf2afa55..90776a534f4 100644
--- a/addons/project_timesheet_holidays/tests/test_timesheet_holidays.py
+++ b/addons/project_timesheet_holidays/tests/test_timesheet_holidays.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import datetime
+from datetime import datetime, time
 from dateutil.relativedelta import relativedelta
 
 from odoo import fields
@@ -32,7 +32,9 @@ class TestTimesheetHolidays(TestTimesheet):
         self.employee_working_calendar = self.empl_employee.resource_calendar_id
         # leave dates : from next monday to next wednesday (to avoid crashing tests on weekend, when
         # there is no work days in working calendar)
-        self.leave_start_datetime = datetime.today().replace(hour=7, minute=0) + relativedelta(weeks=0, days=1, weekday=0)
+        # NOTE: second and millisecond can add a working days
+        today = datetime.combine(datetime.today(), time.min)
+        self.leave_start_datetime = today.replace(hour=7) + relativedelta(weeks=0, days=1, weekday=0)
         self.leave_end_datetime = self.leave_start_datetime + relativedelta(days=3)
 
         # all company have those internal project/task (created by default)
@@ -74,7 +76,7 @@ class TestTimesheetHolidays(TestTimesheet):
 
     def test_validate_with_timesheet(self):
         # employee creates a leave request
-        number_of_days = (self.leave_end_datetime - self.leave_start_datetime).days+1
+        number_of_days = (self.leave_end_datetime - self.leave_start_datetime).days
         holiday = self.Requests.sudo(self.user_employee.id).create({
             'name': 'Leave 1',
             'employee_id': self.empl_employee.id,
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 5550bf3682a..ed368b8befa 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -1182,7 +1182,7 @@ msgstr "Mijn activiteiten"
 #. module: purchase
 #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "My Purchases"
-msgstr ""
+msgstr "Mijn aankopen"
 
 #. module: purchase
 #: code:addons/purchase/controllers/portal.py:44
diff --git a/addons/purchase_requisition/i18n/nl.po b/addons/purchase_requisition/i18n/nl.po
index c52b170948d..fa4f242610d 100644
--- a/addons/purchase_requisition/i18n/nl.po
+++ b/addons/purchase_requisition/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -314,7 +314,7 @@ msgstr "Meer aanvragen"
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
 msgid "My Agreements"
-msgstr ""
+msgstr "Mijn overeenkomsten"
 
 #. module: purchase_requisition
 #: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
diff --git a/addons/repair/i18n/de.po b/addons/repair/i18n/de.po
index 99f7bdf4fb4..0f4879453a7 100644
--- a/addons/repair/i18n/de.po
+++ b/addons/repair/i18n/de.po
@@ -3,18 +3,18 @@
 # * mrp_repair
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
 # Ralf Hilgenstock <rh@dialoge.info>, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
+# Niki Waibel, 2017
+# Wolfgang Taferner, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
 # Kontor Consulting <p.becker@kontor.consulting>, 2017
 # Anja Funk <anja.funk@afimage.de>, 2017
 # Thorsten Vocks <thorsten.vocks@openbig.org>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Renzo Meister, 2017
 # JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Henry Mineehen <info@mineehen.de>, 2017
 # AppleMentalist <felix.schnatbaum@gmail.com>, 2017
@@ -23,15 +23,16 @@
 # DE R1 <e2fes1@hotmail.com>, 2017
 # Christopher Bendlin <inactive+cbeodoo@transifex.com>, 2017
 # DE T1 <e2f8846@yahoo.com>, 2017
-# Andi <flimflam@salasar.de>, 2017
+# Andi, 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-10-02 11:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+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"
@@ -88,6 +89,8 @@ msgid ""
 "                <p>Thank you,</p>\n"
 "            </data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><strong></strong><strong></strong></p><p></p><p></p></data>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -97,17 +100,17 @@ msgstr "<i>(Hinzufügen)</i>"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Lot/Serial Number:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Operations</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Parts</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
diff --git a/addons/repair/i18n/es.po b/addons/repair/i18n/es.po
index 1af64f2fc4f..9d4689d9ff2 100644
--- a/addons/repair/i18n/es.po
+++ b/addons/repair/i18n/es.po
@@ -3,14 +3,14 @@
 # * mrp_repair
 # 
 # Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # oihane <oihanecruce@gmail.com>, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
 # Luis M. Triana <luis.triana@jarsa.com.mx>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # Sergio Flores <vitavitae1@gmail.com>, 2016
 # David Perez <david@closemarketing.es>, 2016
 # Ivan Nieto <ivan.n.s@tuta.io>, 2016
@@ -23,15 +23,16 @@
 # Fernando San Martín Woerner <fsnmartin@gmail.com>, 2017
 # Christopher Ormaza <chris.ormaza@gmail.com>, 2017
 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
-# Gustavo Valverde <g.valverde02@gmail.com>, 2017
+# Gustavo Valverde, 2017
 # Nicole Kist <nki@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:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+0000\n"
-"Last-Translator: Nicole Kist <nki@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"
@@ -94,6 +95,8 @@ msgid ""
 "                <p>Thank you,</p>\n"
 "            </data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><strong></strong><strong></strong></p><p></p><p></p></data>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -103,17 +106,17 @@ msgstr "<i>(Añadir)</i>"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Lot/Serial Number:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Operations</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Parts</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -143,7 +146,7 @@ msgstr "<strong>Total</strong>"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Warranty:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
diff --git a/addons/repair/i18n/fr.po b/addons/repair/i18n/fr.po
index 5f69298548c..94b4330c7e5 100644
--- a/addons/repair/i18n/fr.po
+++ b/addons/repair/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
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
@@ -21,16 +21,17 @@
 # Eloïse Stilmant <est@odoo.com>, 2017
 # fr rev <e2ffr02@hotmail.com>, 2017
 # fr trans <e2ftrans1@yahoo.com>, 2017
-# Florian Hatat <mininet@wanadoo.fr>, 2017
+# Florian Hatat, 2017
 # Clo <clo@odoo.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:27+0000\n"
 "PO-Revision-Date: 2017-10-02 11:27+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"
@@ -87,6 +88,8 @@ msgid ""
 "                <p>Thank you,</p>\n"
 "            </data>"
 msgstr ""
+"<?xml "
+"version=\"1.0\"?><data><p></p><p><strong></strong><strong></strong></p><p></p><p></p></data>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -96,17 +99,17 @@ msgstr "<i>(Et)</i>"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Lot/Serial Number:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Operations</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Parts</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
@@ -136,7 +139,7 @@ msgstr "<strong>Total</strong>"
 #. module: mrp_repair
 #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
 msgid "<strong>Warranty:</strong>"
-msgstr ""
+msgstr "<strong/>"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index aa8f4561b34..804b0a05311 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -7,7 +7,7 @@
 # Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Volluta <volluta@tutanota.com>, 2016
 # Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017
@@ -2959,6 +2959,8 @@ msgid ""
 "You can not remove an order line once the sales order is confirmed.\n"
 "You should rather set the quantity to 0."
 msgstr ""
+"U kan geen orderlijn verwijderen eenmaal de verkooporder bevestigd is.\n"
+"U moet de hoeveelheid naar 0 zetten."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders_to_invoice
diff --git a/addons/sale_management/__init__.py b/addons/sale_management/__init__.py
index 67dee8c60db..1b2e5977577 100644
--- a/addons/sale_management/__init__.py
+++ b/addons/sale_management/__init__.py
@@ -1,2 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.api import Environment, SUPERUSER_ID
+
+
+def uninstall_hook(cr, registry):
+    env = Environment(cr, SUPERUSER_ID, {})
+    res_ids = env['ir.model.data'].search([
+        ('model', '=', 'ir.ui.menu'),
+        ('module', '=', 'sale')
+    ]).mapped('res_id')
+    env['ir.ui.menu'].browse(res_ids).update({'active': False})
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index b498649e819..4202ac31f78 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -47,4 +47,5 @@ The Dashboard for the Sales Manager will include
         'views/sale_management_templates.xml',
     ],
     'application': True,
+    'uninstall_hook': 'uninstall_hook',
 }
diff --git a/addons/sale_management/i18n/nl.po b/addons/sale_management/i18n/nl.po
index 3ba9efcbbef..1262305fd6a 100644
--- a/addons/sale_management/i18n/nl.po
+++ b/addons/sale_management/i18n/nl.po
@@ -6,14 +6,14 @@
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 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: Martin Trigaux, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: code:addons/sale_management/static/src/js/tour.js:35
 #, python-format
 msgid "Click here to add some products or services to your quotation."
-msgstr ""
+msgstr "Klik hier om producten of diensten toe te voegen aan uw offerte."
 
 #. module: sale_management
 #: model:ir.ui.view,arch_db:sale_management.sale_order_view_form
@@ -77,7 +77,7 @@ msgstr "Organiseer uw verkoopactiviteiten met de <b>Verkoopbeheer app</b>."
 #: code:addons/sale_management/static/src/js/tour.js:40
 #, python-format
 msgid "Select a product, or create a new one on the fly."
-msgstr ""
+msgstr "Selecteer een product, of maak direct een nieuw product aan."
 
 #. module: sale_management
 #. openerp-web
diff --git a/addons/sale_payment/i18n/nl.po b/addons/sale_payment/i18n/nl.po
index 73b0c199644..1fd9386bc1c 100644
--- a/addons/sale_payment/i18n/nl.po
+++ b/addons/sale_payment/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 # Eric Geens <ericgeens@yahoo.com>, 2017
 # Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017
@@ -78,7 +78,7 @@ msgstr "<strong>Transacties</strong>"
 #: code:addons/sale_payment/models/payment.py:53
 #, python-format
 msgid "Amount Mismatch (%s)"
-msgstr ""
+msgstr "Verschil bedrag (%s)"
 
 #. module: sale_payment
 #: model:ir.model.fields,field_description:sale_payment.field_crm_team_pending_payment_transactions_amount
diff --git a/addons/sale_payment/i18n/pt_BR.po b/addons/sale_payment/i18n/pt_BR.po
index 9d6c8f097cb..f72e5df5e2b 100644
--- a/addons/sale_payment/i18n/pt_BR.po
+++ b/addons/sale_payment/i18n/pt_BR.po
@@ -5,16 +5,17 @@
 # Translators:
 # grazziano <gra.negocia@gmail.com>, 2017
 # danimaribeiro <danimaribeiro@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Mateus Lopes <mateus1@gmail.com>, 2017
 # mariana rodrigues <mariana12v@gmail.com>, 2018
+# Raphael Rodrigues <raphael0608@gmail.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: mariana rodrigues <mariana12v@gmail.com>, 2018\n"
+"Last-Translator: Raphael Rodrigues <raphael0608@gmail.com>, 2018\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -247,11 +248,15 @@ msgstr ""
 #: model:ir.ui.view,arch_db:sale_payment.portal_order_error
 msgid "There was an error processing your payment: transaction issue.<br/>"
 msgstr ""
+"Ocorreu um erro no processamento do seu pagamento: problema de "
+"transação.<br/>"
 
 #. module: sale_payment
 #: model:ir.ui.view,arch_db:sale_payment.portal_order_error
 msgid "There was en error processing your payment: invalid credit card ID."
 msgstr ""
+"Ocorreu um erro no processamento do seu pagamento: ID do cartão de crédito "
+"inválido."
 
 #. module: sale_payment
 #: model:ir.model.fields,field_description:sale_payment.field_sale_order_payment_tx_ids
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
index 333c5a4534d..c1c64f786c5 100644
--- a/addons/sale_stock/i18n/nl.po
+++ b/addons/sale_stock/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
@@ -30,6 +30,9 @@ msgid ""
 "There are %s %s available across all warehouses.\n"
 "\n"
 msgstr ""
+"\n"
+"Er zijn %s %s beschikbaar doorheen alle magazijnen.\n"
+"\n"
 
 #. module: sale_stock
 #: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
diff --git a/addons/sale_timesheet/i18n/nl.po b/addons/sale_timesheet/i18n/nl.po
index 05183505dab..c4892adfe76 100644
--- a/addons/sale_timesheet/i18n/nl.po
+++ b/addons/sale_timesheet/i18n/nl.po
@@ -7,14 +7,14 @@
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 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: Martin Trigaux, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -193,7 +193,7 @@ msgstr "Is een dienst"
 #. module: sale_timesheet
 #: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
 msgid "Milestone services"
-msgstr "Milestone diensten"
+msgstr "Mijlpaal diensten"
 
 #. module: sale_timesheet
 #: selection:product.template,service_policy:0
@@ -341,7 +341,7 @@ msgid ""
 "Sales Order item should generate a task and/or a project, depending on the "
 "product settings."
 msgstr ""
-"En verkooporderregel dient een taak en/of een project aan te maken, "
+"Een verkooporderregel dient een taak en/of een project aan te maken, "
 "afhankelijk van de productinstellingen."
 
 #. module: sale_timesheet
diff --git a/addons/sales_team/i18n/de.po b/addons/sales_team/i18n/de.po
index 9052ebca51b..9f9d5f49879 100644
--- a/addons/sales_team/i18n/de.po
+++ b/addons/sales_team/i18n/de.po
@@ -3,19 +3,19 @@
 # * sales_team
 # 
 # Translators:
-# Wolfgang Taferner <wolfgang.transifex@service.wt-io-it.at>, 2017
-# Niki Waibel <niki.waibel@gmail.com>, 2017
-# Henry Mineehen <info@mineehen.de>, 2017
-# Renzo Meister <info@jamotion.ch>, 2017
+# Martin Trigaux, 2017
 # darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Andreas Stauder <andreas.stauder@brain-tec.ch>, 2017
+# JackTheHunter <Maximilian.N98@gmail.com>, 2017
+# Wolfgang Taferner, 2017
+# Niki Waibel, 2017
 # Tina Rittmüller <tr@ife.de>, 2017
-# aNj <anj2j@yahoo.de>, 2017
 # Ermin Trevisan <trevi@twanda.com>, 2017
-# BT_astauder <andreas.stauder@brain-tec.ch>, 2017
-# Rudolf Schnapka <rs@techno-flex.de>, 2017
-# JackTheHunter <Maximilian.N98@gmail.com>, 2017
 # Philipp Hug <philipp@hug.cx>, 2017
+# Henry Mineehen <info@mineehen.de>, 2017
+# Rudolf Schnapka <rs@techno-flex.de>, 2017
+# Renzo Meister, 2017
+# aNj <anj2j@yahoo.de>, 2017
 # Malte Jansen <work@maltejansen.de>, 2017
 # Constantin Ehrenstein <transifex@skiller.eu>, 2017
 # Nico Dor <nicolas.dorweiler@gmail.com>, 2017
@@ -209,7 +209,7 @@ msgstr "Gruppiert nach"
 #. module: sales_team
 #: model:ir.model.fields,help:sales_team.field_crm_team_dashboard_graph_group
 msgid "How this channel's dashboard graph will group the results."
-msgstr ""
+msgstr "So gruppiert dieses Dashboard-Diagramm des Kanals die Ergebnisse."
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team_id
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 14464a4d74a..ecae3799171 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -4,11 +4,11 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Miguel Vidali <mvidali129@gmail.com>, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Olivier Lenoir <olivier.lenoir@free.fr>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # Fabien Pinckaers <fp@openerp.com>, 2016
@@ -26,7 +26,7 @@
 # Sylvain LE GAL <sylvain.legal@grap.coop>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
-# ShevAbam <shevabam@gmail.com>, 2016
+# ShevAbam, 2016
 # Régis GEROMEGNACE <regis.geromegnace@gmail.com>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Guilhaume Bordiau <github@guilhaume.fr>, 2016
@@ -4824,7 +4824,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Sell and purchase products in different units of measure"
-msgstr "Acheter et vendre dans des unités de mesure différentes"
+msgstr "Achetez et vendez dans des unités de mesure différentes"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_procurement_rule_sequence
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index f7e5d670bdf..2eb93739f61 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -8,7 +8,7 @@
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017
 # Melroy van den Berg <webmaster1989@gmail.com>, 2017
 msgid ""
@@ -1359,7 +1359,7 @@ msgstr "Franco af schip"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_dhl
 msgid "DHL Connector"
-msgstr ""
+msgstr "DHL connector"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.stock_picking_type_menu
@@ -1831,7 +1831,7 @@ msgstr "Vrij aan boord"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_fedex
 msgid "FedEx Connector"
-msgstr ""
+msgstr "FedEx connector"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.quant_search_view
@@ -2858,7 +2858,7 @@ msgstr "Locatie"
 #. module: stock
 #: model:ir.actions.report,name:stock.action_report_location_barcode
 msgid "Location Barcode"
-msgstr ""
+msgstr "Locatie barcode"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_inventory_line_location_name
@@ -2921,7 +2921,7 @@ msgstr "Partij"
 #. module: stock
 #: model:ir.actions.report,name:stock.action_report_lot_barcode
 msgid "Lot Barcode"
-msgstr ""
+msgstr "Partij barcod"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -3035,6 +3035,8 @@ msgstr "Beheer push en pull voorraad flows"
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Manage product packagings (e.g. pack of 6 bottles, box of 10 pieces)"
 msgstr ""
+"Beheer product verpakkingen (bijvoorbeeld pak van 6 flessen, doos met 10 "
+"stuks)"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -3655,7 +3657,7 @@ msgstr "Verpakking"
 #. module: stock
 #: model:ir.actions.report,name:stock.action_report_quant_package_barcode_small
 msgid "Package Barcode"
-msgstr ""
+msgstr "Verpakkingsbarcode"
 
 #. module: stock
 #: model:ir.actions.report,name:stock.action_report_quant_package_barcode
@@ -4103,7 +4105,7 @@ msgstr "Productnaam"
 #: model:ir.ui.menu,name:stock.menu_product_packagings
 #: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
 msgid "Product Packagings"
-msgstr ""
+msgstr "Product verpakkingen"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -5953,12 +5955,12 @@ msgstr "Soort bewerking"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_ups
 msgid "UPS Connector"
-msgstr ""
+msgstr "UPS connector"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_usps
 msgid "USPS Connector"
-msgstr ""
+msgstr "USPS connector"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_inventory_line_prodlot_name
@@ -6792,7 +6794,7 @@ msgstr "barcode.rule"
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_res_config_settings_module_delivery_bpost
 msgid "bpost Connector"
-msgstr ""
+msgstr "bPost connector"
 
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.stock_location_path_form
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 225708c9d4a..3b1c27d9eb2 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -420,7 +420,7 @@ class QuantPackage(models.Model):
 
     def unpack(self):
         for package in self:
-            move_lines_to_remove = self.move_line_ids.filtered(lambda move_line: move_line.state != 'done')
+            move_lines_to_remove = package.move_line_ids.filtered(lambda move_line: move_line.state != 'done')
             if move_lines_to_remove:
                 move_lines_to_remove.write({'result_package_id': False})
             else:
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index ef7c011f943..d2193558134 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Volluta <volluta@tutanota.com>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
@@ -1289,7 +1289,7 @@ msgstr "HTTP routing"
 #: code:addons/web/static/src/xml/base.xml:807
 #, python-format
 msgid "Hide in Kanban"
-msgstr ""
+msgstr "Verbergen in Kanban"
 
 #. module: web
 #. openerp-web
@@ -2002,7 +2002,7 @@ msgstr "Selecteer velden voor opslaan export lijst..."
 #: code:addons/web/static/src/xml/base.xml:1270
 #, python-format
 msgid "Please update translations of :"
-msgstr ""
+msgstr "Gelieve de vertalingen te updaten van:"
 
 #. module: web
 #. openerp-web
@@ -2060,7 +2060,7 @@ msgstr "Kwartaal"
 #: code:addons/web/static/src/xml/base.xml:232
 #, python-format
 msgid "Regenerate Assets Bundles"
-msgstr ""
+msgstr "Assets bundels opnieuw genereren"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 4a4ac82e4ff..de150ba3547 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -155,9 +155,9 @@ msgid ""
 "                        &lt;body class=\"ie9\"&gt;\n"
 "                    &lt;![endif]--&gt;"
 msgstr ""
-"&lt;!—[if lt IE 10]&gt;\n"
-"                        &lt;body class=“ie9”&gt;\n"
-"                    &lt;![endif]—&gt;"
+"&lt;!--[if lt IE 10]&gt;\n"
+"                        &lt;body class=\"ie9\"&gt;\n"
+"                    &lt;![endif]--&gt;"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.minimal_layout
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js
index 56c6e45a08d..7963af8ec32 100644
--- a/addons/web/static/src/js/chrome/action_manager_act_window.js
+++ b/addons/web/static/src/js/chrome/action_manager_act_window.js
@@ -159,6 +159,14 @@ ActionManager.include({
      */
     _createViewController: function (action, viewType, viewOptions, options) {
         var self = this;
+        var viewDescr = _.findWhere(action.views, {type: viewType});
+        if (!viewDescr) {
+            // the requested view type isn't specified in the action (e.g.
+            // action with list view only, user clicks on a row in the list, it
+            // tries to switch to form view)
+            return $.Deferred().reject();
+        }
+
         var controllerID = _.uniqueId('controller_');
         var controller = {
             actionID: action.jsID,
@@ -184,7 +192,6 @@ ActionManager.include({
             // communication with trigger_up (e.g. for 'env_updated' event)
             viewOptions = _.extend(viewOptions, { controllerID: controllerID });
 
-            var viewDescr = _.findWhere(action.views, {type: viewType});
             var view = new viewDescr.Widget(viewDescr.fieldsView, viewOptions);
             var def = $.Deferred();
             action.controllers[viewType] = def;
diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer.js b/addons/web/static/src/js/views/kanban/kanban_renderer.js
index 4236ce74da4..6721f6d446c 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer.js
@@ -302,6 +302,16 @@ var KanbanRenderer = BasicRenderer.extend({
         }
     },
     /**
+     * @private
+     * @override
+     * adds a specific class to the kanban helper so that it can be targetted by specific css
+     */
+    _renderNoContentHelper: function() {
+        var $el = this._super.apply(this, arguments);
+        $el.toggleClass('o_kanban_view_nocontent',true)
+        return $el;
+    },
+    /**
      * Renders an ungrouped kanban view in a fragment.
      *
      * @private
diff --git a/addons/web/static/src/less/views.less b/addons/web/static/src/less/views.less
index ec7b0033cbc..d5a868a11c5 100644
--- a/addons/web/static/src/less/views.less
+++ b/addons/web/static/src/less/views.less
@@ -46,8 +46,10 @@
 }
 
 .o_view_nocontent {
-    .o-position-absolute(20%, 0, 0, 0);
-    pointer-events: none;
+    &.o_kanban_view_nocontent {
+        .o-position-absolute(20%, 0, 0, 0);        
+        pointer-events: none;
+    }
 
     .o_nocontent_help {
         pointer-events: auto;
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js
index f6a0007c1a9..1ee50daaf65 100644
--- a/addons/web/static/tests/chrome/action_manager_tests.js
+++ b/addons/web/static/tests/chrome/action_manager_tests.js
@@ -2270,6 +2270,47 @@ QUnit.module('ActionManager', {
         actionManager.destroy();
     });
 
+    QUnit.test('switch request to unknown view type', function (assert) {
+        assert.expect(7);
+
+        this.actions.push({
+            id: 33,
+            name: 'Partners',
+            res_model: 'partner',
+            type: 'ir.actions.act_window',
+            views: [[false, 'list'], [1, 'kanban']], // no form view
+        });
+
+        var actionManager = createActionManager({
+            actions: this.actions,
+            archs: this.archs,
+            data: this.data,
+            mockRPC: function (route, args) {
+                assert.step(args.method || route);
+                return this._super.apply(this, arguments);
+            },
+        });
+        actionManager.doAction(33);
+
+        assert.strictEqual(actionManager.$('.o_list_view').length, 1,
+            "should display the list view");
+
+        // try to open a record in a form view
+        actionManager.$('.o_list_view .o_data_row:first').click();
+        assert.strictEqual(actionManager.$('.o_list_view').length, 1,
+            "should still display the list view");
+        assert.strictEqual(actionManager.$('.o_form_view').length, 0,
+            "should not display the form view");
+
+        assert.verifySteps([
+            '/web/action/load',
+            'load_views',
+            '/web/dataset/search_read',
+        ]);
+
+        actionManager.destroy();
+    });
+
     QUnit.module('Actions in target="new"');
 
     QUnit.test('can execute act_window actions in target="new"', function (assert) {
diff --git a/addons/web_editor/i18n/nl.po b/addons/web_editor/i18n/nl.po
index 96521ccd9ad..c54f6b21ec4 100644
--- a/addons/web_editor/i18n/nl.po
+++ b/addons/web_editor/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2017
@@ -332,7 +332,7 @@ msgstr "Inhoud om te vertalen"
 #: code:addons/web_editor/static/src/xml/editor.xml:194
 #, python-format
 msgid "Copy-paste your URL or embed code here"
-msgstr "Kopieer uw URL of embed uw sluit uw code hier in"
+msgstr "Kopieer uw URL of uw insluitcode hier"
 
 #. module: web_editor
 #. openerp-web
@@ -683,7 +683,7 @@ msgstr "Verberg volledig-scherm knop"
 #: code:addons/web_editor/static/src/xml/editor.xml:210
 #, python-format
 msgid "Hide player controls"
-msgstr "Verberg player knoppen"
+msgstr "Verberg afspeel knoppen"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/static/src/js/editor/rte.js b/addons/web_editor/static/src/js/editor/rte.js
index 7ad20c0e614..76b1a1dd11b 100644
--- a/addons/web_editor/static/src/js/editor/rte.js
+++ b/addons/web_editor/static/src/js/editor/rte.js
@@ -385,7 +385,15 @@ var RTEWidget = Widget.extend({
         } else {
             rng = $editable.data('range') || rng;
         }
-        rng.select();
+        try {
+            // TODO this line might break for unknown reasons. I suppose that
+            // the created range is an invalid one. As it might be tricky to
+            // adapt that line and that it is not a critical one, temporary fix
+            // is to ignore the errors that this generates.
+            rng.select();
+        } catch (e) {
+            console.log('error', e);
+        }
         history.recordUndo($editable, event, internal_history);
     },
     /**
diff --git a/addons/website/i18n/fr.po b/addons/website/i18n/fr.po
index 84603ce368e..faaa6cf1185 100644
--- a/addons/website/i18n/fr.po
+++ b/addons/website/i18n/fr.po
@@ -4,24 +4,24 @@
 # 
 # Translators:
 # Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Melanie Bernard <mbe@odoo.com>, 2016
 # Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2016
 # Frédéric LIETART <stuff@tifred.fr>, 2016
 # Mohamed Cherkaoui <chermed@gmail.com>, 2016
-# Cédric Le Brouster <cedric.lebrouster@openfire.fr>, 2016
+# Cédric Le Brouster, 2016
 # Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
 # Xavier Symons <xsy@openerp.com>, 2016
 # lucasdeliege <deliegelucas@gmail.com>, 2016
 # Clo <clo@odoo.com>, 2016
 # Stephane DAGUET <stephane@darbtech.net>, 2016
-# Florian Hatat <mininet@wanadoo.fr>, 2016
+# Florian Hatat, 2016
 # Vincent Hammadache <vhammadache@gmail.com>, 2016
 # Jean-Marc Dupont <jmd@6it.fr>, 2016
 # Shark McGnark <peculiarcheese@gmail.com>, 2016
 # Fabien Bourgeois <fabien@yaltik.com>, 2016
 # Fabri Yohann <psn@fabri.pw>, 2016
-# Kévin R. <realrom@hotmail.fr>, 2016
+# Kévin R., 2016
 # Nancy Bolognesi <nb@microcom.ca>, 2016
 # Lionel Sausin <ls@numerigraphe.com>, 2016
 # Lucas Deliege <lud@odoo.com>, 2016
@@ -39,13 +39,14 @@
 # fr rev <e2ffr04@hotmail.com>, 2017
 # Micky Jault <micky037@hotmail.fr>, 2017
 # Olivier Dony <odo@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: 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"
@@ -566,7 +567,7 @@ msgid ""
 "controller. The address is <base>/website/action/<website_path>. Set this "
 "field as True to allow users to run this action. If it is set to False the "
 "action cannot be run through the website."
-msgstr ""
+msgstr "<base><website_path>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -2284,7 +2285,7 @@ msgid ""
 "Our products are designed for small to medium size companies willing to optimize\n"
 "                            their performance."
 msgstr ""
-"Nos produits sont désigné pour les petites et moyennes entreprises voulant optimiser\n"
+"Nos produits sont conçus pour les PME voulant optimiser\n"
 "leur performance."
 
 #. module: website
diff --git a/addons/website/i18n/nl.po b/addons/website/i18n/nl.po
index f8c87b22bef..2813a45f262 100644
--- a/addons/website/i18n/nl.po
+++ b/addons/website/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Volluta <volluta@tutanota.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -305,7 +305,7 @@ msgstr "<i class=\"fa fa-eyedropper\"/> Kleurbedekking"
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
 msgid "<i class=\"fa fa-facebook\"/>Options"
-msgstr ""
+msgstr "<i class=\"fa fa-facebook\"/>Opties"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippets
@@ -450,6 +450,9 @@ msgid ""
 "                <i class=\"fa fa-plus-circle\"/> Add Facebook Page\n"
 "            </span>"
 msgstr ""
+"<span class=\"o_add_facebook_page\">\n"
+"                <i class=\"fa fa-plus-circle\"/> Facebook pagina toevoegen\n"
+"            </span>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_image_gallery
@@ -1328,7 +1331,7 @@ msgstr "Facebook account"
 #: code:addons/website/static/src/js/editor/snippets.options.js:411
 #, python-format
 msgid "Facebook Page"
-msgstr ""
+msgstr "Facebook pagina"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.snippet_options
@@ -1580,7 +1583,7 @@ msgstr "Kop"
 #: code:addons/website/static/src/xml/website.facebook_page.xml:37
 #, python-format
 msgid "Hide Cover Photo"
-msgstr ""
+msgstr "Verberg omslagfoto"
 
 #. module: website
 #. openerp-web
@@ -1736,7 +1739,7 @@ msgstr "Geïnstalleerde modules"
 #: code:addons/website/static/src/xml/website.facebook_page.xml:57
 #, python-format
 msgid "Invalid Facebook Page Url"
-msgstr ""
+msgstr "Foutieve Facebook pagina URL"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_company_team
@@ -1896,7 +1899,7 @@ msgstr "Link"
 #. module: website
 #: model:ir.model.fields,field_description:website.field_res_config_settings_module_website_links
 msgid "Link Trackers"
-msgstr ""
+msgstr "Link traceerders"
 
 #. module: website
 #. openerp-web
@@ -2425,7 +2428,7 @@ msgstr "Personen"
 #: code:addons/website/static/src/xml/website.facebook_page.xml:58
 #, python-format
 msgid "Please enter valid facebook page URL for preview"
-msgstr ""
+msgstr "Gelieve een geldige Facebook pagina URL op te geven voor deze preview"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.theme_customize
@@ -2701,7 +2704,7 @@ msgstr "Weergeven als optionele overerfing"
 #: code:addons/website/static/src/xml/website.facebook_page.xml:44
 #, python-format
 msgid "Show Friend's Faces"
-msgstr ""
+msgstr "Toon gezichten van vrienden."
 
 #. module: website
 #. openerp-web
diff --git a/addons/website/i18n/zh_CN.po b/addons/website/i18n/zh_CN.po
index ccc60056af5..817970d6731 100644
--- a/addons/website/i18n/zh_CN.po
+++ b/addons/website/i18n/zh_CN.po
@@ -27,13 +27,14 @@
 # 老窦 北京 <2662059195@qq.com>, 2017
 # Connie Xiao <connie.xiao@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"
@@ -539,7 +540,7 @@ msgid ""
 "controller. The address is <base>/website/action/<website_path>. Set this "
 "field as True to allow users to run this action. If it is set to False the "
 "action cannot be run through the website."
-msgstr ""
+msgstr "<base><website_path>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.s_text_block
@@ -2146,7 +2147,7 @@ msgid ""
 "different model than this one), then this view's inheritance specs\n"
 "(<xpath/>) are applied, and the result is used as if it were this view's\n"
 "actual arch.\n"
-msgstr ""
+msgstr "<xpath/>"
 
 #. module: website
 #: model:ir.ui.view,arch_db:website.show_website_info
diff --git a/addons/website_event_track/i18n/nl.po b/addons/website_event_track/i18n/nl.po
index b2f0e86f380..215dd085326 100644
--- a/addons/website_event_track/i18n/nl.po
+++ b/addons/website_event_track/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -661,12 +661,12 @@ msgstr ""
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track25
 msgid "Merge proposals review, code sprint (entire afternoon)"
-msgstr "Merge proposals review, code sprint (hele middag)"
+msgstr ""
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track24
 msgid "Merge proposals review, code sprint (entire day)."
-msgstr "Merge proposals review, code sprint (hele dag)."
+msgstr ""
 
 #. module: website_event_track
 #: model:event.track,name:website_event_track.event_track30
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 809cf170ba9..7c755dd1df8 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -687,7 +687,7 @@
 
 <!-- Edition: post a reply -->
 <template id="post_reply">
-    <div class="css_editable_mode_hidden" groups="base.group_user">
+    <div class="css_editable_mode_hidden">
         <form t-attf-id="reply#{ object._name.replace('.','') + '-' + str(object.id) }" class="collapse js_website_submit_form"
             t-attf-action="/forum/#{ slug(forum) }/#{slug(object)}/reply" method="post" role="form">
             <h3 class="mt8">Your Reply</h3>
diff --git a/addons/website_quote/i18n/nl.po b/addons/website_quote/i18n/nl.po
index 1ea22f69e8a..7b428529e5e 100644
--- a/addons/website_quote/i18n/nl.po
+++ b/addons/website_quote/i18n/nl.po
@@ -5,7 +5,7 @@
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2017
 msgid ""
@@ -485,7 +485,8 @@ msgstr "Terug naar verkooporder"
 #: model:sale.quote.template,website_description:website_quote.website_quote_template_1
 msgid "Be available for periodic review meeting with Odoo SA account managers"
 msgstr ""
-"Wees beschikbaar voor periode meetings met de account managers van Odoo SA"
+"Wees beschikbaar voor periodieke meetings met de account managers van Odoo "
+"SA"
 
 #. module: website_quote
 #: model:sale.quote.template,website_description:website_quote.website_quote_template_1
diff --git a/addons/website_rating/__manifest__.py b/addons/website_rating/__manifest__.py
index c77566341dd..4ef33b67977 100644
--- a/addons/website_rating/__manifest__.py
+++ b/addons/website_rating/__manifest__.py
@@ -13,5 +13,5 @@ Bridge module for rating on website stuff.
         'views/website_rating_templates.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'auto_installable': True,
+    'auto_install': True,
 }
diff --git a/addons/website_sale/i18n/es.po b/addons/website_sale/i18n/es.po
index b1de5f299a5..4fdf7cbddc4 100644
--- a/addons/website_sale/i18n/es.po
+++ b/addons/website_sale/i18n/es.po
@@ -5,10 +5,10 @@
 # Translators:
 # Carles Antoli <carlesantoli@hotmail.com>, 2016
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Eric Antones <eantones@users.noreply.github.com>, 2016
 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
-# Antonio Trueba <atgayol@gmail.com>, 2016
+# Antonio Trueba, 2016
 # José Vicente <txusev@gmail.com>, 2016
 # Cristóbal Martí Oliver <info@moblesmarti.com>, 2016
 # Ana Juaristi <ajuaristio@gmail.com>, 2016
@@ -145,6 +145,8 @@ msgid ""
 "<i class=\"fa fa-shopping-cart\"/>\n"
 "                    My Cart"
 msgstr ""
+"<i class=\"fa fa-shopping-cart\"/>\n"
+"                    Mi Cesta"
 
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:58
@@ -247,17 +249,17 @@ msgstr ""
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span> &amp; Shipping</span>"
-msgstr ""
+msgstr "<span> &amp; Envío</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.wizard_checkout
 msgid "<span>Billing</span>"
-msgstr ""
+msgstr "<span>Facturación</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.confirmation
 msgid "<span>Confirmed</span>"
-msgstr ""
+msgstr "<span>Confirmado</span>"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -598,12 +600,12 @@ msgstr "Catálogo"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: High to Low"
-msgstr ""
+msgstr "Precio de catálogo: Mayor a Menor"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Catalog price: Low to High"
-msgstr ""
+msgstr "Precio de catálogo: Menor a Mayor"
 
 #. module: website_sale
 #: model:ir.actions.act_window,help:website_sale.product_public_category_action
@@ -1967,7 +1969,7 @@ msgstr "Lo sentimos. Este producto ya no está disponible."
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.sort
 msgid "Sorting by :"
-msgstr ""
+msgstr "Ordenado por:"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
@@ -1982,7 +1984,7 @@ msgstr "Estado / Provincia..."
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
 msgid "Street 2"
-msgstr ""
+msgstr "Calle 2"
 
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.address
diff --git a/addons/website_sale/i18n/nl.po b/addons/website_sale/i18n/nl.po
index 20274c717ca..ce2b52b77a9 100644
--- a/addons/website_sale/i18n/nl.po
+++ b/addons/website_sale/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
+# Martin Trigaux, 2016
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Eric Geens <ericgeens@yahoo.com>, 2016
 # Cas Vissers <casvissers@brahoo.nl>, 2016
@@ -589,7 +589,7 @@ msgstr "Winkelmandje herstel e-mail"
 #. module: website_sale
 #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
 msgid "Cart are considered abandoned after"
-msgstr "Winkelwagens worden als verlaten beschouwd naar"
+msgstr "Winkelwagens worden als verlaten beschouwd na"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_recovery_email_sent
diff --git a/addons/website_sale_comparison/i18n/nl.po b/addons/website_sale_comparison/i18n/nl.po
index b1773517904..7db68ea44e1 100644
--- a/addons/website_sale_comparison/i18n/nl.po
+++ b/addons/website_sale_comparison/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 # Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017
@@ -329,7 +329,7 @@ msgstr "Niet gecategoriseerd"
 #. module: website_sale_comparison
 #: model:product.attribute,name:website_sale_comparison.product_attribute_3
 msgid "Video Formats Supported"
-msgstr "Video formaten ondersteund"
+msgstr "Ondersteunde video formaten"
 
 #. module: website_sale_comparison
 #: model:product.attribute,name:website_sale_comparison.product_attribute_13
diff --git a/addons/website_sale_link_tracker/i18n/nl.po b/addons/website_sale_link_tracker/i18n/nl.po
index b88fcebe2d6..1e35e13c39f 100644
--- a/addons/website_sale_link_tracker/i18n/nl.po
+++ b/addons/website_sale_link_tracker/i18n/nl.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 msgid ""
 msgstr ""
@@ -50,7 +50,7 @@ msgstr "Offerte"
 #: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:10
 #, python-format
 msgid "REVENUE BY"
-msgstr ""
+msgstr "OMZET OP"
 
 #. module: website_sale_link_tracker
 #. openerp-web
@@ -71,4 +71,4 @@ msgstr ""
 #: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:5
 #, python-format
 msgid "col-md-6 col-xs-12"
-msgstr ""
+msgstr "col-md-6 col-xs-12"
diff --git a/addons/website_sale_options/i18n/es.po b/addons/website_sale_options/i18n/es.po
index 96134ed26c9..763eb9a4f60 100644
--- a/addons/website_sale_options/i18n/es.po
+++ b/addons/website_sale_options/i18n/es.po
@@ -3,20 +3,21 @@
 # * website_sale_options
 # 
 # Translators:
-# José Vicente <txusev@gmail.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2016
+# José Vicente <txusev@gmail.com>, 2016
+# Antonio Trueba, 2016
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
 # Gelo Joga Landoo <gj@landoo.es>, 2017
-# Antonio Trueba <atgayol@gmail.com>, 2017
-# RGB Consulting <odoo@rgbconsulting.com>, 2017
 # Eric Antones <eantones@users.noreply.github.com>, 2017
-# Eduardo Magdalena <emagdalena@close2circle.com>, 2017
+# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017
+# Daniel Santibáñez Polanco <dansanti@gmail.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: Eduardo Magdalena <emagdalena@close2circle.com>, 2017\n"
+"Last-Translator: Daniel Santibáñez Polanco <dansanti@gmail.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"
@@ -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\">Ir a "
+"Pagar</span><span class=\"visible-xs-inline\">Pagar</span>"
 
 #. 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>Quitar <span class=\"hidden-xs\"> de la Cesta</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\">1 </span><span class=\"js_items hidden\">5 </span>"
 
 #. 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>Añadir<span class=\"hidden-xs\"> a la Cesta</span></strong>"
 
 #. module: website_sale_options
 #: model:ir.ui.view,arch_db:website_sale_options.modal
author	Christophe Simonis <chs@odoo.com>	2018-02-05 17:21:35 +0100
committer	Christophe Simonis <chs@odoo.com>	2018-02-05 17:21:35 +0100
commit	bba0bc6dedb96c3af8e543be8496967e3f3e68c8 (patch)
tree	1e1df595475847c0c195452d606b5cfe95caf51d /addons
parent	86c0045befc35804bade151799b9738d5e004d31 (diff)
parent	eefca5d492d6f35dd4b063a294b6b8a0a576e83e (diff)