From 66e2aeb6606082364286f788a29f61e3c349b31b Mon Sep 17 00:00:00 2001 From: ThanhDodeurOdoo Date: Mon, 3 Sep 2018 16:12:59 +0000 Subject: [PATCH 1/6] [FIX] tools: image.crop_image default type fix Backport of fa39019ee1b. If crop_image is called without a default format, it would try the default, 'PNG', to save the result and crash at save when processing non-PNG images. For example, if a jpeg image was in CMYK colors. Here it will still crash non-gracefully when failing to save, but the default should almost always work; if it doesn't it means we failed to detect the format of the stream, so it is unlikely that we could save the image anyway. opw 2009029 closes odoo/odoo#34088 Signed-off-by: Nans Lefebvre (len) --- odoo/tools/image.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/odoo/tools/image.py b/odoo/tools/image.py index 2b1cbed1860..bd30d4ab4f9 100644 --- a/odoo/tools/image.py +++ b/odoo/tools/image.py @@ -159,7 +159,7 @@ def image_resize_image_small(base64_source, size=(64, 64), encoding='base64', fi # ---------------------------------------- # Crop Image # ---------------------------------------- -def crop_image(data, type='top', ratio=False, size=None, image_format="PNG"): +def crop_image(data, type='top', ratio=False, size=None, image_format=None): """ Used for cropping image and create thumbnail :param data: base64 data of image. :param type: Used for cropping position possible @@ -188,6 +188,7 @@ def crop_image(data, type='top', ratio=False, size=None, image_format="PNG"): new_h = h new_w = (h * w_ratio) // h_ratio + image_format = image_format or image_stream.format or 'JPEG' if type == "top": cropped_image = image_stream.crop((0, 0, new_w, new_h)) cropped_image.save(output_stream, format=image_format) From 187b77d7b9fd7ccbd3d09aeb193fe896de98c161 Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Fri, 14 Jun 2019 08:05:33 +0000 Subject: [PATCH 2/6] [FIX] product: report pricelist empty data Try to get the report_pricelist with empty data (Studio Report editor can) Before this commit, it crashes because we tried to access dict keys directly in an empty dict After this commit, it doesn't crash OPW 2009862 closes odoo/odoo#34118 Signed-off-by: Lucas Perais (lpe) --- addons/product/report/product_pricelist.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py index c0bd5138fab..8a82ceb70ab 100644 --- a/addons/product/report/product_pricelist.py +++ b/addons/product/report/product_pricelist.py @@ -27,7 +27,8 @@ class report_product_pricelist(models.AbstractModel): } def _get_quantity(self, data): - return sorted([data['form'][key] for key in data['form'] if key.startswith('qty') and data['form'][key]]) + form = data and data.get('form') or {} + return sorted([form[key] for key in form if key.startswith('qty') and form[key]]) def _get_categories(self, pricelist, products, quantities): categ_data = [] From 45bd7a58d5202d6b9387636317eb33efa569f458 Mon Sep 17 00:00:00 2001 From: Julien Castiaux Date: Fri, 10 May 2019 14:26:02 +0000 Subject: [PATCH 3/6] [FIX] website_sale_comparison: concurrent add/delete 1) Add a 1st product to compare from the ecommerce /shop page. 2) Open the compare list pop up at the bottom. 3) Add a 2nd product to compare from the /shop page. 4) Remove the 1st product from the compare list before the rpc of the 2nd product is done. 5) Javascript error `self.product_data[res] is undefined` The function `add_new_products` and `rm_from_comparelist` are concurrent, they both modify the internal `comparelist_product_ids` product list. The first one perform an RPC and delay the update once the request is done, the second does the update immediately. The solution has been to use a mutex to exclude the two functions. opw-1974108 closes odoo/odoo#33302 Signed-off-by: Quentin Smetz (qsm) --- .../static/src/js/website_sale_comparison.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js index 9d27a98d558..59dcd2ee372 100644 --- a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js +++ b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js @@ -3,6 +3,7 @@ odoo.define('website_sale_comparison.comparison', function (require) { require('web.dom_ready'); var ajax = require('web.ajax'); +var concurrency = require('web.concurrency'); var core = require('web.core'); var _t = core._t; var utils = require('web.utils'); @@ -26,6 +27,7 @@ var ProductComparison = Widget.extend({ init: function(){ this.comparelist_product_ids = JSON.parse(utils.get_cookie('comparelist_product_ids') || '[]'); this.product_compare_limit = 4; + this.guard = new concurrency.Mutex(); }, start:function(){ var self = this; @@ -113,6 +115,9 @@ var ProductComparison = Widget.extend({ } }, add_new_products:function(product_id){ + this.guard.exec(this._add_new_products.bind(this, product_id)); + }, + _add_new_products: function (product_id) { var self = this; $('.o_product_feature_panel').show(); if (!_.contains(self.comparelist_product_ids, product_id)) { @@ -120,8 +125,9 @@ var ProductComparison = Widget.extend({ if(_.has(self.product_data, product_id)){ self.update_content([product_id], false); } else { - self.load_products([product_id]).then(function(){ + return self.load_products([product_id]).then(function () { self.update_content([product_id], false); + self.update_cookie(); }); } } @@ -139,6 +145,9 @@ var ProductComparison = Widget.extend({ this.refresh_panel(); }, rm_from_comparelist: function(e){ + this.guard.exec(this._rm_from_comparelist.bind(this, e)); + }, + _rm_from_comparelist: function (e) { this.comparelist_product_ids = _.without(this.comparelist_product_ids, $(e.currentTarget).data('product_product_id')); $(e.currentTarget).parents('.o_product_row').remove(); this.update_cookie(); From ca8b354cc1e3b9f978b836c76dc4deff7a3fe651 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 16 Jun 2019 03:07:16 +0200 Subject: [PATCH 4/6] [I18N] Update translation terms from Transifex --- addons/account/i18n/es.po | 5 +- addons/account/i18n/ko.po | 2 + addons/account/i18n/ro.po | 2 +- addons/base_setup/i18n/ko.po | 2 + addons/base_vat/i18n/ko.po | 2 + addons/gamification/i18n/pl.po | 9 +- addons/hr/i18n/ko.po | 2 + addons/iap/i18n/ko.po | 8 +- addons/im_livechat/i18n/cs.po | 2 +- addons/im_livechat/i18n/ko.po | 137 +++++++++++-------- addons/link_tracker/i18n/ko.po | 38 ++--- addons/lunch/i18n/ko.po | 91 ++++++------ addons/mail/i18n/cs.po | 4 +- addons/mail/i18n/ko.po | 2 +- addons/mail/i18n/ro.po | 6 + addons/mrp/i18n/ja.po | 6 +- addons/mrp/i18n/ko.po | 4 +- addons/mrp_byproduct/i18n/ko.po | 11 +- addons/purchase/i18n/ko.po | 2 + addons/purchase/i18n/sk.po | 14 +- addons/sale/i18n/cs.po | 1 + addons/sale/i18n/ko.po | 6 +- addons/sale_stock/i18n/ko.po | 2 + addons/sale_stock/i18n/uk.po | 8 +- addons/sale_timesheet/i18n/ko.po | 4 +- addons/sms/i18n/pl.po | 14 +- addons/stock/i18n/fi.po | 8 +- addons/stock/i18n/ja.po | 2 +- addons/stock/i18n/ro.po | 4 +- addons/stock_account/i18n/ro.po | 2 +- addons/theme_default/i18n/pl.po | 12 +- addons/web_settings_dashboard/i18n/he.po | 10 +- addons/website/i18n/sl.po | 22 +-- addons/website_crm_partner_assign/i18n/ro.po | 2 +- addons/website_forum/i18n/pl.po | 10 +- addons/website_sale/i18n/de.po | 8 +- addons/website_sale_comparison/i18n/ko.po | 2 +- addons/website_sale_stock/i18n/de.po | 19 +-- addons/website_theme_install/i18n/sl.po | 2 +- odoo/addons/base/i18n/ca.po | 44 +++++- odoo/addons/base/i18n/mn.po | 2 +- odoo/addons/base/i18n/ro.po | 2 + odoo/addons/base/i18n/sl.po | 12 +- 43 files changed, 328 insertions(+), 219 deletions(-) diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 793d06c7de1..3a442e07197 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -25,6 +25,7 @@ # Gustavo Valverde, 2019 # Pedro M. Baeza , 2019 # Martin Trigaux, 2019 +# Rick Hunter , 2019 # msgid "" msgstr "" @@ -32,7 +33,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-29 09:07+0000\n" "PO-Revision-Date: 2017-09-20 10:13+0000\n" -"Last-Translator: Martin Trigaux, 2019\n" +"Last-Translator: Rick Hunter , 2019\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" @@ -11980,6 +11981,8 @@ msgid "" "You cannot set a currency on this account as it already has some journal " "entries having a different foreign currency." msgstr "" +"No puede establecer una moneda en esta cuenta porque ya tiene algunas " +"entradas de diario que tienen una moneda extranjera diferente." #. module: account #: code:addons/account/models/account_move.py:1368 diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 79f9227b067..1db49f155cf 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -435,6 +435,8 @@ msgid "" "" msgstr "" +"" #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index 8798f8add02..1514091423e 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -6248,7 +6248,7 @@ msgstr "Jurnale" #: model:ir.actions.report,name:account.action_report_journal #: model:ir.ui.menu,name:account.menu_print_journal msgid "Journals Audit" -msgstr "" +msgstr "Audit jurnale" #. module: account #: selection:res.company,fiscalyear_last_month:0 diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po index afc1af23260..a75724b8b52 100644 --- a/addons/base_setup/i18n/ko.po +++ b/addons/base_setup/i18n/ko.po @@ -29,6 +29,8 @@ msgid "" "" msgstr "" +"" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po index 3596bf75e0c..f3a49b52c2a 100644 --- a/addons/base_vat/i18n/ko.po +++ b/addons/base_vat/i18n/ko.po @@ -28,6 +28,8 @@ msgid "" "" msgstr "" +"" #. module: base_vat #: model:ir.model,name:base_vat.model_res_company diff --git a/addons/gamification/i18n/pl.po b/addons/gamification/i18n/pl.po index 25db226b23c..ea2b3aeee29 100644 --- a/addons/gamification/i18n/pl.po +++ b/addons/gamification/i18n/pl.po @@ -7,7 +7,7 @@ # Zdzisław Krajewski , 2017 # zieloo , 2017 # Mariusz, 2017 -# zbik2607 , 2017 +# Dariusz Żbikowski , 2017 # Judyta Kaźmierczak , 2017 # Piotr Szlązak , 2017 # Grzegorz Grzelak , 2017 @@ -15,6 +15,7 @@ # Martin Trigaux, 2017 # Tomasz Leppich , 2018 # Paweł Wodyński , 2018 +# Piotr Cierkosz , 2019 # msgid "" msgstr "" @@ -22,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:07+0000\n" "PO-Revision-Date: 2017-09-20 10:17+0000\n" -"Last-Translator: Paweł Wodyński , 2018\n" +"Last-Translator: Piotr Cierkosz , 2019\n" "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1097,7 +1098,7 @@ msgstr "Jak obliczyć cel?" #. module: gamification #: selection:gamification.challenge,category:0 msgid "Human Resources / Engagement" -msgstr "" +msgstr "Zarządzanie zasobami ludzkimi / Zaangażowanie" #. module: gamification #: model:ir.model.fields,field_description:gamification.field_gamification_badge_id @@ -1655,7 +1656,7 @@ msgstr "Ustaw swoją strefę czasową" #. module: gamification #: selection:gamification.challenge,category:0 msgid "Settings / Gamification Tools" -msgstr "" +msgstr "Ustawienia / Narzędzia do gemifikacji" #. module: gamification #: model:gamification.challenge,name:gamification.challenge_base_configure diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po index 6dcea5d7471..54b3277cfc5 100644 --- a/addons/hr/i18n/ko.po +++ b/addons/hr/i18n/ko.po @@ -74,6 +74,8 @@ msgid "" "" msgstr "" +"" #. module: hr #: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees diff --git a/addons/iap/i18n/ko.po b/addons/iap/i18n/ko.po index 1484a438848..713878d9092 100644 --- a/addons/iap/i18n/ko.po +++ b/addons/iap/i18n/ko.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2017 # Seongseok Shin , 2018 +# JH CHOI , 2019 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-18 15:47+0000\n" -"PO-Revision-Date: 2017-12-18 15:47+0000\n" -"Last-Translator: Seongseok Shin , 2018\n" +"PO-Revision-Date: 2017-10-10 11:49+0000\n" +"Last-Translator: JH CHOI , 2019\n" "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +36,7 @@ msgstr "계정 토큰" #: code:addons/iap/static/src/js/crash_manager.js:40 #, python-format msgid "Buy credits at Odoo" -msgstr "" +msgstr "Odoo에서 크레딧 구매" #. module: iap #. openerp-web diff --git a/addons/im_livechat/i18n/cs.po b/addons/im_livechat/i18n/cs.po index 3064864eeec..364794d92ca 100644 --- a/addons/im_livechat/i18n/cs.po +++ b/addons/im_livechat/i18n/cs.po @@ -123,7 +123,7 @@ msgstr "Špatný" #: model:ir.actions.act_window,name:im_livechat.im_livechat_canned_response_action #: model:ir.ui.menu,name:im_livechat.canned_responses msgid "Canned Responses" -msgstr "" +msgstr "Uchované odpovědi" #. module: im_livechat #: model:ir.actions.act_window,help:im_livechat.im_livechat_canned_response_action diff --git a/addons/im_livechat/i18n/ko.po b/addons/im_livechat/i18n/ko.po index d2b916932b4..c6d05f3e139 100644 --- a/addons/im_livechat/i18n/ko.po +++ b/addons/im_livechat/i18n/ko.po @@ -29,12 +29,12 @@ msgstr "" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_nbr_channel msgid "# of Sessions" -msgstr "" +msgstr "# 세션" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_speaker msgid "# of speakers" -msgstr "" +msgstr "# 대화자" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rating_percentage_satisfaction @@ -49,6 +49,9 @@ msgid "" "* 'Auto popup' displays the button and automatically open the conversation pane.\n" "* 'Hide the button' hides the chat button on the pages." msgstr "" +"* '버튼 표시'는 페이지에 채팅 버튼을 표시합니다.\n" +"* '자동 팝업'은 버튼을 표시하고 자동으로 대화 창을 엽니다.\n" +"* '버튼 숨기기'는 페이지의 채팅 버튼을 숨깁니다." #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form @@ -59,6 +62,9 @@ msgid "" "country, GeoIP must be installed on your server, otherwise, the countries of" " the rule will not be taken into account." msgstr "" +"실시간 지원 채널에 대한 규칙을 정의하십시오. 지정된 URL 및 국가별로 작업을 적용할 수 있습니다(지원을 사용하지 않도록 " +"설정하거나 지원을 자동으로 열거나 버튼을 사용 가능하게 설정).
국가를 확인하려면 서버에 GeoIP을 설치해야 합니다. 그렇지 " +"않으면 규칙에서 국가가 고려되지 않습니다." #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_action @@ -80,7 +86,7 @@ msgstr "매트릭스 안에 있습니까?" #: code:addons/im_livechat/static/src/js/im_livechat.js:48 #, python-format msgid "Ask something ..." -msgstr "" +msgstr "무엇이든 물어보세요 ..." #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form @@ -91,28 +97,28 @@ msgstr "참석자" #. module: im_livechat #: selection:im_livechat.channel.rule,action:0 msgid "Auto popup" -msgstr "" +msgstr "자동 팝업" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_auto_popup_timer msgid "Auto popup timer" -msgstr "" +msgstr "자동 팝업 타이머" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_duration #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_duration msgid "Average duration" -msgstr "" +msgstr "평균 기간" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_nbr_message msgid "Average message" -msgstr "" +msgstr "평균 메시지" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_time_to_answer msgid "Average time to give the first answer to the visitor" -msgstr "" +msgstr "방문자에게 첫 번째 답변을 제공하는 데 걸린 평균 시간" #. module: im_livechat #. openerp-web @@ -125,7 +131,7 @@ msgstr "나쁨" #: model:ir.actions.act_window,name:im_livechat.im_livechat_canned_response_action #: model:ir.ui.menu,name:im_livechat.canned_responses msgid "Canned Responses" -msgstr "" +msgstr "취소된 답변" #. module: im_livechat #: model:ir.actions.act_window,help:im_livechat.im_livechat_canned_response_action @@ -135,6 +141,9 @@ msgid "" " replaced directly in your message, so that you can still edit\n" " it before sending." msgstr "" +"미리 준비된 응답을 사용하면 다음과 같이 입력하여 \n" +" 미리 작성된 응답을 메시지에 삽입할 수 있습니다 : shortcut\n" +"바로 가기는 메시지에서 직접 바뀌므로 보내기 전에 편집할 수 있습니다." #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id @@ -155,13 +164,13 @@ msgstr "채널 이름" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_rule_view_form msgid "Channel Rule" -msgstr "" +msgstr "채널 규칙" #. module: im_livechat #: model:ir.model,name:im_livechat.model_im_livechat_channel_rule #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form msgid "Channel Rules" -msgstr "" +msgstr "채널 규칙" #. module: im_livechat #: model:ir.ui.menu,name:im_livechat.support_channels @@ -205,7 +214,7 @@ msgstr "환경 설정" #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_channel_id #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_channel_id msgid "Conversation" -msgstr "" +msgstr "대화" #. module: im_livechat #. openerp-web @@ -226,7 +235,7 @@ msgstr "" #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form msgid "" "Copy and paste this code into your website, within the <head> tag:" -msgstr "" +msgstr "이 코드를 <head> 태그 내로 웹사이트에 복사하고 붙여 넣습니다 :" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_country_ids @@ -255,7 +264,7 @@ msgstr "" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search msgid "Creation date (hour)" -msgstr "" +msgstr "작성일(시간)" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search @@ -292,7 +301,7 @@ msgstr "" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_button_text msgid "Default text displayed on the Livechat Support Button" -msgstr "" +msgstr "실시간 채팅 지원 버튼에 표시할 기본 글자" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_auto_popup_timer @@ -301,13 +310,15 @@ msgid "" "selected action must be 'Auto popup' otherwise this parameter will not be " "taken into account." msgstr "" +"대화 창을 자동으로 열기 위한 지연시간(초 단위). 참고 : 선택한 작업은 '자동 팝업'이어야 합니다. 그렇지 않으면 이 매개 변수는 " +"고려되지 않습니다." #. module: im_livechat #. openerp-web #: code:addons/im_livechat/static/src/xml/im_livechat.xml:7 #, python-format msgid "Did we correctly answer your question ?" -msgstr "" +msgstr "우리가 당신의 질문에 제대로 대답했나요?" #. module: im_livechat #: model:ir.model,name:im_livechat.model_mail_channel @@ -325,13 +336,13 @@ msgstr "표시 이름" #. module: im_livechat #: selection:im_livechat.channel.rule,action:0 msgid "Display the button" -msgstr "" +msgstr "버튼 표시" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_duration #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_duration msgid "Duration of the conversation (in seconds)" -msgstr "" +msgstr "대화 지속 시간(초)" #. module: im_livechat #: model:ir.actions.act_window,help:im_livechat.im_livechat_channel_action @@ -339,13 +350,15 @@ msgid "" "Each channel has it's own URL that you can send by email to\n" " your customers in order to start chatting with you." msgstr "" +"각 채널에는 고객과 채팅을 시작하기 위해 \n" +" 이메일로 보낼 수 있는 자체 URL이 있습니다." #. module: im_livechat #. openerp-web #: code:addons/im_livechat/static/src/xml/im_livechat.xml:19 #, python-format msgid "Explain your note" -msgstr "" +msgstr "노트 설명" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form @@ -361,6 +374,8 @@ msgid "" "Given the order to find a matching rule. If 2 rules are matching for the " "given url/country, the one with the lowest sequence will be chosen." msgstr "" +"일치하는 규칙을 찾는 명령을 받았을 때. 주어진 url/국가에 대해 2개의 규칙이 일치하는 경우 가장 낮은 순서를 가진 규칙이 " +"선택됩니다." #. module: im_livechat #. openerp-web @@ -379,7 +394,7 @@ msgstr "다음으로 그룹화" #. module: im_livechat #: selection:im_livechat.channel.rule,action:0 msgid "Hide the button" -msgstr "" +msgstr "버튼 숨기기" #. module: im_livechat #: model:ir.actions.act_window,name:im_livechat.mail_channel_action @@ -391,7 +406,7 @@ msgstr "기록" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_start_date_hour msgid "Hour of start Date of session" -msgstr "" +msgstr "세션 시작 시간" #. module: im_livechat #. openerp-web @@ -403,14 +418,14 @@ msgstr "무엇을 도와 드릴까요?" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form msgid "How to use the Website Live Chat widget?" -msgstr "" +msgstr "웹사이트 실시간 채팅 위젯을 어떻게 사용합니까?" #. module: im_livechat #. openerp-web #: code:addons/im_livechat/static/src/xml/im_livechat.xml:15 #, python-format msgid "I don't want to rate this conversation" -msgstr "" +msgstr "이 대화를 평가하고 싶지 않습니다" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_id @@ -439,7 +454,7 @@ msgstr "가입 채널" #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search msgid "Last 24h" -msgstr "" +msgstr "최근 24시간" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.rating_rating_view_search_livechat @@ -503,7 +518,7 @@ msgstr "실시간 지원" #: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:21 #, python-format msgid "Livechat" -msgstr "" +msgstr "실시간 채팅" #. module: im_livechat #: model:ir.model,name:im_livechat.model_im_livechat_channel @@ -519,6 +534,8 @@ msgid "" "your company livechat session performance. Extract information about the " "missed sessions, the audiance, the duration of a session, etc." msgstr "" +"실시간 채팅 지원 채널 통계를 통해 회사의 실시간 채팅 채널 세션 성능을 쉽게 확인하고 분석할 수 있습니다. 결손 세션, 청취, 세션 " +"지속 시간 등에 대한 정보를 추출합니다." #. module: im_livechat #: model:ir.model,name:im_livechat.model_im_livechat_report_channel @@ -530,7 +547,7 @@ msgstr "" #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_channel_action #: model:ir.actions.act_window,name:im_livechat.im_livechat_report_operator_action msgid "Livechat Support Report Channel" -msgstr "" +msgstr "실시간 채팅 지원 보고서 채널" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_graph @@ -538,7 +555,7 @@ msgstr "" #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_graph #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_pivot msgid "Livechat Support Statistics" -msgstr "" +msgstr "실시간 채팅 지원 통계" #. module: im_livechat #: model:res.groups,name:im_livechat.im_livechat_group_manager @@ -548,7 +565,7 @@ msgstr "관리자" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_sequence msgid "Matching order" -msgstr "" +msgstr "일치하는 주문" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_image_medium @@ -568,7 +585,7 @@ msgstr "" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search msgid "Missed sessions" -msgstr "" +msgstr "빈 세션" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_name @@ -579,7 +596,7 @@ msgstr "이름" #: code:addons/im_livechat/models/mail_channel.py:125 #, python-format msgid "No history found" -msgstr "" +msgstr "기록이 없습니다" #. module: im_livechat #. openerp-web @@ -593,17 +610,17 @@ msgstr "현재 담당자가 없습니다, 나중에 다시 시도하십시오." #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_nbr_channel #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_nbr_channel msgid "Number of conversation" -msgstr "" +msgstr "대화 횟수" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_nbr_speaker msgid "Number of different speakers" -msgstr "" +msgstr "다른 발언자의 수" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_nbr_message msgid "Number of message in the conversation" -msgstr "" +msgstr "대화 내 메시지 수" #. module: im_livechat #. openerp-web @@ -623,7 +640,7 @@ msgstr "운영자" #. module: im_livechat #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat_operator msgid "Operator Analysis" -msgstr "" +msgstr "운영자 분석" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_user_ids @@ -644,7 +661,7 @@ msgstr "" msgid "" "Operators that do not show any activity In Odoo for more than 30 minutes " "will be considered as disconnected." -msgstr "" +msgstr "Odoo에서 30분 이상 활동이 없는 운영자는 연결이 끊어진 것으로 간주됩니다." #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form @@ -654,7 +671,7 @@ msgstr "선택 사항" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rating_percentage_satisfaction msgid "Percentage of happy ratings over the past 7 days" -msgstr "" +msgstr "지난 7일 동안의 행복도 평가 비율" #. module: im_livechat #: model:ir.model,name:im_livechat.model_rating_rating @@ -673,28 +690,28 @@ msgstr "" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban msgid "Rating: Bad" -msgstr "" +msgstr "평가 : 나쁨" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban msgid "Rating: Great" -msgstr "" +msgstr "평가 : 아주 좋음" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban msgid "Rating: Okay" -msgstr "" +msgstr "평가 : 보통" #. module: im_livechat #: model:ir.actions.act_window,name:im_livechat.rating_rating_action_view_livechat_rating msgid "Ratings for livechat channel" -msgstr "" +msgstr "실시간 채팅 채널 평가 등급" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url msgid "" "Regular expression specifying the web pages this rule will be applied on." -msgstr "" +msgstr "이 규칙이 적용될 웹 페이지를 지정하는 정규식입니다." #. module: im_livechat #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat @@ -721,29 +738,29 @@ msgstr "검색 기록" #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search msgid "Search report" -msgstr "" +msgstr "검색 보고서" #. module: im_livechat #: code:addons/im_livechat/models/mail_channel.py:113 #, python-format msgid "See 15 last visited pages" -msgstr "" +msgstr "최근에 방문한 15 페이지 보기" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree msgid "Session Date" -msgstr "" +msgstr "세션 날짜" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form msgid "Session Form" -msgstr "" +msgstr "세션 양식" #. module: im_livechat #: model:ir.ui.menu,name:im_livechat.menu_reporting_livechat_channel msgid "Session Statistics" -msgstr "" +msgstr "세션 통계" #. module: im_livechat #: model:ir.actions.act_window,name:im_livechat.mail_channel_action_from_livechat_channel @@ -756,7 +773,7 @@ msgstr "세션" #. module: im_livechat #: model:ir.ui.menu,name:im_livechat.session_history msgid "Sessions History" -msgstr "" +msgstr "세션 기록" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image_small @@ -772,13 +789,13 @@ msgstr "" #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_start_date #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_start_date msgid "Start Date of session" -msgstr "" +msgstr "세션 시작일" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_channel_start_date #: model:ir.model.fields,help:im_livechat.field_im_livechat_report_operator_start_date msgid "Start date of the conversation" -msgstr "" +msgstr "대화 시작일" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_button_text @@ -788,12 +805,12 @@ msgstr "버튼 글자" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_channel_id msgid "The channel of the rule" -msgstr "" +msgstr "채녈 규칙" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_name msgid "The name of the channel" -msgstr "" +msgstr "채널 이름" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_country_ids @@ -804,6 +821,8 @@ msgid "" "located in these 2 countries. This feature requires GeoIP installed on your " "server." msgstr "" +"규칙은 해당 국가에만 적용됩니다. 예 : '벨기에' 및 '미국'을 선택하고 '버튼 숨기기'로 설정하면 채팅 버튼은 이 두 국가에 위치한 " +"방문자의 지정된 URL에선 숨겨집니다. 이 기능을 사용하려면 서버에 GeoIP이 설치되어 있어야 합니다." #. module: im_livechat #: model:res.groups,comment:im_livechat.im_livechat_group_manager @@ -832,7 +851,7 @@ msgstr "이 필드는 1024x1024px로 제한된 그룹 사진으로 사용하는 msgid "" "This is an automated 'welcome' message that your visitor will see when they " "initiate a new conversation." -msgstr "" +msgstr "이것은 새로운 대화를 시작할 때 방문자에게 표시되는 자동화된 '환영 메시지'입니다." #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_image_small @@ -842,24 +861,24 @@ msgstr "미리보기 이미지" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_time_to_answer msgid "Time to answer" -msgstr "" +msgstr "답변 시간" #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search msgid "Treated sessions" -msgstr "" +msgstr "처리된 세션" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_regex_url msgid "URL Regex" -msgstr "" +msgstr "URL 정규식" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_web_page msgid "" "URL to a static page where you client can discuss with the operator of the " "channel." -msgstr "" +msgstr "문의자가 채널 운영자와 상의할 수 있는 정적 페이지의 URL입니다." #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_uuid @@ -887,7 +906,7 @@ msgstr "웹 페이지" #. module: im_livechat #: model:ir.actions.act_window,name:im_livechat.im_livechat_channel_action msgid "Website Live Chat Channels" -msgstr "" +msgstr "웹사이트 실시간 채팅 채널" #. module: im_livechat #: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_default_message @@ -901,6 +920,8 @@ msgid "" " to integrate the website live chat widget, allowing your website\n" " visitors to talk in real time with your operators." msgstr "" +"웹사이트 실시간 채팅 위젯을 통합하려는 각 웹 사이트에 대한 채널을 작성하여 웹사이트 방문자가 운영자와 실시간으로 대화할 수 있도록 할 " +"수 있습니다." #. module: im_livechat #: model:ir.actions.act_window,help:im_livechat.mail_channel_action @@ -932,4 +953,4 @@ msgstr "아래 url을 복사해서 고객이나 공급업체에 이메일로 전 #. module: im_livechat #: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_rule_view_form msgid "seconds" -msgstr "" +msgstr "초" diff --git a/addons/link_tracker/i18n/ko.po b/addons/link_tracker/i18n/ko.po index 817cf83dd4e..80a977460f2 100644 --- a/addons/link_tracker/i18n/ko.po +++ b/addons/link_tracker/i18n/ko.po @@ -7,13 +7,15 @@ # Link Up링크업 , 2018 # Seongseok Shin , 2018 # Linkup , 2018 +# JH CHOI , 2019 +# 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: Linkup , 2018\n" +"PO-Revision-Date: 2017-09-20 10:19+0000\n" +"Last-Translator: JH CHOI , 2019\n" "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +83,7 @@ msgstr "파비콘 소스" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_short_url_host msgid "Host of the short URL" -msgstr "" +msgstr "단축 URL의 호스트" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_id @@ -141,17 +143,17 @@ msgstr "페이지 제목" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_redirected_url msgid "Redirected URL" -msgstr "" +msgstr "리디렉션 URL" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_code msgid "Short URL Code" -msgstr "" +msgstr "단축 URL 코드" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code msgid "Short URL code" -msgstr "" +msgstr "단축 URL 코드" #. module: link_tracker #: model:ir.actions.act_window,name:link_tracker.action_view_click_statistics @@ -161,60 +163,60 @@ msgstr "클릭 수 통계" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_url msgid "Target URL" -msgstr "" +msgstr "대상 URL" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter msgid "Title and URL" -msgstr "" +msgstr "제목과 URL" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter msgid "Tracked Link" -msgstr "" +msgstr "추적 링크" #. module: link_tracker #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_short_url msgid "Tracked URL" -msgstr "" +msgstr "추적 URL" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form msgid "Visit Page" -msgstr "" +msgstr "방문 페이지" #. module: link_tracker #: code:addons/link_tracker/models/link_tracker.py:141 #, python-format msgid "Visit Webpage" -msgstr "" +msgstr "방문 웹사이트" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form msgid "Website Link" -msgstr "" +msgstr "웹사이트 링크" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_form #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_graph msgid "Website Link Clicks" -msgstr "" +msgstr "웹사이트 링크 클릭" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form_stats msgid "Website Link Graph" -msgstr "" +msgstr "웹사이트 링크 그래프" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_graph #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_tree msgid "Website Links" -msgstr "" +msgstr "웹사이트 링크" #. module: link_tracker #: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_click_tree msgid "Website Links Clicks" -msgstr "" +msgstr "웹사이트 링크 클릭" #. module: link_tracker #: model:ir.model,name:link_tracker.model_link_tracker @@ -234,4 +236,4 @@ msgstr "" #. module: link_tracker #: model:ir.actions.act_window,name:link_tracker.action_link_tracker_stats msgid "link.tracker.form.graph.action" -msgstr "" +msgstr "link.tracker.form.graph.action" diff --git a/addons/lunch/i18n/ko.po b/addons/lunch/i18n/ko.po index 81c6e21b334..4df0fe7292c 100644 --- a/addons/lunch/i18n/ko.po +++ b/addons/lunch/i18n/ko.po @@ -43,7 +43,7 @@ msgstr "" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form msgid "Balance" -msgstr "" +msgstr "잔액" #. module: lunch #: model:ir.ui.view,arch_db:lunch.report_lunch_order @@ -57,11 +57,14 @@ msgid "" " An expense is automatically created at the order receipt.
\n" " A payment represents the employee reimbursement to the company." msgstr "" +"현금 이동은 비용일 수도 있고 지불일 수도 있습니다.
\n" +" 비용은 주문 영수증에서 자동으로 생성됩니다.
\n" +" 지불은 회사에 대한 직원 변제를 나타냅니다." #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_product_action msgid "A product is defined by its name, category, price and vendor." -msgstr "" +msgstr "제품은 이름, 범주, 가격 및 공급업체로 정의됩니다." #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_active @@ -87,7 +90,7 @@ msgstr "경고" #: model:ir.model.fields,field_description:lunch.field_lunch_order_alerts #: model:ir.ui.menu,name:lunch.lunch_alert_menu msgid "Alerts" -msgstr "" +msgstr "경고" #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_alert_action @@ -95,6 +98,8 @@ msgid "" "Alerts are used to warn employee from possible issues concerning the lunch orders.\n" " To create a lunch alert you have to define its recurrence, the time interval during which the alert should be executed and the message to display." msgstr "" +"알림은 직원에게 점심 주문과 관련된 문제를 경고하는 데 사용됩니다.\n" +"                 점심 알림을 만들려면 알림을 실행해야 하는 시간 간격과 표시할 메시지의 반복을 정의해야 합니다." #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_amount @@ -115,17 +120,17 @@ msgstr "보관완료" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_balance_visible msgid "Balance Visible" -msgstr "" +msgstr "잔액 표시" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_start_hour msgid "Between" -msgstr "" +msgstr "사이" #. module: lunch #: model:ir.ui.view,arch_db:lunch.view_lunch_alert_kanban msgid "Between:" -msgstr "" +msgstr "사이 :" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search_2 @@ -150,14 +155,14 @@ msgstr "공급업체별" #. module: lunch #: model:ir.model.fields,help:lunch.field_lunch_cashmove_description msgid "Can be an order or a payment" -msgstr "" +msgstr "주문 또는 지불 가능" #. module: lunch #: model:ir.model.fields,help:lunch.field_lunch_cashmove_amount msgid "" "Can be positive (payment) or negative (order or payment if user wants to get" " his money back)" -msgstr "" +msgstr "긍정(지불) 또는 부정(사용자가 돈을 돌려받기를 원하는 경우의 주문 또는 지불) 가능" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban @@ -175,12 +180,12 @@ msgstr "취소됨" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_cashmove msgid "Cash Move" -msgstr "" +msgstr "현금 이동" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_cash_move_balance msgid "Cash Move Balance" -msgstr "" +msgstr "현금 이동 잔액" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id @@ -228,12 +233,12 @@ msgstr "환경 설정" #: model:ir.actions.act_window,name:lunch.lunch_cashmove_action_control_accounts #: model:ir.ui.menu,name:lunch.lunch_cashmove_menu_control_accounts msgid "Control Accounts" -msgstr "" +msgstr "계정 관리" #. module: lunch #: model:ir.actions.act_window,name:lunch.lunch_order_line_action_control_suppliers msgid "Control Vendors" -msgstr "" +msgstr "공급업체 관리" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_create_uid @@ -303,17 +308,17 @@ msgstr "표시 이름" #: code:addons/lunch/static/src/xml/lunch.xml:7 #, python-format msgid "Don't forget the alerts displayed in the reddish area" -msgstr "" +msgstr "붉은 영역에 표시된 경고를 잊지 마세요." #. module: lunch #: model:ir.ui.menu,name:lunch.lunch_cashmove_menu_payment msgid "Employee Payments" -msgstr "" +msgstr "직원 지불" #. module: lunch #: model:ir.model.fields,help:lunch.field_lunch_order_line_lucky_is_max_budget msgid "Enable this option to set a maximal budget for your lucky order." -msgstr "" +msgstr "행운의 주문에 대한 최대 예산을 설정하려면 이 옵션을 실행하십시오." #. module: lunch #: selection:lunch.alert,alert_type:0 @@ -341,7 +346,7 @@ msgstr "" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form msgid "Feeling Lucky" -msgstr "" +msgstr "행운의 느낌" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_friday @@ -360,12 +365,12 @@ msgstr "그룹화" msgid "" "Helps you handle your lunch needs, if you are a manager you will be able to " "create new products, cashmoves and to confirm or cancel orders." -msgstr "" +msgstr "점심 식사 요구를 처리하는 데 도움이 되며, 관리자라면 신제품, 현금 이동을 만들고 주문을 확인하거나 취소할 수 있습니다." #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_product_category_action msgid "Here you can access all categories for the lunch products." -msgstr "" +msgstr "여기서 점심 제품의 모든 범주에 접근할 수 있습니다." #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_cashmove_action_payment @@ -377,7 +382,7 @@ msgstr "" #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier msgid "Here you can see today's orders grouped by vendors." -msgstr "" +msgstr "여기에서 현재 주문을 공급 업체별로 그룹화할 수 있습니다." #. module: lunch #: model:ir.actions.act_window,help:lunch.lunch_cashmove_action_account @@ -389,18 +394,18 @@ msgstr "" #. module: lunch #: model:ir.ui.view,arch_db:lunch.view_lunch_order_line_lucky msgid "I'm feeling lucky" -msgstr "" +msgstr "전 운이 좋은것 같아요" #. module: lunch #: model:ir.actions.act_window,name:lunch.action_lunch_order_line_lucky #: model:ir.ui.view,arch_db:lunch.view_lunch_order_line_lucky msgid "I'm feeling lucky today !" -msgstr "" +msgstr "전 오늘 운이 좋은 것 같아요" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_is_max_budget msgid "I'm not feeling rich" -msgstr "" +msgstr "전 부자는 아니에요" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_id @@ -416,7 +421,7 @@ msgstr "ID" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_state msgid "Is an order or a payment" -msgstr "" +msgstr "주문 또는 지불 여부" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert___last_update @@ -471,7 +476,7 @@ msgstr "점심 알림" #: code:addons/lunch/models/lunch.py:265 #, python-format msgid "Lunch Cashmove" -msgstr "" +msgstr "점심 현금 이동" #. module: lunch #: code:addons/lunch/models/lunch.py:66 @@ -511,7 +516,7 @@ msgstr "관리자" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_max_budget msgid "Max Budget" -msgstr "" +msgstr "최대 예산" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_alert_message @@ -527,7 +532,7 @@ msgstr "월요일" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search msgid "My Account grouped" -msgstr "" +msgstr "내 계정 그룹화" #. module: lunch #: model:ir.ui.menu,name:lunch.menu_lunch_title @@ -553,18 +558,18 @@ msgstr "신규" #: model:ir.actions.act_window,name:lunch.lunch_order_action_form #: model:ir.ui.menu,name:lunch.lunch_order_menu_form msgid "New Order" -msgstr "" +msgstr "새 주문" #. module: lunch #: code:addons/lunch/wizard/lucky_order.py:39 #, python-format msgid "No product is matching your request. Now you will starve to death." -msgstr "" +msgstr "요청한 제품과 일치하는 제품이 없습니다. 이제 굶어 죽을지도 모릅니다." #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search msgid "Not Received" -msgstr "" +msgstr "아직 받지 못함" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_note @@ -575,19 +580,19 @@ msgstr "노트" #: code:addons/lunch/models/lunch.py:225 #, python-format msgid "Only your lunch manager cancels the orders." -msgstr "" +msgstr "점심 관리자만 주문을 취소합니다." #. module: lunch #: code:addons/lunch/models/lunch.py:194 #, python-format msgid "Only your lunch manager processes the orders." -msgstr "" +msgstr "점심 관리자만 주문을 처리합니다." #. module: lunch #: code:addons/lunch/models/lunch.py:214 #, python-format msgid "Only your lunch manager sets the orders as received." -msgstr "" +msgstr "점심 관리자만이 받은 대로 주문을 정합니다." #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_order_id @@ -607,7 +612,7 @@ msgstr "주문 달" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree msgid "Order lines Tree" -msgstr "" +msgstr "주문 명세 내역" #. module: lunch #: selection:lunch.order.line,state:0 @@ -617,18 +622,18 @@ msgstr "주문함" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_view_form msgid "Orders Form" -msgstr "" +msgstr "주문서 양식" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_view_tree msgid "Orders Tree" -msgstr "" +msgstr "주문 트리" #. module: lunch #: model:ir.actions.act_window,name:lunch.lunch_order_line_action_by_supplier #: model:ir.ui.menu,name:lunch.lunch_order_line_menu_control_suppliers msgid "Orders by Vendor" -msgstr "" +msgstr "공급업체별 주문" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search @@ -639,17 +644,17 @@ msgstr "결제" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_ids msgid "Previous Order" -msgstr "" +msgstr "이전 주문" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_previous_order_widget msgid "Previous Order Widget" -msgstr "" +msgstr "이전 주문 위젯" #. module: lunch #: model:ir.ui.menu,name:lunch.lunch_order_menu_tree msgid "Previous Orders" -msgstr "" +msgstr "이전 주문서" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_price @@ -685,7 +690,7 @@ msgstr "제품 범주" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_product_category_view_form msgid "Product Category:" -msgstr "" +msgstr "상품 범주 :" #. module: lunch #: model:ir.model.fields,field_description:lunch.field_lunch_order_line_name @@ -695,7 +700,7 @@ msgstr "제품명" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_product_view_search msgid "Product Search" -msgstr "" +msgstr "상품 찾기" #. module: lunch #: model:ir.actions.act_window,name:lunch.lunch_product_action @@ -708,12 +713,12 @@ msgstr "제품" #: model:ir.ui.view,arch_db:lunch.lunch_product_category_view_form #: model:ir.ui.view,arch_db:lunch.lunch_product_view_form msgid "Products Form" -msgstr "" +msgstr "상품 양식" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_product_view_tree msgid "Products Tree" -msgstr "" +msgstr "상품 트리" #. module: lunch #: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po index 196d953c02c..ffa903310fd 100644 --- a/addons/mail/i18n/cs.po +++ b/addons/mail/i18n/cs.po @@ -5434,13 +5434,13 @@ msgstr "V tomto kanále jste sám." #: code:addons/mail/models/mail_channel.py:685 #, python-format msgid "You are in a private conversation with @%s." -msgstr "" +msgstr "Jste v soukromém rozhovoru s @%s." #. module: mail #: code:addons/mail/models/mail_channel.py:680 #, python-format msgid "You are in channel #%s." -msgstr "" +msgstr "Jste v chatovacím kanálu číslo %s." #. module: mail #. openerp-web diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po index 87fa6ab3f32..4da162633b6 100644 --- a/addons/mail/i18n/ko.po +++ b/addons/mail/i18n/ko.po @@ -2186,7 +2186,7 @@ msgstr "팔로우 된 자원의 ID" #: code:addons/mail/static/src/xml/client_action.xml:203 #, python-format msgid "Idle" -msgstr "" +msgstr "대기" #. module: mail #: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po index 4e117d5f50e..9eab52a0f47 100644 --- a/addons/mail/i18n/ro.po +++ b/addons/mail/i18n/ro.po @@ -392,6 +392,12 @@ msgid "" " The email will be sent for all the records selected in the list.
\n" " Confirming this wizard will probably take a few minutes blocking your browser." msgstr "" +"\n" +"Toate înregistrările care se potrivesc cu filtrul dvs. actual de căutare vor fi trimise prin poștă,\n" +" nu numai ID-urile selectate în vizualizarea listei. \n" +"
\n" +"E-mailul va fi trimis pentru toate înregistrările selectate în listă.
\n" +"Confirmând că acest expert va dura probabil câteva minute și va bloca browserul." #. module: mail #: model:ir.ui.view,arch_db:mail.message_activity_done diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po index ba087fd96fa..214ca9fb555 100644 --- a/addons/mrp/i18n/ja.po +++ b/addons/mrp/i18n/ja.po @@ -14,7 +14,7 @@ # 城谷 龍弥 , 2018 # Masako Ogawa , 2018 # 森岡広道 , 2018 -# Yoshi Tashiro , 2018 +# Yoshi Tashiro , 2019 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:06+0000\n" "PO-Revision-Date: 2017-09-20 10:19+0000\n" -"Last-Translator: Yoshi Tashiro , 2018\n" +"Last-Translator: Yoshi Tashiro , 2019\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3303,7 +3303,7 @@ msgstr "製造ボタンを押下または作業オーダを処理して、完成 #: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button #: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button msgid "Used In" -msgstr "" +msgstr "被使用" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_user_id diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po index d303bd60775..509c63d6b0f 100644 --- a/addons/mrp/i18n/ko.po +++ b/addons/mrp/i18n/ko.po @@ -100,6 +100,8 @@ msgid "" "" msgstr "" +"" #. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view @@ -2374,7 +2376,7 @@ msgstr "사유" #: model:ir.model,name:mrp.model_mrp_product_produce #: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard msgid "Record Production" -msgstr "" +msgstr "제품 기록" #. module: mrp #: model:ir.model,name:mrp.model_mrp_product_produce_line diff --git a/addons/mrp_byproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po index 32f0ebdb398..09da938e38c 100644 --- a/addons/mrp_byproduct/i18n/ko.po +++ b/addons/mrp_byproduct/i18n/ko.po @@ -3,17 +3,18 @@ # * mrp_byproduct # # Translators: -# Martin Trigaux, 2017 # Link Up링크업 , 2018 # Mark Lee , 2018 -# 최재호 , 2018 +# Martin Trigaux, 2018 +# JH CHOI , 2019 +# 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: 최재호 , 2018\n" +"PO-Revision-Date: 2017-09-20 10:19+0000\n" +"Last-Translator: JH CHOI , 2019\n" "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +106,7 @@ msgstr "생산" #. module: mrp_byproduct #: model:ir.model,name:mrp_byproduct.model_mrp_product_produce msgid "Record Production" -msgstr "" +msgstr "제품 기록" #. module: mrp_byproduct #: model:ir.model,name:mrp_byproduct.model_stock_move diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po index 0f6f382e0d3..7ba9e2c61d3 100644 --- a/addons/purchase/i18n/ko.po +++ b/addons/purchase/i18n/ko.po @@ -225,6 +225,8 @@ msgid "" "" msgstr "" +"" #. module: purchase #: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po index 5f1a81fa88a..58be13fd6d5 100644 --- a/addons/purchase/i18n/sk.po +++ b/addons/purchase/i18n/sk.po @@ -615,7 +615,7 @@ msgstr "Kontrolná politika" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_stock_move_created_purchase_line_id msgid "Created Purchase Order Line" -msgstr "" +msgstr "Vytvorená položka nákupnej objednávky" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_create_uid @@ -891,7 +891,7 @@ msgstr "Je dodané" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_config_settings_is_installed_sale msgid "Is the Sale Module Installed" -msgstr "" +msgstr "Je inštalovaný modul predaja" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order___last_update @@ -1173,7 +1173,7 @@ msgstr "Objednané množstvá" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_orderpoint_id msgid "Orderpoint" -msgstr "" +msgstr "Bod objednávky" #. module: purchase #: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase @@ -1614,7 +1614,7 @@ msgstr "Žiadosť o cenovu ponuku #" #. module: purchase #: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase msgid "Request your vendors to deliver to your customers" -msgstr "" +msgstr "Vyžiadať doručenie dodávateľom priamo vašim zákazníkom" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_rfq @@ -1642,7 +1642,7 @@ msgstr "Vrátiť výber" #. module: purchase #: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock msgid "Schedule receivings earlier to avoid delays" -msgstr "" +msgstr "Plánovať príjmy tovaru skôr pre obmedzenie meškaní" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_date_planned @@ -1813,6 +1813,8 @@ msgid "" "The quantities on your purchase order indicate less than billed. You should " "ask for a refund. " msgstr "" +"Množstvá na nákupnej objednávke sú menšie ako zaplatené. Treba žiadať " +"dobropis." #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_rfq @@ -1926,7 +1928,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order_picking_type_id msgid "This will determine operation type of incoming shipment" -msgstr "" +msgstr "Toto určí typ operácie prichádzajúcej zásielky" #. module: purchase #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po index 558ed7db56b..c34f782cebc 100644 --- a/addons/sale/i18n/cs.po +++ b/addons/sale/i18n/cs.po @@ -2633,6 +2633,7 @@ msgstr "" #: selection:product.template,service_type:0 msgid "Timesheets on project (one fare per SO/Project)" msgstr "" +"Časové rozvrhy projektu (jedno jízdné na Obchodní objednávku / Projekt)" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line_qty_to_invoice diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po index 7205ad30552..2cb50ac05cb 100644 --- a/addons/sale/i18n/ko.po +++ b/addons/sale/i18n/ko.po @@ -8,8 +8,8 @@ # Martin Trigaux, 2018 # Link Up링크업 , 2018 # Seongseok Shin , 2018 -# JH CHOI , 2019 # Linkup , 2019 +# JH CHOI , 2019 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:07+0000\n" "PO-Revision-Date: 2017-09-20 10:23+0000\n" -"Last-Translator: Linkup , 2019\n" +"Last-Translator: JH CHOI , 2019\n" "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -243,6 +243,8 @@ msgid "" "" msgstr "" +"" #. module: sale #: model:ir.ui.view,arch_db:sale.portal_my_orders diff --git a/addons/sale_stock/i18n/ko.po b/addons/sale_stock/i18n/ko.po index d758da96c77..8e926a47414 100644 --- a/addons/sale_stock/i18n/ko.po +++ b/addons/sale_stock/i18n/ko.po @@ -38,6 +38,8 @@ msgid "" "" msgstr "" +"" #. module: sale_stock #: model:ir.ui.view,arch_db:sale_stock.report_delivery_document_inherit_sale_stock diff --git a/addons/sale_stock/i18n/uk.po b/addons/sale_stock/i18n/uk.po index 7cc9eeebb59..6f7bfad4282 100644 --- a/addons/sale_stock/i18n/uk.po +++ b/addons/sale_stock/i18n/uk.po @@ -30,7 +30,7 @@ msgid "" "There are %s %s available accross all warehouses." msgstr "" "\n" -"Є %s %sдоступне на всіх складах." +"В наявності %s %s на всіх складах." #. module: sale_stock #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock @@ -256,8 +256,8 @@ msgid "" "every 24 hours." msgstr "" "Бронюючи товари вручну в замовленнях на доставку або керуючи планувальником," -" рекомендується краще керувати пріоритетами у випадку довгого строку " -"обслуговування клієнтів та/або частого вилучення запасів. За замовчуванням, " +" рекомендується краще керувати пріоритетами у випадку довгого терміну " +"обслуговування клієнтів та/або частого вилучення запасів. За замовчуванням " "планувальник запускається автоматично кожні 24 години." #. module: sale_stock @@ -268,7 +268,7 @@ msgstr "Маршрут" #. module: sale_stock #: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale msgid "Routes for Sales Order Lines" -msgstr "Маршрути для рідків замовлення на продаж" +msgstr "Маршрути для рядків замовлення на продаж" #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_stock_move_sale_line_id diff --git a/addons/sale_timesheet/i18n/ko.po b/addons/sale_timesheet/i18n/ko.po index a76aea1a01d..22cf9f046a4 100644 --- a/addons/sale_timesheet/i18n/ko.po +++ b/addons/sale_timesheet/i18n/ko.po @@ -428,7 +428,7 @@ msgstr "작업 기록" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_timesheet_cost msgid "Timesheet Cost" -msgstr "" +msgstr "작업 기록 비용" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_timesheet_count @@ -487,4 +487,4 @@ msgstr "" #. module: sale_timesheet #: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form msgid "per hour" -msgstr "" +msgstr "시간당" diff --git a/addons/sms/i18n/pl.po b/addons/sms/i18n/pl.po index f3e390525da..d14359ee4a3 100644 --- a/addons/sms/i18n/pl.po +++ b/addons/sms/i18n/pl.po @@ -3,21 +3,23 @@ # * sms # # Translators: -# Marcin Młynarczyk , 2017 -# zbik2607 , 2017 -# Martin Trigaux, 2017 +# Dariusz Żbikowski , 2017 # Piotr Szlązak , 2017 +# Marcin Młynarczyk , 2017 # Grzegorz Grzelak , 2017 # Paweł Michoń , 2017 +# Martin Trigaux, 2017 # Wiktor Kaźmierczak , 2018 # Maja Stawicka , 2018 +# Piotr Cierkosz , 2019 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-10 11:35+0000\n" -"PO-Revision-Date: 2017-10-10 11:35+0000\n" -"Last-Translator: Maja Stawicka , 2018\n" +"PO-Revision-Date: 2017-09-20 12:12+0000\n" +"Last-Translator: Piotr Cierkosz , 2019\n" "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +68,7 @@ msgstr "ID" #: code:addons/sms/models/mail_thread.py:53 #, python-format msgid "Insufficient credit, unable to send SMS message: %s" -msgstr "" +msgstr "Niewystarczający stan konta, nie udało się wysłać SMS: %s" #. module: sms #: model:ir.model.fields,field_description:sms.field_sms_api___last_update diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po index a578dc0d61e..2f7cd27d271 100644 --- a/addons/stock/i18n/fi.po +++ b/addons/stock/i18n/fi.po @@ -18,12 +18,12 @@ # Martin Trigaux, 2017 # Jukka Paulin , 2018 # Veikko Väätäjä , 2018 -# Jarmo Kortetjärvi , 2018 # Heikki Katajisto , 2018 # Mikko Närjänen , 2018 # Jussi Heikkilä , 2019 # Simo Suurla , 2019 # Tuomo Aura , 2019 +# Jarmo Kortetjärvi , 2019 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:06+0000\n" "PO-Revision-Date: 2017-09-20 10:24+0000\n" -"Last-Translator: Tuomo Aura , 2019\n" +"Last-Translator: Jarmo Kortetjärvi , 2019\n" "Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -688,7 +688,7 @@ msgstr "Aktiivinen" #: model:ir.ui.view,arch_db:stock.view_picking_form msgid "" "Add an internal note that will be printed on the Picking Operations sheet" -msgstr "" +msgstr "Lisää sisäinen viesti, joka näkyy keräilylistalla" #. module: stock #: model:ir.model.fields,help:stock.field_res_config_settings_group_stock_adv_location @@ -1930,7 +1930,7 @@ msgstr "Lähetysluettelo" #. module: stock #: model:ir.model.fields,field_description:stock.field_procurement_group_move_type msgid "Delivery Type" -msgstr "" +msgstr "Toimitustapa" #. module: stock #: model:ir.model.fields,help:stock.field_product_product_route_ids diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po index abb062ea27d..b3f2f971621 100644 --- a/addons/stock/i18n/ja.po +++ b/addons/stock/i18n/ja.po @@ -2052,7 +2052,7 @@ msgstr "宛先ルート" #: model:ir.ui.view,arch_db:stock.view_picking_form #, python-format msgid "Detailed Operations" -msgstr "" +msgstr "詳細オペレーション" #. module: stock #: model:ir.ui.view,arch_db:stock.stock_location_path_form diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po index 98e929e55d6..1c52109ff11 100644 --- a/addons/stock/i18n/ro.po +++ b/addons/stock/i18n/ro.po @@ -2066,7 +2066,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_stock_move_move_dest_ids #: model:ir.ui.view,arch_db:stock.view_move_form msgid "Destination Moves" -msgstr "" +msgstr "Mișcări destinație" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_move_line_result_package_id @@ -5888,7 +5888,7 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_picking_show_operations msgid "Show Operations" -msgstr "" +msgstr "Afișare operații" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_reserved diff --git a/addons/stock_account/i18n/ro.po b/addons/stock_account/i18n/ro.po index 389b12fc9bc..e0e0049514d 100644 --- a/addons/stock_account/i18n/ro.po +++ b/addons/stock_account/i18n/ro.po @@ -606,7 +606,7 @@ msgstr "" #: code:addons/stock_account/models/product.py:245 #, python-format msgid "Valuation at date" -msgstr "" +msgstr "Evaluare la data" #. module: stock_account #: model:ir.model.fields,field_description:stock_account.field_product_product_stock_value diff --git a/addons/theme_default/i18n/pl.po b/addons/theme_default/i18n/pl.po index 6b9e9483fae..209395c3e1e 100644 --- a/addons/theme_default/i18n/pl.po +++ b/addons/theme_default/i18n/pl.po @@ -3,16 +3,18 @@ # * theme_default # # Translators: +# Dariusz Żbikowski , 2017 +# Martin Trigaux, 2017 # Piotr Szlązak , 2017 -# zbik2607 , 2017 -# Martin Trigaux , 2017 +# Piotr Cierkosz , 2019 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 09:00+0000\n" -"PO-Revision-Date: 2015-08-25 09:00+0000\n" -"Last-Translator: Martin Trigaux , 2017\n" +"PO-Revision-Date: 2017-09-20 10:24+0000\n" +"Last-Translator: Piotr Cierkosz , 2019\n" "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +68,7 @@ msgstr "dostosuj ten brak motywu" #. module: theme_default #: model:ir.ui.view,arch_db:theme_default.customize_modal msgid "Emerald" -msgstr "" +msgstr "Emerald" #. module: theme_default #: model:ir.ui.view,arch_db:theme_default.customize_modal diff --git a/addons/web_settings_dashboard/i18n/he.po b/addons/web_settings_dashboard/i18n/he.po index 28409387e32..b03bf26f2a3 100644 --- a/addons/web_settings_dashboard/i18n/he.po +++ b/addons/web_settings_dashboard/i18n/he.po @@ -3,16 +3,18 @@ # * web_settings_dashboard # # Translators: -# Yihya Hugirat , 2017 # Martin Trigaux, 2018 # Fishfur A Banter , 2018 +# Yihya Hugirat , 2018 +# hed shefetr , 2019 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.saas~18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 09:54+0000\n" -"PO-Revision-Date: 2017-09-20 09:54+0000\n" -"Last-Translator: Fishfur A Banter , 2018\n" +"PO-Revision-Date: 2017-09-20 10:25+0000\n" +"Last-Translator: hed shefetr , 2019\n" "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +64,7 @@ msgstr "" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:63 #, python-format msgid "Active Users" -msgstr "" +msgstr "משתמשים פעילים" #. module: web_settings_dashboard #. openerp-web diff --git a/addons/website/i18n/sl.po b/addons/website/i18n/sl.po index 0329e212da7..2d40a671b4f 100644 --- a/addons/website/i18n/sl.po +++ b/addons/website/i18n/sl.po @@ -1038,7 +1038,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_page_arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Naziv Arch datoteke" #. module: website #. openerp-web @@ -2413,7 +2413,7 @@ msgstr "" #: model:ir.model.fields,field_description:website.field_website_menu_is_visible #: model:ir.model.fields,field_description:website.field_website_page_is_visible msgid "Is Visible" -msgstr "" +msgstr "Je vidno" #. module: website #: model:ir.ui.view,arch_db:website.website_planner @@ -3087,7 +3087,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_page_website_indexed msgid "Page Indexed" -msgstr "" +msgstr "Indeksirana stran" #. module: website #. openerp-web @@ -3118,7 +3118,7 @@ msgstr "Naslov strani" #: model:ir.model.fields,field_description:website.field_website_page_url #, python-format msgid "Page URL" -msgstr "" +msgstr "URL spletne strani" #. module: website #: code:addons/website/models/website.py:221 @@ -3338,7 +3338,7 @@ msgstr "Objavljeno" #: model:ir.model.fields,field_description:website.field_website_page_date_publish #, python-format msgid "Publishing Date" -msgstr "" +msgstr "Datum objave" #. module: website #: model:ir.ui.view,arch_db:website.http_error_debug @@ -3374,7 +3374,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect_url_from msgid "Redirect From" -msgstr "" +msgstr "Preusmeri iz" #. module: website #. openerp-web @@ -3386,12 +3386,12 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect_url_to msgid "Redirect To" -msgstr "" +msgstr "Preusmeri na" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect_type msgid "Redirection Type" -msgstr "" +msgstr "Tip preusmeritve" #. module: website #: model:ir.ui.menu,name:website.menu_website_redirect_list @@ -3418,12 +3418,12 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_page_menu_ids msgid "Related Menus" -msgstr "" +msgstr "Povezani meniji" #. module: website #: model:ir.model.fields,field_description:website.field_website_menu_page_id msgid "Related Page" -msgstr "" +msgstr "Povezana stran" #. module: website #. openerp-web @@ -4172,7 +4172,7 @@ msgstr "Prikaz načina dedovanja" #. module: website #: model:ir.model.fields,field_description:website.field_website_page_inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Pogledi, ki se podedujejo od trenutnega" #. module: website #: model:ir.model.fields,field_description:website.field_blog_post_website_published diff --git a/addons/website_crm_partner_assign/i18n/ro.po b/addons/website_crm_partner_assign/i18n/ro.po index 38d3b53ad8f..07b812312b8 100644 --- a/addons/website_crm_partner_assign/i18n/ro.po +++ b/addons/website_crm_partner_assign/i18n/ro.po @@ -882,7 +882,7 @@ msgstr "Nivel Partener" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_partner_location msgid "Partner Location" -msgstr "" +msgstr "Locații partener" #. module: website_crm_partner_assign #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_partner_assign_form diff --git a/addons/website_forum/i18n/pl.po b/addons/website_forum/i18n/pl.po index 413a458788b..37e33be6f05 100644 --- a/addons/website_forum/i18n/pl.po +++ b/addons/website_forum/i18n/pl.po @@ -8,14 +8,14 @@ # Ludwik Trammer , 2017 # Zdzisław Krajewski , 2017 # Judyta Kaźmierczak , 2017 -# zbik2607 , 2017 +# Dariusz Żbikowski , 2017 # Marcin Młynarczyk , 2017 # Grzegorz Grzelak , 2017 # Piotr Szlązak , 2017 -# Piotr Cierkosz , 2018 # Tomasz Leppich , 2018 # Paweł Wodyński , 2018 # Martin Trigaux, 2018 +# Piotr Cierkosz , 2019 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:07+0000\n" "PO-Revision-Date: 2017-09-20 10:26+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"Last-Translator: Piotr Cierkosz , 2019\n" "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1607,7 +1607,7 @@ msgstr "Pomoc" #. module: website_forum #: model:forum.forum,welcome_message:website_forum.forum_help msgid "Hide Intro" -msgstr "" +msgstr "Ukryj Intro" #. module: website_forum #: model:ir.ui.view,arch_db:website_forum.new_question @@ -2950,7 +2950,7 @@ msgstr "Wiadomość powitalna" #. module: website_forum #: model:forum.forum,welcome_message:website_forum.forum_help msgid "Welcome!" -msgstr "" +msgstr "Witaj!" #. module: website_forum #: model:forum.forum,faq:website_forum.forum_help diff --git a/addons/website_sale/i18n/de.po b/addons/website_sale/i18n/de.po index db57f44feef..cf4b44e0c91 100644 --- a/addons/website_sale/i18n/de.po +++ b/addons/website_sale/i18n/de.po @@ -36,8 +36,8 @@ # Martin Trigaux, 2018 # key six , 2018 # Katharina Moritz , 2018 -# Wolfgang Taferner, 2018 # Chris Egal , 2019 +# Wolfgang Taferner, 2019 # msgid "" msgstr "" @@ -45,7 +45,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-27 11:55+0000\n" "PO-Revision-Date: 2017-09-20 10:27+0000\n" -"Last-Translator: Chris Egal , 2019\n" +"Last-Translator: Wolfgang Taferner, 2019\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" @@ -3268,7 +3268,7 @@ msgstr "Bundesland / Region" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address msgid "State / Province..." -msgstr "Bundesland / Routen ..." +msgstr "Bundesland / Region..." #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address @@ -3791,7 +3791,7 @@ msgstr "Sie haben keine unbezahlte Bestellung aus dem Webshop." #. module: website_sale #: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery msgid "You left items in your cart." -msgstr "Sie haben Artikel in Ihrem Warenkorb gelassen." +msgstr "Es befinden Sich noch Artikel in Ihrem Warenkorb." #. module: website_sale #: model:sale.order.line,website_description:website_sale.website_sale_order_line_11 diff --git a/addons/website_sale_comparison/i18n/ko.po b/addons/website_sale_comparison/i18n/ko.po index 930abe0008e..01318f8a8ac 100644 --- a/addons/website_sale_comparison/i18n/ko.po +++ b/addons/website_sale_comparison/i18n/ko.po @@ -131,7 +131,7 @@ msgstr "" #. module: website_sale_comparison #: model:product.attribute,name:website_sale_comparison.product_attribute_18 msgid "Bluetooth" -msgstr "" +msgstr "블루투스" #. module: website_sale_comparison #: model:product.attribute,name:website_sale_comparison.product_attribute_1 diff --git a/addons/website_sale_stock/i18n/de.po b/addons/website_sale_stock/i18n/de.po index f696524d666..a359df35f1f 100644 --- a/addons/website_sale_stock/i18n/de.po +++ b/addons/website_sale_stock/i18n/de.po @@ -3,23 +3,24 @@ # * website_sale_stock # # Translators: -# Ermin Trevisan , 2017 -# Wolfgang Taferner , 2017 # Bülent Tiknas , 2017 -# Anja Funk , 2017 -# Niki Waibel , 2017 +# Niki Waibel, 2017 # JackTheHunter , 2017 -# Martin Trigaux , 2017 +# Ermin Trevisan , 2017 +# Martin Trigaux, 2017 # Fabian Liesch , 2017 -# Andi , 2017 +# Anja Funk , 2017 +# Andi, 2017 # DE T2 , 2017 +# Wolfgang Taferner, 2019 +# 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: DE T2 , 2017\n" +"PO-Revision-Date: 2017-09-20 10:28+0000\n" +"Last-Translator: Wolfgang Taferner, 2019\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" @@ -226,7 +227,7 @@ msgstr "Website" #: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:19 #, python-format msgid "You already added" -msgstr "Sie haben bereits hinzugefügt" +msgstr "Sie haben bereits " #. module: website_sale_stock #: code:addons/website_sale_stock/models/sale_order.py:26 diff --git a/addons/website_theme_install/i18n/sl.po b/addons/website_theme_install/i18n/sl.po index be423e55e07..5a947732d37 100644 --- a/addons/website_theme_install/i18n/sl.po +++ b/addons/website_theme_install/i18n/sl.po @@ -58,7 +58,7 @@ msgstr "Modul" #. module: website_theme_install #: model:ir.model.fields,field_description:website_theme_install.field_ir_module_module_image_ids msgid "Screenshots" -msgstr "" +msgstr "Posnetek zaslona" #. module: website_theme_install #: model:ir.ui.view,arch_db:website_theme_install.customize_modal diff --git a/odoo/addons/base/i18n/ca.po b/odoo/addons/base/i18n/ca.po index 382817ad628..480447be02b 100644 --- a/odoo/addons/base/i18n/ca.po +++ b/odoo/addons/base/i18n/ca.po @@ -3,12 +3,13 @@ # * base # # Translators: -# Martin Trigaux, 2018 # Josep Sànchez , 2018 # RGB Consulting , 2018 # Marc Tormo i Bochaca , 2018 # Quim - eccit , 2018 +# Martin Trigaux, 2018 # Manel Fernandez , 2018 +# M Palau , 2019 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-03 15:05+0000\n" "PO-Revision-Date: 2017-09-20 10:13+0000\n" -"Last-Translator: Manel Fernandez , 2018\n" +"Last-Translator: M Palau , 2019\n" "Language-Team: Catalan (https://www.transifex.com/odoo/teams/41243/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13700,6 +13701,45 @@ msgid "" "allowing you to easily find for specific skills and build up a database of\n" "profiles.\n" msgstr "" +"Gestionar les Contractacions i les Sol·licituds de treball\n" +"---------------------------------------\n" +"\n" +"Publicar, promoure i organitzar les vostres ofertes de treball amb Odoo\n" +"Sol·licitud de Contractacions de Codi Obert.\n" +"\n" +"Organitzar la seva borsa de treball, promoure els anuncis de feina i fer el seguiment\n" +"de les sol·licituds de manera àgil. Segueixi cada sol·licitant i construeixi una base de dades\n" +"d'habilitat i perfils amb documentació digital.\n" +"\n" +"Publiqui els seus llocs de treball en les millors Borses de Treball\n" +"---------------------------------\n" +"\n" +"Connectar automaticament amb les webs més conegudes d'ofertes de treball; linkedIn, Monster,\n" +"Craigslist, ... Cada nova oferta de treball té, automàticament, una nova adreça electrònica\n" +"assignada a les sol·licituds del lloc de treball.\n" +"\n" +"Tant si els sol·licitants el contacten per correu electrònic o mitjançant un formulari en línia, s'obté tota\n" +"la informació indexada automàticament (currículums, cartes de motivació) i pot respondre\n" +"en tan sols un click, aprofitant les plantilles de resposta.\n" +"\n" +"Personalitzi el seu procés de contractació\n" +"----------------------------------\n" +"\n" +"Utilitzi la vista kanban i personalitzi els passos del procés de contractació;\n" +"prequalificació, primera entrevista, segona entrevista, negociació, ...\n" +"\n" +"Obtingui estadístiques precises del seu procés de contractació i els informes per comparar\n" +"els resultats de les seves diferents inversions en les borses de treball externes.\n" +"\n" +"Optimitzi el seu procés de contractació\n" +"-----------------------------------\n" +"\n" +"Segueixi els sol·licitants en el seu procés de contractació amb la vista kanban. Economitzi\n" +"temps automatitzant algunes comunicacions mitjançant les plantilles de resposta del correu electrònic.\n" +"\n" +"Els documents com els currículums i les cartes de motivació s'indexen automàticament,\n" +"facilitant la cerca d'habilitats específiques i construir una base de dades dels\n" +"perfils.\n" #. module: base #: model:ir.actions.act_window,help:base.grant_menu_access diff --git a/odoo/addons/base/i18n/mn.po b/odoo/addons/base/i18n/mn.po index b7625a31068..c1b1a5ad8bd 100644 --- a/odoo/addons/base/i18n/mn.po +++ b/odoo/addons/base/i18n/mn.po @@ -8361,7 +8361,7 @@ msgstr "Сум/Дүүрэг" #. module: base #: model:ir.module.module,shortdesc:base.module_base_address_city msgid "City Addresses" -msgstr "" +msgstr "Хотын хаяг" #. module: base #: selection:res.company,external_report_layout:0 diff --git a/odoo/addons/base/i18n/ro.po b/odoo/addons/base/i18n/ro.po index 8c173df9c88..0122e2235fc 100644 --- a/odoo/addons/base/i18n/ro.po +++ b/odoo/addons/base/i18n/ro.po @@ -15543,6 +15543,8 @@ msgid "" "One of the records you are trying to modify has already been deleted " "(Document type: %s)." msgstr "" +"Una dintre înregistrările pe care încercați să le modificați a fost deja " +"ștearsă (Tip document: %s)." #. module: base #: code:addons/base/res/res_partner.py:399 diff --git a/odoo/addons/base/i18n/sl.po b/odoo/addons/base/i18n/sl.po index 21aa1bcef9c..8894136a29a 100644 --- a/odoo/addons/base/i18n/sl.po +++ b/odoo/addons/base/i18n/sl.po @@ -6773,7 +6773,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view_arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Naziv Arch datoteke" #. module: base #: model:ir.ui.view,arch_db:base.view_view_form @@ -10062,7 +10062,7 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_ids #: model:ir.ui.view,arch_db:base.module_form msgid "Exclusions" -msgstr "" +msgstr "Izjeme" #. module: base #: model:ir.model.fields,field_description:base.field_ir_module_category_exclusive @@ -14734,7 +14734,7 @@ msgstr "" #. module: base #: selection:ir.module.module,license:0 msgid "Odoo Enterprise Edition License v1.0" -msgstr "" +msgstr "Licenca Odoo Enterprise Edition v1.0" #. module: base #: model:ir.module.module,description:base.module_mail @@ -15261,7 +15261,7 @@ msgstr "" #. module: base #: selection:ir.module.module,license:0 msgid "Odoo Proprietary License v1.0" -msgstr "" +msgstr "Odoo lastniška licenca v1.0" #. module: base #: model:ir.module.module,shortdesc:base.module_web_settings_dashboard @@ -20639,7 +20639,7 @@ msgstr "" #: selection:ir.module.module.dependency,state:0 #: selection:ir.module.module.exclusion,state:0 msgid "Uninstallable" -msgstr "" +msgstr "Neodstranljivo" #. module: base #: model:res.country,name:base.ae @@ -21243,7 +21243,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view_inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Pogledi, ki se podedujejo od trenutnega" #. module: base #: model:res.country,name:base.vg From 455714c7bf77fb9b650f086aa937cafae979f2e8 Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Fri, 14 Jun 2019 06:25:23 +0000 Subject: [PATCH 5/6] [FIX] base: set cureency position "before" for JPY As a convention, JPY currency symbol normally shows before the amount. closes odoo/odoo#34113 Signed-off-by: Martin Trigaux (mat) --- odoo/addons/base/res/res_currency_data.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/odoo/addons/base/res/res_currency_data.xml b/odoo/addons/base/res/res_currency_data.xml index b3829b2d430..5321934e1fd 100644 --- a/odoo/addons/base/res/res_currency_data.xml +++ b/odoo/addons/base/res/res_currency_data.xml @@ -174,6 +174,7 @@ ¥ 1.00 + before From b5a04fd29ff19839e788b2c383e3af74c883c54d Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 5 Jun 2019 06:53:46 +0000 Subject: [PATCH 6/6] [IMP] mail, website_mail, base: extra info on error messages Display extra information on error messages: - Access error based on ACLs: user, fields (if applies) - Access error based on record rules: user, ids - Missing error: model, operation, user, ids closes odoo/odoo#33942 Signed-off-by: Nicolas Martinelli (nim) Co-authored-by: jev-odoo --- addons/mail/models/mail_activity.py | 5 +-- addons/mail/models/mail_message.py | 10 +++--- addons/website_mail/models/mail_message.py | 5 ++- odoo/addons/base/ir/ir_actions.py | 5 ++- odoo/addons/base/ir/ir_model.py | 1 + odoo/models.py | 38 ++++++++++++++++------ 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 15bbeca6d3a..ade987d0988 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -178,8 +178,9 @@ class MailActivity(models.Model): self.env[model].browse(res_ids).check_access_rule(doc_operation) except exceptions.AccessError: raise exceptions.AccessError( - _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % - (self._description, operation)) + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation) + + ' - ({} {}, {} {})'.format(_('Records:'), res_ids[:6], _('User:'), self._uid) + ) @api.model def create(self, values): diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 0eb20f389e7..88c6c55ae5d 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -595,8 +595,9 @@ class Message(models.Model): WHERE message.message_type = %%s AND (message.subtype_id IS NULL OR subtype.internal IS TRUE) AND message.id = ANY (%%s)''' % (self._table), ('comment', self.ids,)) if self._cr.fetchall(): raise AccessError( - _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % - (self._description, operation)) + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation) + + ' - ({} {}, {} {})'.format(_('Records:'), self.ids[:6], _('User:'), self._uid) + ) # Read mail_message.ids to have their values message_values = dict((res_id, {}) for res_id in self.ids) @@ -695,8 +696,9 @@ class Message(models.Model): if not (other_ids and self.browse(other_ids).exists()): return raise AccessError( - _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % - (self._description, operation)) + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation) + + ' - ({} {}, {} {})'.format(_('Records:'), list(other_ids)[:6], _('User:'), self._uid) + ) @api.model def _get_record_name(self, values): diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py index 34609160f1d..fa427c03c53 100644 --- a/addons/website_mail/models/mail_message.py +++ b/addons/website_mail/models/mail_message.py @@ -54,7 +54,10 @@ class MailMessage(models.Model): if self.user_has_groups('base.group_public'): self.env.cr.execute('SELECT id FROM "%s" WHERE website_published IS FALSE AND id = ANY (%%s)' % (self._table), (self.ids,)) if self.env.cr.fetchall(): - raise AccessError(_('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation)) + raise AccessError( + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation) + + ' - ({} {}, {} {})'.format(_('Records:'), self.ids[:6], _('User:'), self._uid) + ) return super(MailMessage, self).check_access_rule(operation=operation) @api.multi diff --git a/odoo/addons/base/ir/ir_actions.py b/odoo/addons/base/ir/ir_actions.py index 7fad2116fd9..4e0a360f206 100644 --- a/odoo/addons/base/ir/ir_actions.py +++ b/odoo/addons/base/ir/ir_actions.py @@ -240,7 +240,10 @@ class IrActionsActWindow(models.Model): existing = self.filtered(lambda rec: rec.id in ids) if len(existing) < len(self): # mark missing records in cache with a failed value - exc = MissingError(_("Record does not exist or has been deleted.")) + exc = MissingError( + _("Record does not exist or has been deleted.") + + '\n\n({} {}, {} {})'.format(_('Records:'), (self - existing).ids[:6], _('User:'), self._uid) + ) for record in (self - existing): record._cache.set_failed(self._fields, exc) return existing diff --git a/odoo/addons/base/ir/ir_model.py b/odoo/addons/base/ir/ir_model.py index 369775161f6..aa45440fcf6 100644 --- a/odoo/addons/base/ir/ir_model.py +++ b/odoo/addons/base/ir/ir_model.py @@ -1212,6 +1212,7 @@ class IrModelAccess(models.Model): else: msg_tail = _("Please contact your system administrator if you think this is an error.") + "\n\n(" + _("Document model") + ": %s)" msg_params = (model,) + msg_tail += ' - ({} {}, {} {})'.format(_('Operation:'), mode, _('User:'), self._uid) _logger.info('Access Denied by ACLs for operation: %s, uid: %s, model: %s', mode, self._uid, model) msg = '%s %s' % (msg_heads[mode], msg_tail) raise AccessError(msg % msg_params) diff --git a/odoo/models.py b/odoo/models.py index ab958f62644..eb7ffab4e26 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -2549,9 +2549,13 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): if invalid_fields: _logger.info('Access Denied by ACLs for operation: %s, uid: %s, model: %s, fields: %s', operation, self._uid, self._name, ', '.join(invalid_fields)) - raise AccessError(_('The requested operation cannot be completed due to security restrictions. ' - 'Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ - (self._description, operation)) + raise AccessError( + _( + 'The requested operation cannot be completed due to security restrictions. ' + 'Please contact your system administrator.\n\n(Document type: %s, Operation: %s)' + ) % (self._description, operation) + + ' - ({} {}, {} {})'.format(_('User:'), self._uid, _('Fields:'), ', '.join(invalid_fields)) + ) return fields @@ -2774,8 +2778,8 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): (self._name, 'read', ','.join([str(r.id) for r in self][:6]), self._uid)) # store an access error exception in existing records exc = AccessError( - _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ - (self._name, 'read') + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, 'read') + + ' - ({} {}, {} {})'.format(_('Records:'), self.ids[:6], _('User:'), self._uid) ) self.env.cache.set_failed(forbidden, self._fields.values(), exc) @@ -2859,8 +2863,10 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): if self._uid == SUPERUSER_ID: return _logger.info('Access Denied by record rules for operation: %s on record ids: %r, uid: %s, model: %s', operation, forbidden_ids, self._uid, self._name) - raise AccessError(_('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ - (self._description, operation)) + raise AccessError( + _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % (self._description, operation) + + ' - ({} {}, {}, {})'.format(_('Records:'), forbidden_ids[:6], _('User:'), self._uid) + ) else: # If we get here, the missing_ids are not in the database if operation in ('read','unlink'): @@ -2869,7 +2875,13 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): # errors for non-transactional search/read sequences coming from clients return _logger.info('Failed operation on deleted record(s): %s, uid: %s, model: %s', operation, self._uid, self._name) - raise MissingError(_('Missing document(s)') + ':' + _('One of the documents you are trying to access has been deleted, please try again after refreshing.')) + raise MissingError( + _('Missing document(s)') + ':' + _('One of the documents you are trying to access has been deleted, please try again after refreshing.') + + '\n\n({} {}, {} {}, {} {}, {} {})'.format( + _('Document type:'), self._description, _('Operation:'), operation, + _('Records:'), missing_ids[:6], _('User:'), self._uid, + ) + ) @api.model def check_access_rights(self, operation, raise_exception=True): @@ -3211,7 +3223,10 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): for sub_ids in cr.split_for_in_conditions(set(self.ids)): cr.execute(query, params + (sub_ids,)) if cr.rowcount != len(sub_ids): - raise MissingError(_('One of the records you are trying to modify has already been deleted (Document type: %s).') % self._description) + raise MissingError( + _('One of the records you are trying to modify has already been deleted (Document type: %s).') % self._description + + '\n\n({} {}, {} {})'.format(_('Records:'), sub_ids[:6], _('User:'), self._uid) + ) # TODO: optimize for name in direct: @@ -3993,7 +4008,10 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): existing = self.browse(ids + new_ids) if len(existing) < len(self): # mark missing records in cache with a failed value - exc = MissingError(_("Record does not exist or has been deleted.")) + exc = MissingError( + _("Record does not exist or has been deleted.") + + '\n\n({} {}, {} {})'.format(_('Records:'), (self - existing).ids[:6], _('User:'), self._uid) + ) self.env.cache.set_failed(self - existing, self._fields.values(), exc) return existing