Skip to content

Commit

Permalink
[MERGE] forward port branch 11.0 up to b71b780
Browse files Browse the repository at this point in the history
  • Loading branch information
beledouxdenis committed Apr 24, 2019
2 parents f7414c0 + b71b780 commit 6fd637e
Show file tree
Hide file tree
Showing 122 changed files with 3,888 additions and 923 deletions.
21 changes: 12 additions & 9 deletions addons/account/i18n/da.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account
#
#
# Translators:
# Morten Schou <ms@msteknik.dk>, 2017
# Pernille Kristensen <pernillekristensen1994@gmail.com>, 2017
Expand All @@ -19,6 +19,9 @@
# Kenneth Hansen <kenneth@vkdata.dk>, 2017
# lhmflexerp <lhm@flexerp.dk>, 2017
# JonathanStein <jstein@image.dk>, 2017
# Simon Andersen <simon@vkdata.dk>, 2018
# Jesper Laugesen <jel@enigma.dk>, 2018
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
Expand Down Expand Up @@ -2519,7 +2522,7 @@ msgstr "Fakturering"
#. module: account
#: model:res.groups,name:account.group_account_manager
msgid "Billing Manager"
msgstr ""
msgstr "Faktureringsansvarlig"

#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
Expand Down Expand Up @@ -2576,7 +2579,7 @@ msgstr "Land"
#. module: account
#: model:ir.filters,name:account.filter_invoice_refund
msgid "By Credit Note"
msgstr ""
msgstr "Kreditnota"

#. module: account
#: model:ir.filters,name:account.filter_invoice_product
Expand Down Expand Up @@ -2612,7 +2615,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "CAMT Import"
msgstr ""
msgstr "CAMT import"

#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
Expand Down Expand Up @@ -2737,13 +2740,13 @@ msgstr "Cash Basis"
#. module: account
#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
msgid "Cash Basis Journal"
msgstr ""
msgstr "Pengestrøm journal"

#. module: account
#: code:addons/account/models/chart_template.py:192
#, python-format
msgid "Cash Basis Tax Journal"
msgstr ""
msgstr "Kontant moms journal"

#. module: account
#: code:addons/account/models/account_bank_statement.py:210
Expand Down Expand Up @@ -2991,8 +2994,8 @@ msgstr "Vælg regnskabsskabelon"
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
msgid "Choose counterpart"
msgstr "Vælg modpostering"
msgid "Choose counterpart or Create Write-off"
msgstr "Vælg modpost eller opret afskrivning"

#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_journal_form
Expand Down Expand Up @@ -3693,7 +3696,7 @@ msgstr "Kreditnota - %s"
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Credit Note Bill"
msgstr ""
msgstr "Kreditnota faktura"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice
Expand Down
6 changes: 3 additions & 3 deletions addons/account/i18n/he.po
Expand Up @@ -3711,7 +3711,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_out_refund
#: model:ir.ui.menu,name:account.menu_action_invoice_out_refund
msgid "Customer Credit Notes"
msgstr ""
msgstr "הערות אשראי לקוחות"

#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
Expand Down Expand Up @@ -7051,7 +7051,7 @@ msgstr ""
#: code:addons/account/models/chart_template.py:855
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
msgstr "רק מנהלים יכולים לשנות את ההגדרות"

#. module: account
#: model:ir.model.fields,help:account.field_res_company_period_lock_date
Expand Down Expand Up @@ -10195,7 +10195,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_res_partner_total_invoiced
#: model:ir.model.fields,field_description:account.field_res_users_total_invoiced
msgid "Total Invoiced"
msgstr ""
msgstr "סה\"כ קבלות"

#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_debit
Expand Down
15 changes: 13 additions & 2 deletions addons/account/i18n/ka.po
@@ -1,9 +1,18 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account
#
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
# Saba Khmaladze <skhmaladze@uglt.org>, 2018
# Giorgi Melitauri <gmelitauri@live.com>, 2018
# Gizo Kobakhidze <040168@gmail.com>, 2018
# David Machakhelidze <david.machakhelidze@gmail.com>, 2018
# Dachi Darchiashvili <darcho.dd@gmail.com>, 2018
# Nika Chikhradze <nika@globaltravel.ge>, 2018
# Temur, 2018
# Gvantsa Gvinianidze <gvantsa@live.com>, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
Expand Down Expand Up @@ -3113,7 +3122,7 @@ msgstr ""
#: code:addons/account/models/account_payment.py:624
#, python-format
msgid "Configuration Error !"
msgstr ""
msgstr "შეცდომა კონფიგურაციაში"

