Skip to content
Permalink
Browse files

[MERGE] forward port branch 11.0 up to b71b780

  • Loading branch information...
beledouxdenis committed Apr 24, 2019
2 parents f7414c0 + b71b780 commit 6fd637e13190909137586c475048b32716024df1
Showing with 3,888 additions and 923 deletions.
  1. +12 −9 addons/account/i18n/da.po
  2. +3 −3 addons/account/i18n/he.po
  3. +13 −2 addons/account/i18n/ka.po
  4. +75 −16 addons/account/i18n/ko.po
  5. +1 −1 addons/account/i18n/ro.po
  6. +3 −3 addons/account/i18n/uk.po
  7. +2 −1 addons/account/views/report_overdue.xml
  8. +10 −3 addons/account_asset/i18n/ko.po
  9. +36 −2 addons/account_tax_python/i18n/ko.po
  10. +5 −4 addons/account_voucher/i18n/uk.po
  11. +9 −4 addons/auth_ldap/i18n/ko.po
  12. +8 −3 addons/auth_oauth/i18n/ko.po
  13. +2 −2 addons/auth_signup/controllers/main.py
  14. +13 −6 addons/base_address_city/i18n/ko.po
  15. +1 −1 addons/base_automation/i18n/ko.po
  16. +4 −2 addons/base_import_module/models/ir_module.py
  17. +1 −1 addons/base_setup/i18n/uk.po
  18. +11 −7 addons/base_vat/i18n/ko.po
  19. +8 −4 addons/bus/i18n/ko.po
  20. +1 −1 addons/calendar/i18n/ko.po
  21. +15 −14 addons/calendar/i18n/uk.po
  22. +1 −1 addons/contacts/i18n/ko.po
  23. +59 −35 addons/crm/i18n/he.po
  24. +12 −10 addons/crm/i18n/uk.po
  25. +9 −6 addons/decimal_precision/i18n/ko.po
  26. +1 −1 addons/delivery/i18n/he.po
  27. +12 −11 addons/delivery/i18n/uk.po
  28. +19 −12 addons/event/i18n/fr.po
  29. +13 −6 addons/event/i18n/he.po
  30. +12 −11 addons/event/i18n/uk.po
  31. +13 −12 addons/event_sale/i18n/uk.po
  32. +2 −2 addons/event_sale/models/sale_order.py
  33. +15 −13 addons/gamification_sale_crm/i18n/he.po
  34. +8 −5 addons/google_calendar/i18n/ko.po
  35. +9 −2 addons/google_spreadsheet/i18n/ko.po
  36. +3 −1 addons/hr/i18n/he.po
  37. +1 −1 addons/hr_payroll/i18n/he.po
  38. +1 −1 addons/hr_recruitment/i18n/he.po
  39. +12 −5 addons/hr_recruitment/i18n/ko.po
  40. +10 −7 addons/hr_timesheet_attendance/i18n/ko.po
  41. +12 −5 addons/im_livechat/i18n/he.po
  42. +1 −0 addons/l10n_fr_pos_cert/models/__init__.py
  43. +19 −0 addons/l10n_fr_pos_cert/models/account_fiscal_position.py
  44. +6 −4 addons/mail/i18n/he.po
  45. +13 −8 addons/mail/i18n/ko.po
  46. +1 −1 addons/mail/i18n/lt.po
  47. +3 −3 addons/mail/i18n/uk.po
  48. +8 −3 addons/mass_mailing_event/i18n/ko.po
  49. +8 −3 addons/mass_mailing_event_track/i18n/ko.po
  50. +1 −1 addons/membership/i18n/he.po
  51. +285 −177 addons/mrp/i18n/he.po
  52. +10 −9 addons/mrp/i18n/ro.po
  53. +1 −1 addons/mrp_byproduct/i18n/he.po
  54. +44 −1 addons/payment/i18n/pt.po
  55. +3 −2 addons/point_of_sale/data/point_of_sale_data.xml
  56. +30 −23 addons/point_of_sale/i18n/fr.po
  57. +58 −10 addons/point_of_sale/i18n/it.po
  58. +7 −3 addons/point_of_sale/i18n/ko.po
  59. +1 −2 addons/point_of_sale/views/account_journal_view.xml
  60. +18 −14 addons/portal/i18n/de.po
  61. +655 −0 addons/portal/i18n/ko.po
  62. +48 −0 addons/pos_reprint/i18n/ko.po
  63. +9 −2 addons/pos_restaurant/i18n/it.po
  64. +9 −4 addons/pos_sale/i18n/he.po
  65. +31 −14 addons/product/i18n/it.po
  66. +1 −1 addons/product/i18n/ro.po
  67. +15 −1 addons/product/i18n/uk.po
  68. +1 −1 addons/project/i18n/he.po
  69. +60 −5 addons/purchase/i18n/de.po
  70. +10 −1 addons/purchase/i18n/ko.po
  71. +1 −0 addons/purchase/i18n/ro.po
  72. +40 −5 addons/rating/i18n/ko.po
  73. +5 −0 addons/resource/i18n/he.po
  74. +1 −1 addons/resource/i18n/ro.po
  75. +3 −3 addons/sale/i18n/he.po
  76. +81 −4 addons/sale/i18n/ko.po
  77. +1 −1 addons/sale/i18n/ro.po
  78. +13 −9 addons/sale_crm/i18n/he.po
  79. +11 −4 addons/sale_payment/i18n/he.po
  80. +103 −0 addons/sale_timesheet/i18n/ko.po
  81. +3 −3 addons/sales_team/i18n/he.po
  82. +17 −5 addons/stock/i18n/he.po
  83. +10 −7 addons/stock/i18n/mn.po
  84. +2 −2 addons/stock/i18n/ro.po
  85. +4 −1 addons/stock/models/stock_move.py
  86. +44 −21 addons/stock_account/i18n/mn.po
  87. +3 −1 addons/stock_dropshipping/models/purchase.py
  88. +16 −0 addons/stock_dropshipping/tests/test_dropship.py
  89. +12 −6 addons/utm/i18n/he.po
  90. +10 −9 addons/utm/i18n/uk.po
  91. +9 −3 addons/web_editor/i18n/ko.po
  92. +1 −1 addons/web_editor/i18n/ro.po
  93. +3 −3 addons/website/i18n/he.po
  94. +14 −7 addons/website/i18n/ko.po
  95. +3 −1 addons/website_blog/i18n/he.po
  96. +13 −8 addons/website_crm/i18n/he.po
  97. +19 −19 addons/website_crm_partner_assign/i18n/he.po
  98. +11 −9 addons/website_crm_partner_assign/i18n/mn.po
  99. +8 −4 addons/website_customer/i18n/he.po
  100. +12 −5 addons/website_event/i18n/he.po
  101. +1 −1 addons/website_event_sale/models/sale_order.py
  102. +3 −0 addons/website_event_track/i18n/he.po
  103. +1 −1 addons/website_gengo/i18n/he.po
  104. +22 −4 addons/website_gengo/i18n/ko.po
  105. +30 −5 addons/website_mass_mailing/i18n/ko.po
  106. +10 −3 addons/website_membership/i18n/he.po
  107. +8 −5 addons/website_membership/i18n/ko.po
  108. +31 −3 addons/website_quote/controllers/main.py
  109. +11 −9 addons/website_quote/i18n/uk.po
  110. +150 −18 addons/website_quote/static/src/js/website_quotation.js
  111. +6 −0 addons/website_quote/views/sale_order_views.xml
  112. +4 −4 addons/website_quote/views/website_quote_templates.xml
  113. +1 −1 addons/website_sale/i18n/he.po
  114. +14 −5 addons/website_sale/i18n/ko.po
  115. +3 −0 addons/website_sale/models/sale_order.py
  116. +361 −0 addons/website_sale_comparison/i18n/ko.po
  117. +35 −0 addons/website_sale_management/i18n/ko.po
  118. +12 −6 addons/website_slides/i18n/he.po
  119. +823 −164 odoo/addons/base/i18n/he.po
  120. +13 −1 odoo/addons/base/i18n/ko.po
  121. +12 −8 odoo/addons/base/i18n/ro.po
  122. +51 −13 odoo/addons/base/i18n/zh_CN.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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -3113,7 +3122,7 @@ msgstr ""
#: code:addons/account/models/account_payment.py:624
#, python-format
msgid "Configuration Error !"
msgstr ""
msgstr "შეცდომა კონფიგურაციაში"

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

#. module: account
#. openerp-web
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Oops, something went wrong.

0 comments on commit 6fd637e

Please sign in to comment.
You can’t perform that action at this time.