Skip to content

Commit

Permalink
Merge pull request odoo#379 from hoangtiendung070797/merged_from_upst…
Browse files Browse the repository at this point in the history
…ream_220702_02

Merged from upstream 220702 02
  • Loading branch information
davidtranhp committed Jul 2, 2022
2 parents d01f2f8 + 3d76a72 commit d582dc9
Show file tree
Hide file tree
Showing 260 changed files with 3,835 additions and 1,918 deletions.
6 changes: 5 additions & 1 deletion .tx/config
Expand Up @@ -592,6 +592,11 @@ file_filter = addons/payment_adyen/i18n/<lang>.po
source_file = addons/payment_adyen/i18n/payment_adyen.pot
source_lang = en

[odoo-14.payment_adyen_paybylink]
file_filter = addons/payment_adyen_paybylink/i18n/<lang>.po
source_file = addons/payment_adyen_paybylink/i18n/payment_adyen_paybylink.pot
source_lang = en

[odoo-14.payment_odoo_by_adyen]
file_filter = addons/payment_odoo_by_adyen/i18n/<lang>.po
source_file = addons/payment_odoo_by_adyen/i18n/payment_odoo_by_adyen.pot
Expand Down Expand Up @@ -1201,4 +1206,3 @@ source_lang = en
file_filter = addons/website_twitter/i18n/<lang>.po
source_file = addons/website_twitter/i18n/website_twitter.pot
source_lang = en

18 changes: 16 additions & 2 deletions addons/account/i18n/de.po
Expand Up @@ -1997,6 +1997,8 @@ msgid ""
"Always positive amount concerned by this matching expressed in the credit "
"line foreign currency."
msgstr ""
"Der von diesem Abgleich betroffene positive Betrag wird immer in der "
"Kreditlinie in Fremdwährung ausgedrückt."

#. module: account
#: model:ir.model.fields,help:account.field_account_partial_reconcile__debit_amount_currency
Expand Down Expand Up @@ -4168,6 +4170,8 @@ msgstr "Kumulierter Saldo"
msgid ""
"Cumulated balance depending on the domain and the order chosen in the view."
msgstr ""
"Kumulierter Saldo je nach Bereich und der in der Ansicht gewählten "
"Reihenfolge."

#. module: account
#: model:ir.ui.menu,name:account.menu_action_currency_form
Expand Down Expand Up @@ -5380,6 +5384,8 @@ msgid ""
"Factor to apply on the account move lines generated from this distribution "
"line"
msgstr ""
"Faktor, der auf die von dieser Verteilungslinie erzeugten "
"Kontobewegungslinien anzuwenden ist"

#. module: account
#: model:ir.model.fields,help:account.field_account_tax_repartition_line__factor_percent
Expand Down Expand Up @@ -8674,7 +8680,7 @@ msgstr "Oder senden Sie eine Rechnung an %s@%s"
#. module: account
#: model:ir.model.fields,field_description:account.field_account_resequence_wizard__ordering
msgid "Ordering"
msgstr ""
msgstr "Bestellen"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__invoice_origin
Expand Down Expand Up @@ -9347,6 +9353,8 @@ msgstr "Bitte geben Sie einen rein positiven Rundungswert an."
msgid ""
"Please set at least one of the match texts to create a partner mapping."
msgstr ""
"Faktor, der auf die von dieser Verteilungslinie erzeugten "
"Kontobewegungslinien anzuwenden ist"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.report_invoice_document
Expand Down Expand Up @@ -9863,6 +9871,12 @@ msgstr "Ausgleichsmodelle"
msgid "Reconciliation Parts"
msgstr "Einzelne Teilausgleiche"

#. module: account
#: code:addons/account/models/partner.py:0
#, python-format
msgid "Record cannot be deleted. Partner used in Accounting"
msgstr ""