#. module: account
#. openerp-web
Expand All @@ -3129,6 +3138,8 @@ msgid ""
"Configuration error!\n"
"Could not find any account to create the invoice, are you sure you have a chart of account installed?"
msgstr ""
"შეცდომა კონფიგურაციაში!\n"
"არ მოიძებნა ახალი ინვოისის შექმნისთვის საჭირო ანგარიში, დარწმუნებული ხართ რომ ანგარიშთა გეგმა დაინსტალირებული გაქვთ?"

#. module: account
#: code:addons/account/models/account.py:443
Expand Down
91 changes: 75 additions & 16 deletions addons/account/i18n/ko.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account
#
#
# Translators:
# Martin Trigaux <mat@odoo.com>, 2017
msgid ""
Expand Down Expand Up @@ -1074,7 +1074,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
msgid "Account Accountant"
msgstr ""
msgstr "회계사 계정"

#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
Expand Down Expand Up @@ -1556,7 +1556,12 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_tax_id
msgid "Adjustment Tax"
msgstr ""
msgstr "조정 세금"

#. module: account
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_adjustment_type
msgid "Adjustment Type"
msgstr "조정 유형"

#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
Expand Down Expand Up @@ -1967,7 +1972,17 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_tag_applicability
msgid "Applicability"
msgstr ""
msgstr "적용성"

#. module: account
#: selection:tax.adjustments.wizard,adjustment_type:0
msgid "Applied on credit journal item"
msgstr "대변 분개 항목에 적용됨"

#. module: account
#: selection:tax.adjustments.wizard,adjustment_type:0
msgid "Applied on debit journal item"
msgstr "차변 분개 항목에 적용됨"

#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_auto_apply
Expand Down Expand Up @@ -2245,7 +2260,13 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.view_bank_statement_form
#: model:ir.ui.view,arch_db:account.view_bank_statement_search
msgid "Bank Statement"
msgstr ""
msgstr "예금거래 명세서"

#. module: account
#: code:addons/account/models/account_bank_statement.py:937
#, python-format
msgid "Bank Statement %s"
msgstr "예금 거래 명세서 %s"

#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
Expand Down Expand Up @@ -2823,8 +2844,8 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
msgid "Choose counterpart"
msgstr ""
msgid "Choose counterpart or Create Write-off"
msgstr "상대편 선택 또는 쓰기금지 생성"

#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_journal_form
Expand Down Expand Up @@ -5689,12 +5710,12 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.view_bank_statement_search
#, python-format
msgid "Journal"
msgstr ""
msgstr "분개"

#. module: account
#: selection:account.report.general.ledger,sortby:0
msgid "Journal & Partner"
msgstr ""
msgstr "분개 & 협력사"

#. module: account
#: code:addons/account/models/account_bank_statement.py:254
Expand All @@ -5707,19 +5728,19 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.view_move_tree
#, python-format
msgid "Journal Entries"
msgstr ""
msgstr "분개 기입 항목"

#. module: account
#: model:ir.ui.view,arch_db:account.view_account_move_filter
msgid "Journal Entries by Month"
msgstr ""
msgstr "월별 분개 기재"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_move_id
#: model:ir.model.fields,field_description:account.field_account_move_line_move_id
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Journal Entry"
msgstr ""
msgstr "분개 기입 항목"

#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_move_name
Expand Down Expand Up @@ -9576,7 +9597,13 @@ msgstr ""
msgid ""
"The last line's computation type should be \"Balance\" to ensure that the "
"whole amount will be allocated."
msgstr ""
msgstr "마지막 라인의 계산 유형은 \"잔액\"이 되어야 전체 금액이 할당됩니다."

#. module: account
#: code:addons/account/models/company.py:94
#, python-format
msgid "The lock date for advisors is irreversible and can't be removed."
msgstr "조언자의 잠금 날짜는 되돌릴 수 없으며 제거할 수 없습니다."

#. module: account
#: model:ir.model.fields,help:account.field_account_move_line_move_id
Expand All @@ -9594,7 +9621,14 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_name
msgid "The name that will be used on account move lines"
msgstr ""
msgstr "계정 이동 라인에 사용할 이름입니다."

