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 , 2017 -# Martin Trigaux , 2017 +# Wolfgang Taferner, 2017 +# Martin Trigaux, 2017 # Thorsten Vocks , 2017 # Rudolf Schnapka , 2017 # Ralf Hilgenstock , 2017 @@ -16,7 +16,7 @@ # Anja Funk , 2017 # darenkster , 2017 # Mathias Neef , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Bülent Tiknas , 2017 # Felix Schubert , 2017 # Kontor Consulting , 2017 @@ -24,19 +24,19 @@ # key six , 2017 # Malte Jansen , 2017 # Andreas Stauder , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Winfried Grieb , 2017 # Christian Körner , 2017 # aNj , 2017 # Henry Mineehen , 2017 -# Falk Scholze , 2017 +# Falk Scholze, 2017 # Maik Steinfeld , 2017 # Krakataua Katarajtu , 2017 # Markus Mattes , 2017 # Sören Prilop , 2017 -# Andi , 2017 +# Andi, 2017 # Christopher Westburry , 2017 -# Dejan Dinic , 2017 +# Dejan Dinic, 2017 # Stefan Hartenfels , 2017 # Gab_Odoo , 2017 # Constantin Ehrenstein , 2017 @@ -45,13 +45,14 @@ # Mark Lorenz , 2017 # Pascal Künzli , 2017 # Christoph Giesel , 2018 +# e2f , 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 , 2018\n" +"Last-Translator: e2f , 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 "" "\n" "" msgstr "" +"
\"${company.name}\"


" #. module: account #: model:mail.template,body_html:account.email_template_edi_invoice @@ -348,6 +378,12 @@ msgid "" "

\n" "" msgstr "" +"





" #. 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 , 2017 # Fabri Yohann , 2017 # Jérôme Tanché , 2017 +# e2f , 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é , 2017\n" +"Last-Translator: e2f , 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 "" "\n" "" msgstr "" +"
\"${company.name}\"


" #. 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 , 2016 # Cas Vissers , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Eric Geens , 2016 # Олег , 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 , 2017 # Jonathon Li , 2017 # jack adam , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

\n" "" msgstr "" +"


" #. module: account #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice @@ -289,6 +292,35 @@ msgid "" "\n" "" msgstr "" +"
\"${company.name}\"


" #. module: account #: model:mail.template,body_html:account.email_template_edi_invoice @@ -338,6 +370,12 @@ msgid "" "

\n" "" msgstr "" +"





" #. 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 , 2017 +# Martin Trigaux, 2017 # Tina Rittmüller , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Ermin Trevisan , 2017 # darenkster , 2017 # Henry Mineehen , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Fabian Liesch , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " From" -msgstr "" +msgstr "" #. module: account_analytic_default #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_kanban msgid "Customer" -msgstr "" +msgstr "" #. 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 , 2016 # Eric Geens , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Cas Vissers , 2017 # Melroy van den Berg , 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 , 2017 # 苏州远鼎 , 2017 +# Connie Xiao , 2017 +# e2f , 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: 苏州远鼎 , 2017\n" +"Last-Translator: e2f , 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 "点击 发送发票." msgid "" "Click to validate your invoice. A reference will be assigned to this " "invoice and you will not be able to modify it anymore." -msgstr "" +msgstr "" 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 , 2017 # Cas Vissers , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Eric Geens , 2017 # Erwin van der Ploeg , 2017 msgid "" @@ -91,7 +91,7 @@ msgstr "Transacties" #: 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 , 2017 # Mateus Lopes , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # danimaribeiro , 2017 # mariana rodrigues , 2018 +# Raphael Rodrigues , 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 , 2018\n" +"Last-Translator: Raphael Rodrigues , 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.
" msgstr "" +"Ocorreu um erro no processamento do seu pagamento: problema de " +"transação.
" #. 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 , 2017 # Gary Wei , 2017 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 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 , 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Olivier Lenoir , 2016 # Maxime Chambreuil , 2016 # Henri Cornuau , 2016 @@ -13,13 +13,14 @@ # Melanie Bernard , 2016 # Richard Mathot , 2017 # Clo , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Field" -msgstr "" +msgstr "" #. module: anonymization #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_nonymization_kanban msgid "Model" -msgstr "" +msgstr "" #. 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 , 2016 +# Martin Trigaux, 2016 # Leonardo Chianea , 2016 # Ivan Nieto , 2016 # oihane , 2016 # Mateo Tibaquirá Palacios , 2016 # Ana Juaristi , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Carles Antoli , 2016 # José Vicente , 2017 # Lina Maria Avendaño Carvajal , 2017 +# JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2017\n" +"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2017 +# Martin Trigaux, 2017 # Rudolf Schnapka , 2017 # Tina Rittmüller , 2017 # Magdalena Zimprich , 2017 # darenkster , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Henry Mineehen , 2017 # Ralf Hilgenstock , 2017 # Thorsten Vocks , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Anja Funk , 2017 -# Andi , 2017 +# Andi, 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

\n" "" msgstr "" +"

" #. module: auth_signup #: model:mail.template,body_html:auth_signup.set_password_email @@ -93,6 +115,27 @@ msgid "" "

\n" "" msgstr "" +"

" #. module: auth_signup #: model:mail.template,subject:auth_signup.set_password_email @@ -136,6 +179,27 @@ msgid "" "

\n" "" msgstr "" +"
\"${user.company_id.name}\"


" #. 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 , 2016 -# Antonio Trueba , 2016 +# Martin Trigaux, 2016 +# Antonio Trueba, 2016 # Pedro M. Baeza , 2016 # Sandra Figueroa , 2016 # Alejandro Santana , 2016 @@ -14,13 +14,14 @@ # Luis M. Ontalba , 2017 # Christopher Ormaza , 2017 # Ana Juaristi , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

\n" "" msgstr "" +"
\"${user.company_id.name}\"


" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Quentin THEURET , 2016 # Olivier Dony , 2016 # Clo , 2016 @@ -13,16 +13,17 @@ # Miguel Vidali , 2016 # Adriana Ierfino , 2016 # Eloïse Stilmant , 2017 -# Florian Hatat , 2017 +# Florian Hatat, 2017 # Olivier Lenoir , 2017 # fr rev , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

\n" "" msgstr "" +"

" #. module: auth_signup #: model:mail.template,subject:auth_signup.set_password_email @@ -163,6 +185,27 @@ msgid "" "

\n" "" msgstr "" +"
\"${user.company_id.name}\"


" #. 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 , 2017 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018 +# e2f , 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 , 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 "" "

\n" "" msgstr "" +"

" #. module: auth_signup #: model:mail.template,body_html:auth_signup.set_password_email @@ -86,6 +108,27 @@ msgid "" "

\n" "" msgstr "" +"

" #. module: auth_signup #: model:mail.template,subject:auth_signup.set_password_email @@ -129,6 +172,27 @@ msgid "" "

\n" "" msgstr "" +"
\"${user.company_id.name}\"


" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Erwin van der Ploeg , 2016 # Cas Vissers , 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 , 2017 # darenkster , 2017 -# Wolfgang Taferner , 2017 -# Martin Trigaux , 2017 -# Anja Funk , 2017 -# Niki Waibel , 2017 +# Wolfgang Taferner, 2017 +# Martin Trigaux, 2017 +# Niki Waibel, 2017 # Ralf Hilgenstock , 2017 -# Renzo Meister , 2017 # Ermin Trevisan , 2017 -# JackTheHunter , 2017 # DE R1 , 2017 +# Anja Funk , 2017 +# Renzo Meister, 2017 +# JackTheHunter , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Save this page and come back here to set up the feature." -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Cristóbal Martí Oliver , 2016 # Sergio Flores , 2016 # Diego de la Torre , 2016 -# Antonio Trueba , 2017 +# Antonio Trueba, 2017 # RGB Consulting , 2017 # Luis M. Triana , 2017 # Ruben Dario Machado , 2017 # Pierre-Antoine Magnet , 2017 -# Gustavo Valverde , 2017 +# Gustavo Valverde, 2017 # Luis M. Ontalba , 2017 # Juan José Scarafía , 2017 +# JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2017\n" +"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Olivier Lenoir , 2016 # Richard Mathot , 2016 # Alexandre Laidin , 2016 @@ -20,7 +20,7 @@ # Maxime Chambreuil , 2016 # Miguel Vidali , 2016 # Nicolas JEUDY , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Shark McGnark , 2016 # Nancy Bolognesi , 2016 # Xavier Symons , 2016 @@ -30,13 +30,14 @@ # Natys , 2016 # Jérémy Donas , 2016 # Arthur Latour , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" " \n" "" msgstr "" +"
\"${user.company_id.name}\"


  • " #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation @@ -216,6 +284,73 @@ msgid "" " \n" "" msgstr "" +"
    \"${user.company_id.name}\"


  • " #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_reminder @@ -303,6 +438,73 @@ msgid "" " \n" "" msgstr "" +"
    \"${user.company_id.name}\"


  • " #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Cas Vissers , 2017 # e2f_nl_c4 , 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 , 2017 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 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 , 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 "" " \n" "" msgstr "" +"
    \"${user.company_id.name}\"


  • " #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation @@ -197,6 +265,73 @@ msgid "" " \n" "" msgstr "" +"
    \"${user.company_id.name}\"


  • " #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_reminder @@ -284,6 +419,73 @@ msgid "" " \n" "" msgstr "" +"
    \"${user.company_id.name}\"


  • " #. 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 @@ - + 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 , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Magdalena Zimprich , 2017 -# Wolfgang Taferner , 2017 -# Tom , 2017 +# Wolfgang Taferner, 2017 +# Tom, 2017 # Anja Funk , 2017 # darenkster , 2017 # Ermin Trevisan , 2017 # Patrick Belser , 2017 -# Dejan Dinic , 2017 -# Renzo Meister , 2017 +# Dejan Dinic, 2017 +# Renzo Meister, 2017 # Tina Rittmüller , 2017 # JackTheHunter , 2017 -# Nicolas Frei , 2017 +# Nicolas Frei, 2017 # Marvin Elia Hoppe , 2017 # key six , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Rudolf Schnapka , 2017 # Martin K , 2017 # Philipp Hug , 2017 # Henry Mineehen , 2017 -# Andi , 2017 +# Andi, 2017 # Christian Körner , 2017 # aNj , 2017 # Katharina Moritz , 2017 @@ -32,13 +32,14 @@ # AppleMentalist , 2017 # Constantin Ehrenstein , 2017 # DE T1 , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

    Here is the description about the opportunity :

    ${object.description}\n" "%endif\n" "

    Thank you!

    \n" -msgstr "" +msgstr "

    " #. module: crm #: model:ir.model.fields,field_description:crm.field_crm_lead_meeting_count @@ -174,7 +175,7 @@ msgstr "# der Aktivitäten" msgid "" "Drag & drop opportunities between columns as you progress in your" " sales cycle." -msgstr "" +msgstr "" #. 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 Pipeline can be found here, under " "CRM app." -msgstr "" +msgstr "" #. module: crm #: model:ir.model,name:crm.model_crm_lost_reason @@ -2613,7 +2637,7 @@ msgstr "Dieser Monat" #, python-format msgid "" "This opportunity has no activity planned. Click to check them." -msgstr "" +msgstr "" #. 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 go back to your sales pipeline." -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Adriana Ierfino , 2016 # Clo , 2016 # Christophe Dubuit , 2016 @@ -28,11 +28,11 @@ # Shark McGnark , 2016 # Saad Thaifa , 2016 # Agathe Mollé , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Magali , 2016 # lucasdeliege , 2016 # Olivier Dony , 2016 -# ShevAbam , 2016 +# ShevAbam, 2016 # Nancy Bolognesi , 2016 # Jérémy Donas , 2016 # Jeanjean Noname , 2016 @@ -47,13 +47,14 @@ # fr rev , 2017 # Félix Desjardins , 2017 # fr rev , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 Pipeline can be found here, under " "CRM app." -msgstr "" +msgstr "" #. 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 go back to your sales pipeline." -msgstr "" +msgstr "" #. 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 , 2016 # Stephan Van Dyck , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Cas Vissers , 2016 # Melroy van den Berg , 2017 @@ -121,6 +121,98 @@ msgid "" " \n" " " msgstr "" +"\n" +"\n" +"

    \n" +" % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
    \n" +" \n" +" \n" +" Auto Login\n" +"
    \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
    \n" +"

    Hoera!


    \n" +"

    \n" +" Uw Odoo CRM applicatie is klaar.


    \n" +"

    \n" +" Wat nu?

    \n" +"
    \n" +"
      \n" +"
    • \n" +"

      \n" +" Automatisch uw leads aan verkopers toewijzen met lead scoring,\n" +"

      \n" +"
      • \n" +"
    • \n" +"

      \n" +" Blijf in contact met uw potentiële klant met efficiënte e-mail campagnes,\n" +"

      \n" +"
      • \n" +"
    • \n" +"

      \n" +" Krijg waardevolle inzichten van enquêtes,\n" +"

      \n" +"
      • \n" +"
    • \n" +"

      \n" +" Krijg slimme rapportering en accurate dashboards,\n" +"

      \n" +"
      • \n" +"
    • \n" +"

      \n" +" En nog veel meer...\n" +"

      \n" +"
      • \n" +"
    \n" +"
    \n" +"

    \n" +" Hulp nodig?\n" +" U bent niet alleen\n" +"

    \n" +"

    \n" +" We zouden het geweldig vinden om je te ondersteunen. Contacteer ons via ons\n" +" support formulier indien u vragen heeft.\n" +" U kan ook ontdekken hoe u het beste uit de Odoo CRM haalt met onze \n" +" \n" +" Gebruikers documentatie\n" +" of met onze\n" +" \n" +" API documentatie\n" +"

    \n" +"
    \n" +"

    Geniet van uw Odoo Experience,

    \n" +"
    \n" +"
    \n" +"
    --
    Het Odoo team
    PS: Mensen houden van Odoo, controleer     wat ze erover zeggen.\n" +"
    \n" +"
    " #. 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 @@ # 卓忆科技 , 2017 # 老窦 北京 <2662059195@qq.com>, 2017 # Jeff Yu - Elico Corp , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 Pipeline can be found here, under " "CRM app." -msgstr "" +msgstr "" #. module: crm #: model:ir.model,name:crm.model_crm_lost_reason @@ -2518,7 +2519,7 @@ msgstr "本月" #, python-format msgid "" "This opportunity has no activity planned. Click to check them." -msgstr "" +msgstr "" #. module: crm #: model:ir.model.fields,help:crm.field_crm_stage_probability 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 , 2017 # Ermin Trevisan , 2017 # darenkster , 2017 -# Niki Waibel , 2017 -# Martin Trigaux , 2017 +# Niki Waibel, 2017 +# Martin Trigaux, 2017 +# e2f , 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 , 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 "" "Convert To\n" " Task" -msgstr "" +msgstr "" #. 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 , 2017 +# Bertrand LATOUR , 2017 # Xavier Belmere , 2017 -# Florian Hatat , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Convert To\n" " Task" -msgstr "" +msgstr "" #. 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 , 2017 # 老窦 北京 <2662059195@qq.com>, 2017 # Martin Trigaux, 2017 +# e2f , 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 , 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 "" "Convert To\n" " Task" -msgstr "" +msgstr "" #. 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 , 2016 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 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 , 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 "" "

    Thank you,

    \n" " " msgstr "" +"

    " #. module: delivery #: model:mail.template,body_html:delivery.mail_template_data_delivery_notification @@ -117,6 +121,33 @@ msgid "" " \n" " " msgstr "" +"
    \"${user.company_id.name}\"/


    " #. 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
    Cost: " "%.2f %s" -msgstr "" +msgstr "
    " #. 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 , 2017 -# Martin Trigaux , 2017 +# Renzo Meister, 2017 +# Martin Trigaux, 2017 # darenkster , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # Tina Rittmüller , 2017 # JackTheHunter , 2017 # Ermin Trevisan , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Rudolf Schnapka , 2017 # Thorsten Vocks , 2017 # Thomas Neu , 2017 @@ -20,13 +20,14 @@ # Thomas Lengyel , 2017 # AppleMentalist , 2017 # Anja Funk , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "\n" " " msgstr "" +"
    \"${object.company_id.name}\"


      • " #. module: event #: model:mail.template,body_html:event.event_reminder @@ -365,6 +432,71 @@ msgid "" "\n" " " msgstr "" +"
      \"${object.company_id.name}\"


      • " #. module: event #: model:mail.template,body_html:event.event_registration_mail_template_badge @@ -375,7 +507,7 @@ msgid "" "

      Here is your badge for the event ${object.event_id.name}.

      \n" "

      If you have any questions, please let us know.

      \n" "

      Best regards,

      " -msgstr "" +msgstr "

      " #. module: event #: model:mail.template,subject:event.event_reminder @@ -404,6 +536,8 @@ msgid "" " to \n" " " msgstr "" +"" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Clo , 2016 # Adriana Ierfino , 2016 # Richard Mathot , 2016 @@ -20,15 +20,16 @@ # Nancy Bolognesi , 2016 # Sébastien Le Ray , 2017 # mathieu betton , 2017 -# Florian Hatat , 2017 +# Florian Hatat, 2017 # Eloïse Stilmant , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "\n" " " msgstr "" +"

      \"${object.company_id.name}\"


      • " #. module: event #: model:mail.template,body_html:event.event_registration_mail_template_badge @@ -576,6 +642,8 @@ msgid "" " to \n" "       " msgstr "" +"" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Erwin van der Ploeg , 2016 # Cas Vissers , 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 , 2017 # SHOM , 2017 # liAnGjiA , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "\n" " " msgstr "" +"
      \"${object.company_id.name}\"


        • " #. module: event #: model:mail.template,body_html:event.event_reminder @@ -355,6 +422,71 @@ msgid "" "\n" " " msgstr "" +"
        \"${object.company_id.name}\"


        • " #. module: event #: model:mail.template,body_html:event.event_registration_mail_template_badge @@ -365,7 +497,7 @@ msgid "" "

        Here is your badge for the event ${object.event_id.name}.

        \n" "

        If you have any questions, please let us know.

        \n" "

        Best regards,

        " -msgstr "" +msgstr "

        " #. module: event #: model:mail.template,subject:event.event_reminder @@ -394,6 +526,8 @@ msgid "" " to \n" " " msgstr "" +"" #. 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 , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Cas Vissers , 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 , 2017 -# Martin Trigaux , 2017 +# Wolfgang Taferner, 2017 +# Martin Trigaux, 2017 # Ermin Trevisan , 2017 # Tina Rittmüller , 2017 # darenkster , 2017 # Ralf Hilgenstock , 2017 -# Dejan Dinic , 2017 -# Renzo Meister , 2017 +# Dejan Dinic, 2017 +# Renzo Meister, 2017 # Fabian Liesch , 2017 # Thorsten Vocks , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Philipp Hug , 2017 # Christian Körner , 2017 # Henry Mineehen , 2017 # AppleMentalist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "
        %(rank)d. %(user_name)s - %(reward_name)s" -msgstr "" +msgstr "
        " #. 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 , 2016 +# Martin Trigaux, 2016 # Jesús Alan Ramos Rodríguez , 2016 # Sergio Flores , 2016 # oihane , 2016 # José Vicente , 2016 # Pedro M. Baeza , 2016 # Mateo Tibaquirá Palacios , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Ana Juaristi , 2016 # Carles Antoli , 2016 # Inigo Zuluaga , 2016 @@ -20,13 +20,14 @@ # Gelo Joga Landoo , 2017 # Lina Maria Avendaño Carvajal , 2017 # Nicole Kist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" +"

        \"${goal['name']}\"/




        " #. module: gamification #: model:mail.template,body_html:gamification.email_template_goal_reminder @@ -337,6 +340,14 @@ msgid "" "\n" "" msgstr "" +"

        " #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Olivier Lenoir , 2016 # Lucas Deliege , 2016 # Lionel Sausin , 2016 @@ -13,21 +13,22 @@ # Shark McGnark , 2016 # Fabien Pinckaers , 2016 # Clo , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Adriana Ierfino , 2016 # Xavier Symons , 2016 -# ShevAbam , 2016 +# ShevAbam, 2016 # Jérôme Tanché , 2016 # Saad Thaifa , 2016 # Melanie Bernard , 2016 # Sébastien Le Ray , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" +"

        \"${goal['name']}\"/




        " #. module: gamification #: model:mail.template,body_html:gamification.email_template_goal_reminder @@ -343,12 +346,20 @@ msgid "" "\n" "" msgstr "" +"

        " #. module: gamification #: code:addons/gamification/models/challenge.py:655 #, python-format msgid "
        %(rank)d. %(user_name)s - %(reward_name)s" -msgstr "" +msgstr "
        " #. module: gamification #: code:addons/gamification/models/challenge.py:652 @@ -383,7 +394,7 @@ msgstr "" msgid "" "Related\n" " Goals" -msgstr "" +msgstr "" #. 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 , 2016 # 卓忆科技 , 2016 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 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 , 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 "" +"

        \"${goal['name']}\"/




        " #. module: gamification #: model:mail.template,body_html:gamification.email_template_goal_reminder @@ -271,7 +274,7 @@ msgid "" " \n" "

        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.

        \n" " " -msgstr "" +msgstr "

        " #. module: gamification #: code:addons/gamification/models/challenge.py:589 @@ -321,12 +324,20 @@ msgid "" "\n" "" msgstr "" +"

        " #. module: gamification #: code:addons/gamification/models/challenge.py:655 #, python-format msgid "
        %(rank)d. %(user_name)s - %(reward_name)s" -msgstr "" +msgstr "
        " #. 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 , 2017 -# Martin Trigaux , 2017 +# Niki Waibel, 2017 +# Martin Trigaux, 2017 # darenkster , 2017 # Tina Rittmüller , 2017 # Thorsten Vocks , 2017 @@ -13,13 +13,14 @@ # Henry Mineehen , 2017 # Anja Funk , 2017 # AppleMentalist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Active" -msgstr "" +msgstr "" #. module: google_drive #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban @@ -57,7 +58,7 @@ msgstr "Model" #. module: google_drive #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban msgid "Template" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Melanie Bernard , 2016 # Olivier Lenoir , 2016 # Maxime Chambreuil , 2016 @@ -15,13 +15,14 @@ # Daniel & Delphine , 2016 # Richard Mathot , 2017 # Eloïse Stilmant , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Active" -msgstr "" +msgstr "" #. module: google_drive #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban msgid "Model" -msgstr "" +msgstr "" #. module: google_drive #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban msgid "Template" -msgstr "" +msgstr "" #. 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 , 2016 # 老窦 北京 <2662059195@qq.com>, 2017 # Jeff Yu - Elico Corp , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "模型" #. module: google_drive #: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_kanban msgid "Template" -msgstr "" +msgstr "" #. 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 @@ - -
        + +
        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 , 2017 -# Niki Waibel , 2017 -# Martin Trigaux , 2017 -# Renzo Meister , 2017 +# Niki Waibel, 2017 +# Martin Trigaux, 2017 +# Renzo Meister, 2017 # Thorsten Vocks , 2017 # darenkster , 2017 # Anja Funk , 2017 @@ -15,16 +15,17 @@ # Henry Mineehen , 2017 # Thomas Neu , 2017 # Ermin Trevisan , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # JackTheHunter , 2017 # Jan Brodersen <4rmitxes@gmail.com>, 2017 +# e2f , 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 , 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 "Attendance" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Cas Vissers , 2017 # Erwin van der Ploeg , 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 , 2017 # Rudolf Schnapka , 2017 -# Renzo Meister , 2017 -# Martin Trigaux , 2017 +# Renzo Meister, 2017 +# Martin Trigaux, 2017 # JackTheHunter , 2017 # Tina Rittmüller , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # darenkster , 2017 # Henry Mineehen , 2017 # Ralf Hilgenstock , 2017 # Markus Menner , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # DE T2 , 2017 # Christian Körner , 2017 # DE R1 , 2017 # Ermin Trevisan , 2017 +# Jan Brodersen <4rmitxes@gmail.com>, 2018 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "(If fixed-term contract)" -msgstr "" +msgstr "" #. module: hr_contract #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form msgid "/ month" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Xavier Symons , 2016 # Adriana Ierfino , 2016 # Miguel Vidali , 2016 @@ -17,13 +17,14 @@ # fr rev , 2017 # Clo , 2017 # Fabien Pinckaers , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "(If fixed-term contract)" -msgstr "" +msgstr "" #. module: hr_contract #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form msgid "/ month" -msgstr "" +msgstr "" #. 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 , 2017 # Laurent Meuwly , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Tina Rittmüller , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # Fabian Liesch , 2017 # Thorsten Vocks , 2017 # Ermin Trevisan , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Philipp Hug , 2017 # darenkster , 2017 # Ralf Hilgenstock , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Henry Mineehen , 2017 # Christian Körner , 2017 # Rudolf Schnapka , 2017 -# Andi , 2017 +# Andi, 2017 # Stefan Hartenfels , 2017 # Anja Funk , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Use [Reference] as a subject prefix for" " incoming receipts" -msgstr "" +msgstr "" #. module: hr_expense #. openerp-web @@ -50,14 +51,14 @@ msgstr "" msgid "" "

        Approve the sheet here.

        Tip: if you refuse, don’t forget to give " "the reason thanks to the hereunder message tool

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:21 #, python-format msgid "

        Click here to create your first expense and add it under here.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web @@ -66,21 +67,21 @@ msgstr "" msgid "" "

        Click on Action Submit To Manager to submit selected expenses to" " your manager

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:31 #, python-format msgid "

        Once your Expense is ready, you can save it.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:39 #, python-format msgid "

        Select expenses to submit them to your manager

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web @@ -89,7 +90,7 @@ msgstr "" msgid "" "

        The accountant receive approved expense reports.

        He can post " "journal entries in one click if taxes and accounts are right.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet @@ -127,7 +128,7 @@ msgstr "Bestätigt von:" msgid "" "A payment of %s %s with the reference %s related" " to your expense %s has been made." -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Maxime Chambreuil , 2016 # Fabien Pinckaers , 2016 # Melanie Bernard , 2016 @@ -18,9 +18,9 @@ # lucasdeliege , 2016 # Miguel Vidali , 2016 # Leo Schmitt , 2016 -# ShevAbam , 2016 +# ShevAbam, 2016 # Henri Cornuau , 2017 -# yterrettaz , 2017 +# yterrettaz, 2017 # Alexandre Fayolle , 2017 # Thib vdh , 2017 # Sébastien Le Ray , 2017 @@ -28,13 +28,14 @@ # Eloïse Stilmant , 2017 # fr rev , 2017 # Rémi CAZENAVE , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

        Approve the sheet here.

        Tip: if you refuse, don’t forget to give " "the reason thanks to the hereunder message tool

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:21 #, python-format msgid "

        Click here to create your first expense and add it under here.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web @@ -74,21 +75,21 @@ msgstr "" msgid "" "

        Click on Action Submit To Manager to submit selected expenses to" " your manager

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:31 #, python-format msgid "

        Once your Expense is ready, you can save it.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:39 #, python-format msgid "

        Select expenses to submit them to your manager

        " -msgstr "" +msgstr "

        " #. 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 , 2016 # Stephan Van Dyck , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Erwin van der Ploeg , 2016 # Cas Vissers , 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 , 2016 +# Jeffery CHEN Fan , 2016 # 苏州远鼎 , 2016 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Martin Lin , 2017 # Talway <9010446@qq.com>, 2017 # 老窦 北京 <2662059195@qq.com>, 2017 -# fausthuang , 2017 +# fausthuang, 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Use [Reference] as a subject prefix for" " incoming receipts" -msgstr "" +msgstr "" #. module: hr_expense #. openerp-web @@ -38,14 +39,14 @@ msgstr "" msgid "" "

        Approve the sheet here.

        Tip: if you refuse, don’t forget to give " "the reason thanks to the hereunder message tool

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:21 #, python-format msgid "

        Click here to create your first expense and add it under here.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web @@ -54,21 +55,21 @@ msgstr "" msgid "" "

        Click on Action Submit To Manager to submit selected expenses to" " your manager

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:31 #, python-format msgid "

        Once your Expense is ready, you can save it.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:39 #, python-format msgid "

        Select expenses to submit them to your manager

        " -msgstr "" +msgstr "

        " #. module: hr_expense #. openerp-web @@ -77,7 +78,7 @@ msgstr "" msgid "" "

        The accountant receive approved expense reports.

        He can post " "journal entries in one click if taxes and accounts are right.

        " -msgstr "" +msgstr "

        " #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet @@ -97,7 +98,7 @@ msgstr "员工：" #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet msgid "Payment By:" -msgstr "" +msgstr "" #. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet @@ -115,7 +116,7 @@ msgstr "验证于:" msgid "" "A payment of %s %s with the reference %s related" " to your expense %s has been made." -msgstr "" +msgstr "" #. 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 , 2017 +# Martin Trigaux, 2017 # Thorsten Vocks , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # darenkster , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Rudolf Schnapka , 2017 # Tina Rittmüller , 2017 # Fabian Liesch , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Ermin Trevisan , 2017 # Krakataua Katarajtu , 2017 # Henry Mineehen , 2017 # JackTheHunter , 2017 # Philipp Hug , 2017 # Ralf Hilgenstock , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "<th class=\"text-center\" colspan=" #. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban msgid "from" -msgstr "" +msgstr "" #. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban msgid "to" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Miguel Vidali , 2016 # Xavier Symons , 2016 # Maxime Chambreuil , 2016 @@ -23,13 +23,14 @@ # Alexandre Fayolle , 2017 # Eloïse Stilmant , 2017 # Olivier Dony , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "<th class=\"text-center\" colspan=" #. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban msgid "from" -msgstr "" +msgstr "" #. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_kanban msgid "to" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Erwin van der Ploeg , 2016 # Cas Vissers , 2016 @@ -113,7 +113,7 @@ msgstr "Afdelingen en personeel" #: 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 , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 # Thorsten Vocks , 2017 # Rudolf Schnapka , 2017 # Ermin Trevisan , 2017 # Tina Rittmüller , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Henry Mineehen , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # JackTheHunter , 2017 # Andreas Stauder , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Ralf Hilgenstock , 2017 # Anja Funk , 2017 # Thomas Neu , 2017 @@ -22,16 +22,18 @@ # AppleMentalist , 2017 # Katharina Moritz , 2017 # Malte Jansen , 2017 -# Andi , 2017 +# Andi, 2017 # Philipp Hug , 2017 # DE R1 , 2017 +# e2f , 2018 +# DE T1 , 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 , 2017\n" +"Last-Translator: DE T1 , 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 "" "

        \n" " " msgstr "" +"\n" " " msgstr "" +"

        \"Congratulations!\"

        \"Avatar\"


        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations @@ -399,6 +466,47 @@ msgid "" "
        \n" " " msgstr "" +"

        \"Avatar\"

        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee @@ -412,7 +520,7 @@ msgid "" "%endif\n" ".

        \n" "

        Please welcome him/her and help him/her finding his/her marks.

        " -msgstr "" +msgstr "

        " #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant @@ -437,12 +545,12 @@ msgstr "Meetings" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey msgid "Trackers" -msgstr "" +msgstr "" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban msgid "Folded in Recruitment Pipe: " -msgstr "" +msgstr "" #. 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 interview stages.
        e.g. New > " "Qualified > First Interview > Recruited" -msgstr "" +msgstr "
        " #. 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 applications pipeline for this job position." -msgstr "" +msgstr "" #. 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 go back to the dashboard." -msgstr "" +msgstr "" #. 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 start recruiting like a pro? Start here." -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Olivier Lenoir , 2016 # Adriana Ierfino , 2016 # Melanie Bernard , 2016 @@ -12,7 +12,7 @@ # Maxime Chambreuil , 2016 # Miguel Vidali , 2016 # Benedicte HANET , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Xavier Symons , 2016 # Fabien Pinckaers , 2016 # Richard Mathot , 2016 @@ -29,13 +29,14 @@ # fr rev , 2017 # Jeanjean Noname , 2017 # nthnnl , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" " \n" " " msgstr "" +"

        \n" " " msgstr "" +"

        \"Congratulations!\"

        \"Avatar\"


        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations @@ -403,6 +469,47 @@ msgid "" " \n" " " msgstr "" +"

        \"Avatar\"

        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee @@ -416,7 +523,7 @@ msgid "" "%endif\n" ".

        \n" "

        Please welcome him/her and help him/her finding his/her marks.

        " -msgstr "" +msgstr "

        " #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant @@ -446,7 +553,7 @@ msgstr "Trackers" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban msgid "Folded in Recruitment Pipe: " -msgstr "" +msgstr "" #. 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 applications pipeline for this job position." -msgstr "" +msgstr "" #. 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 @@ # 卓忆科技 , 2017 # 老窦 北京 <2662059195@qq.com>, 2017 # fausthuang, 2017 +# e2f , 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 , 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 "" " \n" " " msgstr "" +"

        \n" " " msgstr "" +"

        \"Congratulations!\"

        \"Avatar\"


        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations @@ -386,6 +452,47 @@ msgid "" " \n" " " msgstr "" +"

        \"Avatar\"

        • " #. module: hr_recruitment #: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee @@ -399,7 +506,7 @@ msgid "" "%endif\n" ".

        \n" "

        Please welcome him/her and help him/her finding his/her marks.

        " -msgstr "" +msgstr "

        " #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant @@ -429,7 +536,7 @@ msgstr "跟踪器" #. module: hr_recruitment #: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban msgid "Folded in Recruitment Pipe: " -msgstr "" +msgstr "" #. 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 interview stages.
        e.g. New > " "Qualified > First Interview > Recruited" -msgstr "" +msgstr "
        " #. 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 applications pipeline for this job position." -msgstr "" +msgstr "" #. 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 go back to the dashboard." -msgstr "" +msgstr "" #. 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 start recruiting like a pro? Start here." -msgstr "" +msgstr "" #. 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 , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 +# Thorsten Vocks , 2017 # Thomas Neu , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Print\n" " Interview" -msgstr "" +msgstr "" #. module: hr_recruitment_survey #: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit msgid "" "Start\n" " Interview" -msgstr "" +msgstr "" #. 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 , 2017 -# Adriana Ierfino , 2017 -# Florian Hatat , 2017 -# Olivier Lenoir , 2017 -# Melanie Bernard , 2017 -# Martin Trigaux , 2017 -# Miguel Vidali , 2017 +# Maxime Chambreuil , 2016 +# Adriana Ierfino , 2016 +# Florian Hatat, 2016 +# Olivier Lenoir , 2016 +# Melanie Bernard , 2016 +# Martin Trigaux, 2016 +# Miguel Vidali , 2016 +# Fabien Pinckaers , 2016 +# Nancy Bolognesi , 2016 +# Xavier Symons , 2016 # Richard Mathot , 2017 # Eloïse Stilmant , 2017 -# Fabien Pinckaers , 2017 -# Nancy Bolognesi , 2017 -# Xavier Symons , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "Print\n" " Interview" -msgstr "" +msgstr "" #. 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 , 2016 +# fausthuang, 2016 # Talway <9010446@qq.com>, 2016 -# Jeffery CHEN , 2016 +# Jeffery CHEN Fan , 2016 # liAnGjiA , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # waveyeung , 2016 -# xiangye xiao , 2016 +# xiangye xiao, 2016 +# e2f , 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 , 2016\n" +"Last-Translator: e2f , 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 "" "Print\n" " Interview" -msgstr "" +msgstr "" #. module: hr_recruitment_survey #: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit msgid "" "Start\n" " Interview" -msgstr "" +msgstr "" #. 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 , 2017 -# Wolfgang Taferner , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 +# Renzo Meister, 2017 +# Wolfgang Taferner, 2017 # Ermin Trevisan , 2017 +# JackTheHunter , 2017 # Thorsten Vocks , 2017 # Anja Funk , 2017 -# Ralf Hilgenstock , 2017 # Fabian Liesch , 2017 -# Renzo Meister , 2017 -# JackTheHunter , 2017 +# Ralf Hilgenstock , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Timesheets" -msgstr "" +msgstr "" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet msgid "Timesheets" -msgstr "" +msgstr "" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet msgid "Timesheet Entries" -msgstr "" +msgstr "" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.view_kanban_account_analytic_line msgid "Duration: " -msgstr "" +msgstr "" #. 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 , 2017 -# Martin Trigaux , 2017 -# Fabien Pinckaers , 2017 +# Xavier Belmere , 2016 +# Martin Trigaux, 2016 +# Maxime Chambreuil , 2016 +# Melanie Bernard , 2016 +# Leo Schmitt , 2016 +# Frédéric LIETART , 2016 +# Olivier Lenoir , 2016 +# Fabien Pinckaers , 2016 +# Jérémy Donas , 2016 # Sébastien Le Ray , 2017 -# Jérémy Donas , 2017 -# Maxime Chambreuil , 2017 -# Miguel Vidali , 2017 +# yterrettaz, 2017 # Eloïse Stilmant , 2017 -# Olivier Lenoir , 2017 -# Melanie Bernard , 2017 -# Leo Schmitt , 2017 -# Xavier Belmere , 2017 -# Benedicte HANET , 2017 -# yterrettaz , 2017 -# Frédéric LIETART , 2017 +# Miguel Vidali , 2017 # David Halgand , 2017 +# Benedicte HANET , 2017 # Adriana Ierfino , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Feuilles de temps" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet msgid "Timesheets" -msgstr "" +msgstr "" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet @@ -52,7 +52,7 @@ msgstr "Entrées de la feuille de temps" #. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.view_kanban_account_analytic_line msgid "Duration: " -msgstr "" +msgstr "" #. 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 , 2017 -# n3niu , 2017 -# Wolfgang Taferner , 2017 +# Martin Trigaux, 2017 +# n3niu, 2017 +# Wolfgang Taferner, 2017 # Ermin Trevisan , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # Tina Rittmüller , 2017 # darenkster , 2017 # aNj , 2017 -# Niki Waibel , 2017 -# Andi , 2017 +# Niki Waibel, 2017 +# Andi, 2017 # Ralf Hilgenstock , 2017 # Anja Funk , 2017 # JackTheHunter , 2017 @@ -20,13 +20,14 @@ # Philipp Hug , 2017 # Henry Mineehen , 2017 # AppleMentalist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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.
        To identify the " "country, GeoIP must be installed on your server, otherwise, the countries of" " the rule will not be taken into account.        " -msgstr "" +msgstr "
        " #. 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 :shortcut. The shortcut is\n" " replaced directly in your message, so that you can still edit\n" " it before sending." -msgstr "" +msgstr "" #. 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 , 2016 +# Martin Trigaux, 2016 # José Vicente , 2016 # Leonardo Chianea , 2016 # Ana Juaristi , 2016 @@ -14,7 +14,7 @@ # Inigo Zuluaga , 2016 # Carlos rodriguez , 2016 # Mateo Tibaquirá Palacios , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Jose Manuel , 2016 # David Perez , 2016 # Ivan Nieto , 2016 @@ -26,13 +26,14 @@ # Luis M. Ontalba , 2017 # e2f_es_ t7 , 2017 # Paloma Yazmin Reyes Morales , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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.
        To identify the " "country, GeoIP must be installed on your server, otherwise, the countries of" " the rule will not be taken into account.        " -msgstr "" +msgstr "
        " #. 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 :shortcut. The shortcut is\n" " replaced directly in your message, so that you can still edit\n" " it before sending." -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Richard Mathot , 2016 # Shark McGnark , 2016 # Olivier Lenoir , 2016 @@ -23,13 +23,14 @@ # Sébastien Le Ray , 2017 # Eloïse Stilmant , 2017 # Frédéric LIETART , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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.
        To identify the " "country, GeoIP must be installed on your server, otherwise, the countries of" " the rule will not be taken into account.        " -msgstr "" +msgstr "
        " #. 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 :shortcut. The shortcut is\n" " replaced directly in your message, so that you can still edit\n" " it before sending." -msgstr "" +msgstr "" #. 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 , 2016 # ZIHAN LI , 2016 # Maie , 2017 -# fausthuang , 2017 +# fausthuang, 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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.
        To identify the " "country, GeoIP must be installed on your server, otherwise, the countries of" " the rule will not be taken into account.        " -msgstr "" +msgstr "
        " #. 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 :shortcut. The shortcut is\n" " replaced directly in your message, so that you can still edit\n" " it before sending." -msgstr "" +msgstr "" #. 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 , 2017 -# Martin Trigaux , 2017 # Ralf Hilgenstock , 2017 -# Walter Müller , 2017 -# Henry Mineehen , 2017 -# JackTheHunter , 2017 -# darenkster , 2017 -# Malte Jansen , 2017 # Thorsten Vocks , 2017 # Jasper Torlitz , 2017 -# Renzo Meister , 2017 +# Martin Trigaux, 2017 +# Renzo Meister, 2017 +# Wolfgang Taferner, 2017 +# darenkster , 2017 # Anja Funk , 2017 # Thomas Lengyel , 2017 # Ermin Trevisan , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # Rudolf Schnapka , 2017 # Tina Rittmüller , 2017 +# Walter Müller , 2017 +# Malte Jansen , 2017 +# Henry Mineehen , 2017 +# JackTheHunter , 2017 # Martin K , 2017 # AppleMentalist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 to announce that the order is received
        \n" " - Click on the red X to announce that the order isn't available" msgstr "" +"

        " #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier @@ -51,6 +55,9 @@ msgid "" " - Click on the to announce that the order is received
        \n" " - Click on the to announce that the order isn't available" msgstr "" +"

        " #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form @@ -348,7 +355,7 @@ msgid "" " - Recurency: Everyday
        \n" " - Time interval: from 00h00 am to 11h59 pm
        \n" " - Message: \"You must order before 10h30 am\"" -msgstr "" +msgstr "


        " #. 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.
        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 "
        " #. 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 , 2016 +# Martin Trigaux, 2016 # oihane , 2016 # Carles Antoli , 2016 # Alejandro Die Sanchis , 2016 @@ -11,7 +11,7 @@ # Luis M. Triana , 2016 # Pedro M. Baeza , 2016 # Inigo Zuluaga , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Ana Juaristi , 2016 # José Vicente , 2016 # Ivan Nieto , 2016 @@ -21,13 +21,14 @@ # Gelo Joga Landoo , 2017 # Luis M. Ontalba , 2017 # Christopher Ormaza , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 to announce that the order is received
        \n" " - Click on the red X to announce that the order isn't available" msgstr "" +"

        " #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier @@ -50,6 +54,9 @@ msgid "" " - Click on the to announce that the order is received
        \n" " - Click on the to announce that the order isn't available" msgstr "" +"

        " #. 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 , 2017 # 老窦 北京 <2662059195@qq.com>, 2018 +# e2f , 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 , 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 to announce that the order is received
        \n" " - Click on the red X to announce that the order isn't available" msgstr "" +"

        " #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier @@ -37,6 +41,9 @@ msgid "" " - Click on the to announce that the order is received
        \n" " - Click on the to announce that the order isn't available" msgstr "" +"

        " #. 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 , 2016 +# Martin Trigaux, 2016 # Rick Hunter , 2016 # oihane , 2016 # Ana Juaristi , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Galileo Sanchez , 2016 # José Vicente , 2016 # Pedro M. Baeza , 2016 @@ -37,13 +37,14 @@ # Fernando San Martín Woerner , 2017 # Christopher Ormaza , 2017 # Eduardo Magdalena , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " Feedback" -msgstr "" +msgstr "" #. 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 @@ # 卓忆科技 , 2017 # 老窦 北京 <2662059195@qq.com>, 2017 # ShiGang Chen , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

        \n" "" msgstr "" +"
        \"${company.name}\"


        " #. module: mail #: code:addons/mail/models/mail_channel.py:674 @@ -243,7 +246,7 @@ msgid "" " You can mention a channel by typing #channel.
        \n" " You can execute a command by typing /command.
        \n" " You can insert canned responses in your message by typing :shortcut.
        " -msgstr "" +msgstr "





        " #. module: mail #: code:addons/mail/models/mail_channel.py:584 @@ -298,7 +301,7 @@ msgid "" "

        Chat with coworkers in real-time using direct " "messages.

        You might need to invite users from the Settings app " "first.

        " -msgstr "" +msgstr "

        " #. module: mail #. openerp-web @@ -308,7 +311,7 @@ msgid "" "

        Write a message to the members of the channel here.

        You can" " notify someone with '@' or link another channel with '#'. " "Start your message with '/' to get the list of possible commands.

        " -msgstr "" +msgstr "

        " #. module: mail #. openerp-web @@ -318,7 +321,7 @@ msgid "" "

        Channels make it easy to organize information across different topics and" " groups.

        Try to create your first channel (e.g. sales, " "marketing, product XYZ, after work party, etc).

        " -msgstr "" +msgstr "

        " #. 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" "         " msgstr "" +"top notch usability that scales across all apps." -msgstr "" +msgstr "" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_two_cols 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 , 2017 -# Martin Trigaux , 2017 -# Tina Rittmüller , 2017 +# Martin Trigaux, 2017 +# Renzo Meister, 2017 +# Walter Müller , 2017 # darenkster , 2017 -# Renzo Meister , 2017 # Henry Mineehen , 2017 +# Tina Rittmüller , 2017 +# Ralf Hilgenstock , 2017 +# Wolfgang Taferner, 2017 +# Niki Waibel, 2017 +# Philipp Hug , 2017 # Ermin Trevisan , 2017 # Thorsten Vocks , 2017 -# Ralf Hilgenstock , 2017 -# Walter Müller , 2017 -# Niki Waibel , 2017 -# Philipp Hug , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " From: " -msgstr "" +msgstr "" #. module: membership #: model:ir.ui.view,arch_db:membership.membership_products_kanban msgid " To:" -msgstr "" +msgstr "" #. 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 , 2016 +# Martin Trigaux, 2016 # Leonardo Chianea , 2016 # Inigo Zuluaga , 2016 # Pedro M. Baeza , 2016 # Ana Juaristi , 2016 # oihane , 2016 # Carles Antoli , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Luis M. Triana , 2016 # José Vicente , 2016 # Alejandro Die Sanchis , 2016 @@ -19,13 +19,14 @@ # Gelo Joga Landoo , 2017 # Alejandro Santana , 2017 # Luis M. Ontalba , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " From: " -msgstr "" +msgstr "" #. module: membership #: model:ir.ui.view,arch_db:membership.membership_products_kanban msgid " To:" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Richard Mathot , 2016 # Adriana Ierfino , 2016 # Maxime Chambreuil , 2016 @@ -14,16 +14,17 @@ # Nancy Bolognesi , 2016 # Clo , 2016 # Lucas Deliege , 2016 -# Friderici Claude , 2016 +# Friderici Claude, 2016 # Melanie Bernard , 2016 # Quentin THEURET , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " From: " -msgstr "" +msgstr "" #. module: membership #: model:ir.ui.view,arch_db:membership.membership_products_kanban msgid " To:" -msgstr "" +msgstr "" #. 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 , 2016 +# Martin Trigaux, 2016 # Ana Juaristi , 2016 # oihane , 2016 # Luis Pomar , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # José Vicente , 2016 # Pedro M. Baeza , 2016 # Jesús Alan Ramos Rodríguez , 2016 @@ -32,13 +32,14 @@ # Luis M. Ontalba , 2017 # e2f_es_ t6 , 2017 # Julio Fiallos , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "a" #. module: mrp #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban msgid "Effectiveness Category: " -msgstr "" +msgstr "" #. 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 "Effectiviteit categorie:" #. module: mrp #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban msgid "Is a Blocking Reason? " -msgstr "Is a blokkerende reden? " +msgstr "Is een blokkerende reden? " #. 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/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('(.*)', 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('(.*)', 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 + '' + 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 , 2017 -# Antonio Trueba , 2017 -# Martin Trigaux , 2017 +# oihane , 2016 +# Martin Trigaux, 2016 +# Antonio Trueba, 2017 +# JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2017\n" +"Last-Translator: JOSE ALEJANDRO ECHEVERRI VALENCIA , 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 , 2017 +# Renzo Meister, 2017 # key six , 2017 -# Andi , 2017 -# Martin Trigaux , 2017 +# Andi, 2017 +# Martin Trigaux, 2017 # Torsten Wichmann , 2017 # Ralf Hilgenstock , 2017 # Mathias Neef , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # Ermin Trevisan , 2017 # Henry Mineehen , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # darenkster , 2017 # Tina Rittmüller , 2017 # Anja Funk , 2017 @@ -22,13 +22,14 @@ # JackTheHunter , 2017 # Philipp Hug , 2017 # AppleMentalist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " Zurück zu Mein Konto" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Pay" -msgstr "" +msgstr "" #. 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.        " -msgstr "" +msgstr "" #. 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 , 2016 # José Vicente , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Leonardo Chianea , 2016 # Ana Juaristi , 2016 # Humberto Garza De Koster , 2016 # Carles Antoli , 2016 # Luis M. Triana , 2016 # Sergio Flores , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Alejandro Die Sanchis , 2016 # Pedro M. Baeza , 2016 # Inigo Zuluaga , 2016 @@ -27,13 +27,14 @@ # Alejandro Santana , 2017 # Jesús Alan Ramos Rodríguez , 2017 # Daniel Santibáñez Polanco , 2018 +# e2f , 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 , 2018\n" +"Last-Translator: e2f , 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 " Pagar" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Add new card" -msgstr "" +msgstr "" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list @@ -72,28 +73,28 @@ msgstr " Eliminar" #: code:addons/payment/static/src/js/payment_form.js:219 #, python-format msgid "

        Please fill all the inputs required.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:180 #, python-format msgid "

        Please select a payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:274 #, python-format msgid "

        Please select the option to add a new payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:315 #, python-format msgid "

        This card is currently linked to the following records:

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -103,7 +104,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:267 #, python-format msgid "

        We are not able to add your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -111,7 +112,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:333 #, python-format msgid "

        We are not able to delete your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -119,14 +120,14 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:161 #, python-format msgid "

        We are not able to redirect you to the payment form.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:169 #, python-format msgid "

        We're unable to process your payment.

        " -msgstr "" +msgstr "

        " #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Adriana Ierfino , 2016 # Clo , 2016 # Melanie Bernard , 2016 @@ -14,8 +14,8 @@ # Xavier Symons , 2016 # Fabien Pinckaers , 2016 # Nancy Bolognesi , 2016 -# Florian Hatat , 2016 -# Hamid Darabi , 2016 +# Florian Hatat, 2016 +# Hamid Darabi, 2016 # Daniel & Delphine , 2016 # Miguel Vidali , 2016 # Simon CARRIER , 2016 @@ -27,13 +27,14 @@ # Eloïse Stilmant , 2017 # nthnnl , 2017 # fr trans , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 " Retour à mon compte" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Pay" -msgstr "" +msgstr "" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Add new card" -msgstr "" +msgstr "" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Delete" -msgstr "" +msgstr "" #. module: payment #. openerp-web @@ -72,28 +73,28 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:219 #, python-format msgid "

        Please fill all the inputs required.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:180 #, python-format msgid "

        Please select a payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:274 #, python-format msgid "

        Please select the option to add a new payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:315 #, python-format msgid "

        This card is currently linked to the following records:

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -103,7 +104,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:267 #, python-format msgid "

        We are not able to add your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -111,7 +112,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:333 #, python-format msgid "

        We are not able to delete your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -119,28 +120,28 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:161 #, python-format msgid "

        We are not able to redirect you to the payment form.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:169 #, python-format msgid "

        We're unable to process your payment.

        " -msgstr "" +msgstr "

        " #. module: payment #: model:ir.ui.view,arch_db:payment.acquirer_form msgid "" "Test\n" " Environment" -msgstr "" +msgstr "" #. module: payment #: model:ir.ui.view,arch_db:payment.acquirer_form msgid "" "Production\n" " Environment" -msgstr "" +msgstr "" #. 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 , 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 , 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 "付款" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list msgid " Add new card" -msgstr "" +msgstr "" #. module: payment #: model:ir.ui.view,arch_db:payment.payment_tokens_list @@ -57,28 +58,28 @@ msgstr "删除" #: code:addons/payment/static/src/js/payment_form.js:219 #, python-format msgid "

        Please fill all the inputs required.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:180 #, python-format msgid "

        Please select a payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:274 #, python-format msgid "

        Please select the option to add a new payment method.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:315 #, python-format msgid "

        This card is currently linked to the following records:

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -88,7 +89,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:267 #, python-format msgid "

        We are not able to add your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -96,7 +97,7 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:333 #, python-format msgid "

        We are not able to delete your payment method at the moment.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web @@ -104,14 +105,14 @@ msgstr "" #: code:addons/payment/static/src/js/payment_form.js:161 #, python-format msgid "

        We are not able to redirect you to the payment form.

        " -msgstr "" +msgstr "

        " #. module: payment #. openerp-web #: code:addons/payment/static/src/js/payment_form.js:169 #, python-format msgid "

        We're unable to process your payment.

        " -msgstr "" +msgstr "

        " #. 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." -msgstr "" +msgstr "" #. 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 , 2017 -# Eric Geens , 2017 +# Yenthe Van Ginneken , 2016 +# Eric Geens , 2016 # Cas Vissers , 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 , 2016 # Stephan Van Dyck , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Eric Geens , 2016 # Cas Vissers , 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 , 2017 -# Martin Trigaux , 2017 +# Renzo Meister, 2017 +# Martin Trigaux, 2017 # Rudolf Schnapka , 2017 -# Wolfgang Taferner , 2017 +# Wolfgang Taferner, 2017 # darenkster , 2017 # Philipp Hug , 2017 # Henry Mineehen , 2017 # Malte Jansen , 2017 # Jan Brodersen <4rmitxes@gmail.com>, 2017 +# DE T1 , 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 , 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 , 2016 # Cas Vissers , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Melroy van den Berg , 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 , 2017 # Thorsten Vocks , 2017 -# Martin Trigaux , 2017 -# Wolfgang Taferner , 2017 -# Renzo Meister , 2017 +# Martin Trigaux, 2017 +# Wolfgang Taferner, 2017 +# Renzo Meister, 2017 # Ermin Trevisan , 2017 # JackTheHunter , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # darenkster , 2017 # key six , 2017 # Tina Rittmüller , 2017 @@ -18,7 +18,7 @@ # Martin K , 2017 # Marvin Elia Hoppe , 2017 # Anja Funk , 2017 -# Andi , 2017 +# Andi, 2017 # AppleMentalist , 2017 # Constantin Ehrenstein , 2017 # Katharina Moritz , 2017 @@ -27,13 +27,14 @@ # Philipp Hug , 2017 # Fabian Liesch , 2017 # Malte Jansen , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "Zugewiesen an" #. module: project #: model:ir.ui.view,arch_db:project.portal_my_project msgid "Customer" -msgstr "" +msgstr "" #. 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 (in Content)" -msgstr "" +msgstr "" #. 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 , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Cas Vissers , 2016 # Melroy van den Berg , 2018 msgid "" @@ -408,7 +408,7 @@ msgstr "" #: code:addons/project/static/src/js/tour.js:59 #, python-format msgid "

        Once your task is ready, you can save it.

        " -msgstr "" +msgstr "

        Eenmaal u taak klaar is kan u ze bewaren.

        " #. module: project #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form @@ -463,7 +463,7 @@ msgstr "Project:" #. module: project #: model:ir.ui.view,arch_db:project.portal_project_rating_popover msgid "Rated by: " -msgstr "" +msgstr "Beoordeeld door: " #. 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 , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 (in Content)" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Eric Geens , 2016 # Cas Vissers , 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 , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 # Ralf Hilgenstock , 2017 # Tina Rittmüller , 2017 -# Niki Waibel , 2017 -# Wolfgang Taferner , 2017 +# Niki Waibel, 2017 +# Wolfgang Taferner, 2017 # Ermin Trevisan , 2017 # Philipp Hug , 2017 # Kontor Consulting , 2017 # Anja Funk , 2017 # Thorsten Vocks , 2017 -# Renzo Meister , 2017 +# Renzo Meister, 2017 # JackTheHunter , 2017 # Henry Mineehen , 2017 # AppleMentalist , 2017 @@ -23,15 +23,16 @@ # DE R1 , 2017 # Christopher Bendlin , 2017 # DE T1 , 2017 -# Andi , 2017 +# Andi, 2017 # Jan Brodersen <4rmitxes@gmail.com>, 2017 +# e2f , 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 , 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 "" "

        Thank you,

        \n" " " msgstr "" +"

        " #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder @@ -97,17 +100,17 @@ msgstr "(Hinzufügen)" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Lot/Serial Number:" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Operations" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Parts" -msgstr "" +msgstr "" #. 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 , 2016 +# Martin Trigaux, 2016 # oihane , 2016 # José Vicente , 2016 # Carles Antoli , 2016 # Jesús Alan Ramos Rodríguez , 2016 # Luis M. Triana , 2016 # Pedro M. Baeza , 2016 -# Antonio Trueba , 2016 +# Antonio Trueba, 2016 # Sergio Flores , 2016 # David Perez , 2016 # Ivan Nieto , 2016 @@ -23,15 +23,16 @@ # Fernando San Martín Woerner , 2017 # Christopher Ormaza , 2017 # Luis M. Ontalba , 2017 -# Gustavo Valverde , 2017 +# Gustavo Valverde, 2017 # Nicole Kist , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

        Thank you,

        \n" " " msgstr "" +"

        " #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder @@ -103,17 +106,17 @@ msgstr "(Añadir)" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Lot/Serial Number:" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Operations" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Parts" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder @@ -143,7 +146,7 @@ msgstr "Total" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Warranty:" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Maxime Chambreuil , 2016 # Melanie Bernard , 2016 # Adriana Ierfino , 2016 @@ -21,16 +21,17 @@ # Eloïse Stilmant , 2017 # fr rev , 2017 # fr trans , 2017 -# Florian Hatat , 2017 +# Florian Hatat, 2017 # Clo , 2017 # fr rev , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 "" "

        Thank you,

        \n" " " msgstr "" +"

        " #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder @@ -96,17 +99,17 @@ msgstr "(Et)" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Lot/Serial Number:" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Operations" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Parts" -msgstr "" +msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder @@ -136,7 +139,7 @@ msgstr "Total" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder msgid "Warranty:" -msgstr "" +msgstr "" #. 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 , 2016 # Cas Vissers , 2016 # Eric Geens , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Volluta , 2016 # Pol Van Dingenen , 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 , 2017 # Cas Vissers , 2017 # Yenthe Van Ginneken , 2017 -# Martin Trigaux , 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 , 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 Verkoopbeheer app." #: 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 , 2017 # Cas Vissers , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Erwin van der Ploeg , 2017 # Eric Geens , 2017 # Pol Van Dingenen , 2017 @@ -78,7 +78,7 @@ msgstr "Transacties" #: 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 , 2017 # danimaribeiro , 2017 -# Martin Trigaux , 2017 +# Martin Trigaux, 2017 # Mateus Lopes , 2017 # mariana rodrigues , 2018 +# Raphael Rodrigues , 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 , 2018\n" +"Last-Translator: Raphael Rodrigues , 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.
        " msgstr "" +"Ocorreu um erro no processamento do seu pagamento: problema de " +"transação.
        " #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Eric Geens , 2017 # Cas Vissers , 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 , 2016 # Eric Geens , 2016 # Cas Vissers , 2016 -# Martin Trigaux , 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 , 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 , 2017 -# Niki Waibel , 2017 -# Henry Mineehen , 2017 -# Renzo Meister , 2017 +# Martin Trigaux, 2017 # darenkster , 2017 -# Martin Trigaux , 2017 -# Tina Rittmüller , 2017 -# aNj , 2017 -# Ermin Trevisan , 2017 -# BT_astauder , 2017 -# Rudolf Schnapka , 2017 +# Andreas Stauder , 2017 # JackTheHunter , 2017 +# Wolfgang Taferner, 2017 +# Niki Waibel, 2017 +# Tina Rittmüller , 2017 +# Ermin Trevisan , 2017 # Philipp Hug , 2017 +# Henry Mineehen , 2017 +# Rudolf Schnapka , 2017 +# Renzo Meister, 2017 +# aNj , 2017 # Malte Jansen , 2017 # Constantin Ehrenstein , 2017 # Nico Dor , 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Miguel Vidali , 2016 # Melanie Bernard , 2016 # Lionel Sausin , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Olivier Lenoir , 2016 # Xavier Symons , 2016 # Fabien Pinckaers , 2016 @@ -26,7 +26,7 @@ # Sylvain LE GAL , 2016 # Lucas Deliege , 2016 # lucasdeliege , 2016 -# ShevAbam , 2016 +# ShevAbam, 2016 # Régis GEROMEGNACE , 2016 # Shark McGnark , 2016 # Guilhaume Bordiau , 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 , 2016 # Cas Vissers , 2016 # Eric Geens , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Pol Van Dingenen , 2017 # Melroy van den Berg , 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Volluta , 2016 # Eric Geens , 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 "" " <body class=\"ie9\">\n" " <![endif]-->" msgstr "" -"<!—[if lt IE 10]>\n" -" <body class=“ie9”>\n" -" <![endif]—>" +"<!--[if lt IE 10]>\n" +" <body class=\"ie9\">\n" +" <![endif]-->" #. module: web #: model:ir.ui.view,arch_db:web.minimal_layout 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Eric Geens , 2016 # Cas Vissers , 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Melanie Bernard , 2016 # Adriana Ierfino , 2016 # Frédéric LIETART , 2016 # Mohamed Cherkaoui , 2016 -# Cédric Le Brouster , 2016 +# Cédric Le Brouster, 2016 # Maxime Chambreuil , 2016 # Xavier Symons , 2016 # lucasdeliege , 2016 # Clo , 2016 # Stephane DAGUET , 2016 -# Florian Hatat , 2016 +# Florian Hatat, 2016 # Vincent Hammadache , 2016 # Jean-Marc Dupont , 2016 # Shark McGnark , 2016 # Fabien Bourgeois , 2016 # Fabri Yohann , 2016 -# Kévin R. , 2016 +# Kévin R., 2016 # Nancy Bolognesi , 2016 # Lionel Sausin , 2016 # Lucas Deliege , 2016 @@ -39,13 +39,14 @@ # fr rev , 2017 # Micky Jault , 2017 # Olivier Dony , 2017 +# e2f , 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 , 2017\n" +"Last-Translator: e2f , 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 /website/action/. 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 "" #. 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 , 2016 # Erwin van der Ploeg , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Eric Geens , 2016 # Volluta , 2016 # Cas Vissers , 2016 @@ -305,7 +305,7 @@ msgstr " Kleurbedekking" #. module: website #: model:ir.ui.view,arch_db:website.snippet_options msgid "Options" -msgstr "" +msgstr "Opties" #. module: website #: model:ir.ui.view,arch_db:website.snippets @@ -450,6 +450,9 @@ msgid "" " Add Facebook Page\n" "         " msgstr "" +"\n" +" Facebook pagina toevoegen\n" +" " #. 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 , 2017 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018 +# e2f , 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 , 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 /website/action/. 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 "" #. 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" "() are applied, and the result is used as if it were this view's\n" "actual arch.\n" -msgstr "" +msgstr "" #. 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 , 2016 -# Martin Trigaux , 2016 +# Martin Trigaux, 2016 # Erwin van der Ploeg , 2016 # Eric Geens , 2016 # Cas Vissers , 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 @@