#. module: account
#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Record transactions in foreign currencies"
Expand Down Expand Up @@ -12395,7 +12409,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_tax_repartition_line__company_id
msgid "The company this distribution line belongs to."
msgstr ""
msgstr "Das Unternehmen, zu dem diese Vertriebslinie gehört."

#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__tax_fiscal_country_id
Expand Down
6 changes: 3 additions & 3 deletions addons/account/i18n/es.po
Expand Up @@ -23,17 +23,17 @@
# Ernesto Tejeda <ernesto.tejeda87@gmail.com>, 2021
# Alejandro Concepción <alconor23@hotmail.com>, 2021
# marcescu, 2022
# Pedro M. Baeza <pedro.baeza@tecnativa.com>, 2022
# Luis D Lafaurie, 2022
# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022
# Pedro M. Baeza <pedro.baeza@tecnativa.com>, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-25 10:15+0000\n"
"PO-Revision-Date: 2020-09-07 08:09+0000\n"
"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@tecnativa.com>, 2022\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"
Expand Down Expand Up @@ -5621,7 +5621,7 @@ msgstr "Seguidores (Canales)"
#: model:ir.model.fields,field_description:account.field_account_move__message_partner_ids
#: model:ir.model.fields,field_description:account.field_account_payment__message_partner_ids
msgid "Followers (Partners)"
msgstr "Seguidores (Partners)"
msgstr "Seguidores (Contactos)"

#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement_line__activity_type_icon
Expand Down
30 changes: 26 additions & 4 deletions addons/account/i18n/id.po
Expand Up @@ -35,14 +35,15 @@
# Abdul Munif Hanafi <amunifhanafi@gmail.com>, 2021
# Mashanz <mangatkk@gmail.com>, 2021
# Muftiara Syuhada <muftiara.syuhada@gmail.com>, 2021
# Rizkya Fajar, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-25 10:15+0000\n"
"PO-Revision-Date: 2020-09-07 08:09+0000\n"
"Last-Translator: Muftiara Syuhada <muftiara.syuhada@gmail.com>, 2021\n"
"Last-Translator: Rizkya Fajar, 2022\n"
"Language-Team: Indonesian (https://www.transifex.com/odoo/teams/41243/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -78,17 +79,17 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment__reconciled_bills_count
msgid "# Reconciled Bills"
msgstr ""
msgstr "Tagihan Hasil Rekonsiliasi"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment__reconciled_invoices_count
msgid "# Reconciled Invoices"
msgstr ""
msgstr "Faktur Hasil Rekonsiliasi"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment__reconciled_statements_count
msgid "# Reconciled Statements"
msgstr ""
msgstr "Laporan Hasil Rekonsiliasi"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits
Expand Down Expand Up @@ -387,6 +388,8 @@ msgid ""
"<span attrs=\"{'invisible': [('reconciled_bills_count','&gt;', 1)]}\">Bill</span>\n"
" <span attrs=\"{'invisible': [('reconciled_bills_count','&lt;=', 1)]}\">Bills</span>"
msgstr ""
"<span attrs=\"{'invisible': [('reconciled_bills_count','&gt;', 1)]}\">Tagihan</span>\n"
" <span attrs=\"{'invisible': [('reconciled_bills_count','&lt;=', 1)]}\">Tagihan-tagihan</span>"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_account_payment_form
Expand All @@ -401,6 +404,8 @@ msgid ""
"<span attrs=\"{'invisible': [('reconciled_statements_count','&gt;', 1)]}\">Statement</span>\n"
" <span attrs=\"{'invisible': [('reconciled_statements_count','&lt;=', 1)]}\">Statements</span>"
msgstr ""
"<span attrs=\"{'invisible': [('reconciled_statements_count','&gt;', 1)]}\">Laporan</span>\n"
" <span attrs=\"{'invisible': [('reconciled_statements_count','&lt;=', 1)]}\">Laporan-laporan</span>"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.portal_my_invoices
Expand Down Expand Up @@ -470,6 +475,9 @@ msgid ""
"('state', '!=', 'draft'), ('invoice_payment_term_id', '!=', False)]}\"> or "
"</span>"
msgstr ""
"<span class=\"o_form_label mx-3 oe_edit_only\" attrs=\"{'invisible': ['|', "
"('state', '!=', 'draft'), ('invoice_payment_term_id', '!=', False)]}\"> atau"
" </span>"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_account_reconcile_model_form
Expand Down Expand Up @@ -9684,6 +9692,12 @@ msgstr "Model Rekonsiliasi"
msgid "Reconciliation Parts"
msgstr "Bagian Rekonsiliasi"