#. module: account
#: code:addons/account/models/company.py:98
#, python-format
msgid ""
"The new lock date for advisors must be set after the previous lock date."
msgstr "새 조언자의 잠금 날짜는 이전 잠금 날짜 이후에 설정해야 합니다."

#. module: account
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
Expand Down Expand Up @@ -9645,6 +9679,13 @@ msgstr ""
msgid "The partner reference of this invoice."
msgstr ""

#. module: account
#: code:addons/account/models/account.py:522
#, python-format
msgid ""
"The partners of the journal's company and the related bank account mismatch."
msgstr "회사 분개장의 협력사와 관련 은행 계정이 일치하지 않습니다."

#. module: account
#: code:addons/account/models/account_payment.py:60
#, python-format
Expand Down Expand Up @@ -10910,7 +10951,15 @@ msgstr ""
msgid ""
"You cannot cancel an invoice which is partially paid. You need to "
"unreconcile related payment entries first."
msgstr ""
msgstr "부분 지불된 청구서 대금을 취소할 수 없습니다. 먼저 관련 지불 항목을 조정해야 합니다."

#. module: account
#: code:addons/account/models/company.py:200
#, python-format
msgid ""
"You cannot change the currency of the company since some journal items "
"already exist"
msgstr "일부 분개 항목이 이미 있으므로 회사의 통화를 변경할 수 없습니다."

#. module: account
#: code:addons/account/models/account.py:235
Expand All @@ -10935,6 +10984,7 @@ msgid ""
"You cannot create journal items with a secondary currency without filling "
"both 'currency' and 'amount currency' field."
msgstr ""
"사용자보다 엄격한 자문 조건을 정의할 수 없습니다. 사용자의 잠금 날짜 이전에 조언자의 잠금 날짜가 설정되어 있는지 확인합니다."

#. module: account
#: code:addons/account/models/account_invoice.py:607
Expand Down Expand Up @@ -10996,6 +11046,7 @@ msgid ""
"You cannot have a receivable/payable account that is not reconcilable. "
"(account code: %s)"
msgstr ""
"아직 완료되지 않은 기간은 잠글 수 없습니다. 조언자의 잠금 날짜가 전월의 마지막 날 이후로 설정되지 않았는지 확인해 주세요."

#. module: account
#. openerp-web
Expand Down Expand Up @@ -11032,7 +11083,15 @@ msgstr ""
msgid ""
"You cannot remove/deactivate an account which is set on a customer or "
"vendor."
msgstr ""
msgstr "고객 또는 공급업체에 설정된 계정을 제거/비활성화할 수 없습니다."

#. module: account
#: code:addons/account/models/account.py:249
#, python-format
msgid ""
"You cannot set a currency on this account as it already has some journal "
"entries having a different foreign currency."
msgstr "일부 분개 항목이 이미 다른 통화를 가지고 있기 때문에 이 계정에 통화를 설정할 수 없습니다."

#. module: account
#: code:addons/account/models/account_move.py:1310
Expand Down
2 changes: 1 addition & 1 deletion addons/account/i18n/ro.po
Expand Up @@ -677,7 +677,7 @@ msgstr ""
#. module: account
#: model:res.groups,name:account.group_warning_account
msgid "A warning can be set on a partner (Account)"
msgstr ""
msgstr "O avertizare poate fi setată pe un partener (Contabilitate)"

#. module: account
#. openerp-web
Expand Down
6 changes: 3 additions & 3 deletions addons/account/i18n/uk.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account
#
#
# Translators:
# Bohdan Lisnenko, 2018
# Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018
Expand Down Expand Up @@ -608,7 +608,7 @@ msgstr "Останній рядок терміну оплати повинен
#: code:addons/account/models/account_invoice.py:1727
#, python-format
msgid "A Payment Terms should have only one line of type Balance."
msgstr "Тільки один рядок терміну оплати повинен бути з типом оплати Баланс"
msgstr "Термін оплати повинен мати тільки один рядок типу Балансу."

#. module: account
#: code:addons/account/models/account.py:757
Expand Down Expand Up @@ -909,7 +909,7 @@ msgstr "Теги рахунків"
#: model:ir.ui.view,arch_db:account.view_tax_form
#: model:ir.ui.view,arch_db:account.view_tax_tree
msgid "Account Tax"
msgstr "Рахунок податку"
msgstr "Податок рахунку"

#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
Expand Down

0 comments on commit 6fd637e

Please sign in to comment.