#. module: account
#: code:addons/account/models/partner.py:0
#, python-format
msgid "Record cannot be deleted. Partner used in Accounting"
msgstr ""

#. module: account
#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Record transactions in foreign currencies"
Expand Down Expand Up @@ -14764,3 +14778,11 @@ msgstr ""
#: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
msgid "→ Count"
msgstr "→ Hitung"

#. module: account
#: code:addons/account/models/account_analytic_default.py:31
#, python-format
msgid ""
"An analytic default requires an analytic account or an analytic tag used for"
" analytic distribution."
msgstr ""
2 changes: 1 addition & 1 deletion addons/account/i18n/lt.po
Expand Up @@ -9898,7 +9898,7 @@ msgstr ""
#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_account_payment_form
msgid "Reset To Draft"
msgstr ""
msgstr "Atkurti kaip juodraštį"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_move_form
Expand Down
5 changes: 3 additions & 2 deletions addons/account/i18n/nl.po
Expand Up @@ -23,14 +23,15 @@
# Martin Trigaux, 2021
# Yenthe Van Ginneken <yenthespam@gmail.com>, 2021
# Erwin van der Ploeg <erwin@odooexperts.nl>, 2022
# Sven Serlier, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-25 10:15+0000\n"
"PO-Revision-Date: 2020-09-07 08:09+0000\n"
"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2022\n"
"Last-Translator: Sven Serlier, 2022\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"
Expand Down Expand Up @@ -9874,7 +9875,7 @@ msgstr "Afletteringsonderdelen"
#: code:addons/account/models/partner.py:0
#, python-format
msgid "Record cannot be deleted. Partner used in Accounting"
msgstr ""
msgstr "Item kan niet worden verwijderd. Partner is gebruikt in Accounting."

#. module: account
#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
Expand Down
41 changes: 29 additions & 12 deletions addons/account/i18n/pt.po
Expand Up @@ -24,20 +24,21 @@
# Daniel Reis, 2021
# Manuela Silva <mmsrs@sky.com>, 2021
# Reinaldo Ramos <reinaldo.ramos@arxi.pt>, 2021
# Luiz Fernando <lfpsgs@outlook.com>, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-25 10:15+0000\n"
"PO-Revision-Date: 2020-09-07 08:09+0000\n"
"Last-Translator: Reinaldo Ramos <reinaldo.ramos@arxi.pt>, 2021\n"
"Last-Translator: Luiz Fernando <lfpsgs@outlook.com>, 2022\n"
"Language-Team: Portuguese (https://www.transifex.com/odoo/teams/41243/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"

#. module: account
#: model:ir.model.fields,help:account.field_account_tax__amount_type
Expand Down Expand Up @@ -5591,7 +5592,7 @@ msgstr "Seguidores (Parceiros)"
#: model:ir.model.fields,help:account.field_account_move__activity_type_icon
#: model:ir.model.fields,help:account.field_account_payment__activity_type_icon
msgid "Font awesome icon e.g. fa-tasks"
msgstr ""
msgstr "ícone do Font awesome ex. fa-tasks"

#. module: account
#: model:ir.model.fields,help:account.field_account_payment_term_line__value_amount
Expand Down Expand Up @@ -6022,7 +6023,7 @@ msgstr "Ícone"
#: model:ir.model.fields,help:account.field_account_move__activity_exception_icon
#: model:ir.model.fields,help:account.field_account_payment__activity_exception_icon
msgid "Icon to indicate an exception activity."
msgstr ""
msgstr "ícone para indicar uma exceção na atividade."

#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement__message_needaction
Expand Down Expand Up @@ -8255,7 +8256,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move__message_has_error_counter
#: model:ir.model.fields,field_description:account.field_account_payment__message_has_error_counter
msgid "Number of errors"
msgstr ""
msgstr "Número de erros"

#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement__message_needaction_counter
Expand Down Expand Up @@ -8531,7 +8532,7 @@ msgstr "Modelos de Operação"
#: code:addons/account/models/account_account.py:0
#, python-format
msgid "Operation not supported"
msgstr ""
msgstr "Operação não suportada."

#. module: account
#: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
Expand Down Expand Up @@ -8801,7 +8802,7 @@ msgstr "Reembolso Parcial"
#: model:ir.model.fields.selection,name:account.selection__account_move__payment_state__partial
#: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Partially Paid"
msgstr ""
msgstr "Pago Parcialmente"

#. module: account
#: code:addons/account/wizard/account_automatic_entry_wizard.py:0
Expand Down Expand Up @@ -9737,6 +9738,12 @@ msgstr "Modelos de Reconciliação"
msgid "Reconciliation Parts"
msgstr "Partes de Reconciliação"

#. module: account
#: code:addons/account/models/partner.py:0
#, python-format
msgid "Record cannot be deleted. Partner used in Accounting"
msgstr ""

#. module: account
#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Record transactions in foreign currencies"
Expand Down Expand Up @@ -14373,7 +14380,7 @@ msgstr ""
#: code:addons/account/models/account_move.py:0
#, python-format
msgid "You cannot use a deprecated account."
msgstr ""
msgstr "Você não pode utilizar uma conta desativada."

#. module: account
#: code:addons/account/models/account_move.py:0
Expand Down Expand Up @@ -14413,12 +14420,14 @@ msgid ""
"create a credit note instead. Use the action menu to transform it into a "
"credit note or refund."
msgstr ""
"Você não pode validar uma fatura com um valor total negativo. Ao invés "
"disso, você deveria criar uma nota de crédito. Use o menu de Aç"

#. module: account
#: code:addons/account/models/account_move.py:0
#, python-format
msgid "You don't have the access rights to post an invoice."
msgstr ""
msgstr "Você não tem permissão para lançar Faturas."

#. module: account
#: model_terms:ir.ui.view,arch_db:account.view_move_form
Expand All @@ -14443,7 +14452,7 @@ msgstr ""
#: code:addons/account/models/account_move.py:0
#, python-format
msgid "You need to add a line before posting."
msgstr ""
msgstr "É necessário adicionar uma linha antes de lançar."

#. module: account
#: code:addons/account/models/account_move.py:0
Expand Down Expand Up @@ -14525,12 +14534,12 @@ msgstr "código"
#. module: account
#: model:ir.model.fields.selection,name:account.selection__account_payment_term_line__option__after_invoice_month
msgid "days after the end of the invoice month"
msgstr ""
msgstr "dias depois do fim do mês da data de faturamento"

#. module: account
#: model:ir.model.fields.selection,name:account.selection__account_payment_term_line__option__day_after_invoice_date
msgid "days after the invoice date"
msgstr ""
msgstr "dias depois da data de faturamento"

#. module: account
#: model_terms:ir.ui.view,arch_db:account.setup_bank_account_wizard
Expand Down Expand Up @@ -14663,3 +14672,11 @@ msgstr ""
#: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
msgid "→ Count"
msgstr "→ Conta"

#. module: account
#: code:addons/account/models/account_analytic_default.py:31
#, python-format
msgid ""
"An analytic default requires an analytic account or an analytic tag used for"
" analytic distribution."
msgstr ""

0 comments on commit d582dc9

Please sign in to comment.