summaryrefslogtreecommitdiff
path: root/addons/delivery
diff options
context:
space:
mode:
authorOdoo Translation Bot <c3p@odoo.com>2018-08-29 14:19:27 +0200
committerOdoo Translation Bot <c3p@odoo.com>2018-08-29 14:19:27 +0200
commitf22e61dc7450544ee03aec59f2fbc0bd5f577419 (patch)
treed40f8a3c8887cf185009f70bafe0b2e52704aaec /addons/delivery
parente5f490821bf705637be2c8786c640baa93f32eca (diff)
[I18N] Update translation terms from Transifex
Diffstat (limited to 'addons/delivery')
-rw-r--r--addons/delivery/i18n/ar.po160
-rw-r--r--addons/delivery/i18n/cs.po136
-rw-r--r--addons/delivery/i18n/fa.po519
-rw-r--r--addons/delivery/i18n/fi.po511
-rw-r--r--addons/delivery/i18n/gu.po38
-rw-r--r--addons/delivery/i18n/it.po655
-rw-r--r--addons/delivery/i18n/pt_BR.po115
-rw-r--r--addons/delivery/i18n/tr.po135
8 files changed, 1134 insertions, 1135 deletions
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 44e879a420b..6740ea2f606 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -2,12 +2,24 @@
# This file contains the translation of the following modules:
# * delivery
#
+# Translators:
+# Mustafa Rawi <mustafa@cubexco.com>, 2018
+# amrnegm <amrnegm.01@gmail.com>, 2018
+# Martin Trigaux, 2018
+# hoxhe Aits <hoxhe0@gmail.com>, 2018
+# Osoul <baruni@osoul.ly>, 2018
+# Mohammed Ibrahim <m.ibrahim@mussder.com>, 2018
+# Ghaith Gammar <g.gammar@saharaifs.net>, 2018
+# Osama Ahmaro <osamaahmaro@gmail.com>, 2018
+# Zuhair Hammadi <zuhair12@gmail.com>, 2018
+# Shaima Safar <shaima.safar@open-inside.com>, 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-24 09:04+0000\n"
"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Shaima Safar <shaima.safar@open-inside.com>, 2018\n"
"Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,13 +88,13 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "<span>kg</span>"
-msgstr ""
+msgstr "<span>كجم</span>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Carrier</strong>"
-msgstr ""
+msgstr "<strong>الناقل</strong>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
@@ -97,7 +109,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Weight</strong>"
-msgstr ""
+msgstr "<strong>وزن</strong>"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__integration_level
@@ -107,24 +119,24 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
-msgstr ""
+msgstr "نشط"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
-msgstr ""
+msgstr "القيمة"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
-msgstr ""
+msgstr "مبلغ الأمر ليتأهل لاستخدام الشحن المجاني، معبراً عنه بعملة الشركة."
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Archived"
-msgstr ""
+msgstr "مؤرشف"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
@@ -134,7 +146,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
msgid "Based on Rules"
-msgstr ""
+msgstr "بناء على تعليمات"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_bulk
@@ -144,7 +156,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Cancel"
-msgstr ""
+msgstr "إلغاء"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
@@ -155,41 +167,41 @@ msgstr ""
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
msgid "Carrier"
-msgstr ""
+msgstr "شركة الشحن"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
-msgstr ""
+msgstr "المؤسسة"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
msgid "Condition"
-msgstr ""
+msgstr "الشرط"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr ""
+msgstr "جهة الاتصال"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
-msgstr ""
+msgstr "الدول"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
-msgstr ""
+msgstr "أنشئ بواسطة"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
-msgstr ""
+msgstr "أنشئ في"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
@@ -204,12 +216,12 @@ msgstr ""
#. module: delivery
#: model:product.category,name:delivery.product_category_deliveries
msgid "Deliveries"
-msgstr ""
+msgstr "مستلمات"
#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
-msgstr ""
+msgstr "التوصيل"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -236,7 +248,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_res_users__property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_sale_order__carrier_id
msgid "Delivery Method"
-msgstr ""
+msgstr "طريقة الشحن"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
@@ -244,7 +256,7 @@ msgstr ""
#: model:ir.ui.menu,name:delivery.sale_menu_action_delivery_carrier_form
#: model:ir.ui.view,arch_db:delivery.res_config_settings_view_form
msgid "Delivery Methods"
-msgstr ""
+msgstr "طرق الشحن"
#. module: delivery
#: model:ir.model,name:delivery.model_choose_delivery_package
@@ -272,7 +284,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
msgid "Delivery Product"
-msgstr ""
+msgstr "منتج الشحن"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_rating_success
@@ -287,19 +299,19 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__sequence
msgid "Determine the display order"
-msgstr ""
+msgstr "حدد ترتيب العرض"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Discard"
-msgstr ""
+msgstr "تجاهل"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr ""
+msgstr "اسم العرض"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
@@ -317,7 +329,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__prod_environment
msgid "Environment"
-msgstr ""
+msgstr "البيئة"
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
@@ -346,14 +358,14 @@ msgstr ""
#: selection:delivery.carrier,delivery_type:0
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__fixed_price
msgid "Fixed Price"
-msgstr ""
+msgstr "الاسعار الثابته"
#. module: delivery
#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
-msgstr ""
+msgstr "رسوم التوصيل المجاني"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__free_over
@@ -373,12 +385,12 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Group By"
-msgstr ""
+msgstr "تجميع حسب"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
-msgstr ""
+msgstr "الإرتفاع"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -390,7 +402,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
-msgstr ""
+msgstr "المعرف"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
@@ -426,33 +438,33 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order_line__is_delivery
msgid "Is a Delivery"
-msgstr ""
+msgstr "توصيل وشحن"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package____last_update
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
-msgstr ""
+msgstr "آخر تعديل في"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_uid
msgid "Last Updated by"
-msgstr ""
+msgstr "آخر تحديث بواسطة"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_date
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_date
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_date
msgid "Last Updated on"
-msgstr ""
+msgstr "آخر تحديث في"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__length
msgid "Length"
-msgstr ""
+msgstr "الطول"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -467,7 +479,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
-msgstr ""
+msgstr "الهامش"
#. module: delivery
#: sql_constraint:delivery.carrier:0
@@ -492,7 +504,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__max_value
msgid "Maximum Value"
-msgstr ""
+msgstr "أقصى قيمة"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_product_packaging__max_weight
@@ -504,7 +516,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
-msgstr ""
+msgstr "الاسم"
#. module: delivery
#: selection:product.packaging,package_carrier_type:0
@@ -526,17 +538,17 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
msgid "OK"
-msgstr ""
+msgstr "موافق"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
-msgstr ""
+msgstr "المعامل"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Package"
-msgstr ""
+msgstr "طرد"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
@@ -559,17 +571,17 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__package_ids
msgid "Packages"
-msgstr ""
+msgstr "الطرود"
#. module: delivery
#: model:ir.model,name:delivery.model_product_packaging
msgid "Packaging"
-msgstr ""
+msgstr "التعبئة"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move_line
msgid "Packing Operation"
-msgstr ""
+msgstr "عمليه الالتقاط "
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__stock_quant_package_id
@@ -579,7 +591,7 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_quant_package
msgid "Physical Packages"
-msgstr ""
+msgstr "الحزم الماديه "
#. module: delivery
#: code:addons/delivery/models/sale_order.py:82
@@ -593,7 +605,7 @@ msgstr ""
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Price"
-msgstr ""
+msgstr "سعر"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
@@ -604,7 +616,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Pricing"
-msgstr ""
+msgstr "التسعير"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__price_rule_ids
@@ -616,24 +628,24 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Provider"
-msgstr ""
+msgstr "المزود"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
-msgstr ""
+msgstr "الكمية"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
msgid "Quotation"
-msgstr ""
+msgstr "عرض مبدئي"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_return_picking
msgid "Return Picking"
-msgstr ""
+msgstr "ترجيع الشحنة"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_base_price
@@ -643,17 +655,17 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
msgid "Sale Price"
-msgstr ""
+msgstr "سعر البيع"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "سطر أمر المبيعات"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Save"
-msgstr ""
+msgstr "حفظ"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -663,13 +675,13 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Send to Shipper"
-msgstr ""
+msgstr "ارسل الى الشاحن"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
-msgstr ""
+msgstr "التسلسل"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
@@ -687,7 +699,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_price
msgid "Shipping Cost"
-msgstr ""
+msgstr "تكلفة الشحن"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__shipping_weight
@@ -704,12 +716,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
-msgstr ""
+msgstr "المحافظات"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
msgid "Stock Move"
-msgstr ""
+msgstr "حركة المخزون"
#. module: delivery
#: code:addons/delivery/wizard/choose_delivery_package.py:53
@@ -737,7 +749,7 @@ msgstr ""
#: model:ir.model.fields,help:delivery.field_res_partner__property_delivery_carrier_id
#: model:ir.model.fields,help:delivery.field_res_users__property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "سيتم استخدام طريقة الشحن هذه عند إصدار الفواتير من عمليات الاستلام."
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__margin
@@ -752,7 +764,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
-msgstr ""
+msgstr "التتبع"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_ref
@@ -767,40 +779,40 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking
msgid "Transfer"
-msgstr ""
+msgstr "نقل"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_uom_id
msgid "Unit of Measure"
-msgstr ""
+msgstr "وحده القياس "
#. module: delivery
#: model:ir.model.fields,help:delivery.field_stock_picking__weight_uom_id
msgid "Unit of measurement for Weight"
-msgstr ""
+msgstr "وحدة قياس الوزن"
#. module: delivery
#: model:product.product,uom_name:delivery.product_product_delivery
#: model:product.template,uom_name:delivery.product_product_delivery_product_template
msgid "Unit(s)"
-msgstr ""
+msgstr "وحدة(ات)"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
-msgstr ""
+msgstr "متغير"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable_factor
msgid "Variable Factor"
-msgstr ""
+msgstr "معامل متغير"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_stock_picking__volume
msgid "Volume"
-msgstr ""
+msgstr "الحجم"
#. module: delivery
#: selection:delivery.price.rule,variable:0
@@ -810,13 +822,13 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__weight
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Weight"
-msgstr ""
+msgstr "الوزن"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Weight * Volume"
-msgstr ""
+msgstr "الوزن × الحجم"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_stock_quant_package__weight
@@ -842,7 +854,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__width
msgid "Width"
-msgstr ""
+msgstr "العرض"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -875,6 +887,8 @@ msgid ""
"Your delivery method has no redirect on courier provider's website to track "
"this order."
msgstr ""
+"طريقة التسليم لا يوجد لديه إعادة توجيه على موقع مزود البريد السريع لتتبع هذا"
+" النظام."
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_from
@@ -895,9 +909,9 @@ msgstr ""
#: model:product.product,weight_uom_name:delivery.product_product_delivery
#: model:product.template,weight_uom_name:delivery.product_product_delivery_product_template
msgid "kg"
-msgstr ""
+msgstr "كجم"
#. module: delivery
#: model:ir.model,name:delivery.model_res_config_settings
msgid "res.config.settings"
-msgstr ""
+msgstr "الدقة.التكوين.إعدادات"
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index defa7b664f5..df4a4c41ecd 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -2,12 +2,19 @@
# This file contains the translation of the following modules:
# * delivery
#
+# Translators:
+# Martin Trigaux, 2018
+# Ladislav Tomm <tomm@helemik.cz>, 2018
+# Jan Horzinka <jan.horzinka@centrum.cz>, 2018
+# Michal Veselý <michal@veselyberanek.net>, 2018
+# trendspotter, 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-24 09:04+0000\n"
"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: trendspotter, 2018\n"
"Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +83,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "<span>kg</span>"
-msgstr ""
+msgstr "<span>kg</span>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
@@ -107,12 +114,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
-msgstr ""
+msgstr "Aktivní"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
-msgstr ""
+msgstr "Částka"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
@@ -120,11 +127,12 @@ msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
msgstr ""
+"Cena objednávky, nad kterou je doprava zdarma vyjádřena v měně společnosti"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Archived"
-msgstr ""
+msgstr "Archivováno"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
@@ -134,7 +142,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
msgid "Based on Rules"
-msgstr ""
+msgstr "Na základě pravidel"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_bulk
@@ -144,7 +152,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
@@ -155,41 +163,41 @@ msgstr ""
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
msgid "Carrier"
-msgstr ""
+msgstr "Přepravce"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
-msgstr ""
+msgstr "Firma"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
msgid "Condition"
-msgstr ""
+msgstr "Stav"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
-msgstr ""
+msgstr "Státy"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
-msgstr ""
+msgstr "Vytvořil(a)"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
-msgstr ""
+msgstr "Vytvořeno"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
@@ -204,12 +212,12 @@ msgstr ""
#. module: delivery
#: model:product.category,name:delivery.product_category_deliveries
msgid "Deliveries"
-msgstr ""
+msgstr "Dodávky"
#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
-msgstr ""
+msgstr "Dodání"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -236,7 +244,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_res_users__property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_sale_order__carrier_id
msgid "Delivery Method"
-msgstr ""
+msgstr "Metoda doručení"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
@@ -244,7 +252,7 @@ msgstr ""
#: model:ir.ui.menu,name:delivery.sale_menu_action_delivery_carrier_form
#: model:ir.ui.view,arch_db:delivery.res_config_settings_view_form
msgid "Delivery Methods"
-msgstr ""
+msgstr "Způsoby dodání"
#. module: delivery
#: model:ir.model,name:delivery.model_choose_delivery_package
@@ -262,7 +270,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__delivery_packaging_id
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
-msgstr ""
+msgstr "Dodací balení"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_price_rule
@@ -272,7 +280,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
msgid "Delivery Product"
-msgstr ""
+msgstr "Dodání výrobku"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_rating_success
@@ -292,14 +300,14 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Discard"
-msgstr ""
+msgstr "Zrušit"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr ""
+msgstr "Zobrazovaný název"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
@@ -317,7 +325,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__prod_environment
msgid "Environment"
-msgstr ""
+msgstr "Prostředí"
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
@@ -373,12 +381,12 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Group By"
-msgstr ""
+msgstr "Seskupit podle"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
-msgstr ""
+msgstr "Výška"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -390,7 +398,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
-msgstr ""
+msgstr "ID"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
@@ -433,26 +441,26 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
-msgstr ""
+msgstr "Naposled změněno"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_uid
msgid "Last Updated by"
-msgstr ""
+msgstr "Naposledy upraveno od"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_date
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_date
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_date
msgid "Last Updated on"
-msgstr ""
+msgstr "Naposled upraveno"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__length
msgid "Length"
-msgstr ""
+msgstr "Délka"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -467,7 +475,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
-msgstr ""
+msgstr "Marže"
#. module: delivery
#: sql_constraint:delivery.carrier:0
@@ -492,7 +500,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__max_value
msgid "Maximum Value"
-msgstr ""
+msgstr "Maximální hodnota"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_product_packaging__max_weight
@@ -504,7 +512,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
-msgstr ""
+msgstr "Název"
#. module: delivery
#: selection:product.packaging,package_carrier_type:0
@@ -526,17 +534,17 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
msgid "OK"
-msgstr ""
+msgstr "OK"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
-msgstr ""
+msgstr "Operátor"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Package"
-msgstr ""
+msgstr "Balení"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
@@ -559,17 +567,17 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__package_ids
msgid "Packages"
-msgstr ""
+msgstr "Balíky"
#. module: delivery
#: model:ir.model,name:delivery.model_product_packaging
msgid "Packaging"
-msgstr ""
+msgstr "Balení"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move_line
msgid "Packing Operation"
-msgstr ""
+msgstr "Balící úkon"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__stock_quant_package_id
@@ -579,7 +587,7 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_quant_package
msgid "Physical Packages"
-msgstr ""
+msgstr "Fyzické balíky"
#. module: delivery
#: code:addons/delivery/models/sale_order.py:82
@@ -593,7 +601,7 @@ msgstr ""
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Price"
-msgstr ""
+msgstr "Cena"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
@@ -604,7 +612,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Pricing"
-msgstr ""
+msgstr "Ceny"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__price_rule_ids
@@ -623,17 +631,17 @@ msgstr ""
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
-msgstr ""
+msgstr "Množství"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
msgid "Quotation"
-msgstr ""
+msgstr "Nabídka"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_return_picking
msgid "Return Picking"
-msgstr ""
+msgstr "Vrátit dodávku"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_base_price
@@ -643,17 +651,17 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
msgid "Sale Price"
-msgstr ""
+msgstr "Prodejní cena"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Řádek potvrzení objednávky"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Save"
-msgstr ""
+msgstr "Uložit"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -669,7 +677,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
-msgstr ""
+msgstr "Číselná řada"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
@@ -704,12 +712,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
-msgstr ""
+msgstr "Státy"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
msgid "Stock Move"
-msgstr ""
+msgstr "Pohyb zásob"
#. module: delivery
#: code:addons/delivery/wizard/choose_delivery_package.py:53
@@ -737,7 +745,7 @@ msgstr ""
#: model:ir.model.fields,help:delivery.field_res_partner__property_delivery_carrier_id
#: model:ir.model.fields,help:delivery.field_res_users__property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "Způsob dodání bude použit při fakturaci z naskladnění."
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__margin
@@ -752,7 +760,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
-msgstr ""
+msgstr "Sledování"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_ref
@@ -767,40 +775,40 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking
msgid "Transfer"
-msgstr ""
+msgstr "Převod"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_uom_id
msgid "Unit of Measure"
-msgstr ""
+msgstr "Měrná jednotka"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_stock_picking__weight_uom_id
msgid "Unit of measurement for Weight"
-msgstr ""
+msgstr "Měrná jednotka hmotnosti"
#. module: delivery
#: model:product.product,uom_name:delivery.product_product_delivery
#: model:product.template,uom_name:delivery.product_product_delivery_product_template
msgid "Unit(s)"
-msgstr ""
+msgstr "Jednotek"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
-msgstr ""
+msgstr "Proměnné"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable_factor
msgid "Variable Factor"
-msgstr ""
+msgstr "Proměnný koeficient"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_stock_picking__volume
msgid "Volume"
-msgstr ""
+msgstr "Objem"
#. module: delivery
#: selection:delivery.price.rule,variable:0
@@ -810,13 +818,13 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__weight
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Weight"
-msgstr ""
+msgstr "Hmotnost"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Weight * Volume"
-msgstr ""
+msgstr "Hmotnost * Objem"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_stock_quant_package__weight
@@ -842,7 +850,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__width
msgid "Width"
-msgstr ""
+msgstr "Šířka"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -895,9 +903,9 @@ msgstr ""
#: model:product.product,weight_uom_name:delivery.product_product_delivery
#: model:product.template,weight_uom_name:delivery.product_product_delivery_product_template
msgid "kg"
-msgstr ""
+msgstr "kg"
#. module: delivery
#: model:ir.model,name:delivery.model_res_config_settings
msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
diff --git a/addons/delivery/i18n/fa.po b/addons/delivery/i18n/fa.po
index 852248e8326..533f26c2c08 100644
--- a/addons/delivery/i18n/fa.po
+++ b/addons/delivery/i18n/fa.po
@@ -3,25 +3,25 @@
# * delivery
#
# Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Sahar Daraye <sahar.daraye.1369@gmail.com>, 2017
-# Hamid Darabi <hamid.darabi@gmail.com>, 2017
-# ifaraz ir <ifarazir@gmail.com>, 2017
-# Hamed Mohammadi <hamed@dehongi.com>, 2017
-# Sia Rezazadeh <siavash.rezazadeh@gmail.com>, 2017
+# Martin Trigaux, 2018
+# Hamid Darabi, 2018
+# Sahar Daraye <sahar.daraye.1369@gmail.com>, 2018
+# mohammad azarbara <mohammadazarbara98@gmail.com>, 2018
+# Hamed Mohammadi <hamed@dehongi.com>, 2018
+# Arash Sardari <arashss77@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:12+0000\n"
-"PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Sia Rezazadeh <siavash.rezazadeh@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Arash Sardari <arashss77@gmail.com>, 2018\n"
"Language-Team: Persian (https://www.transifex.com/odoo/teams/41243/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: delivery
#: model:mail.template,report_name:delivery.mail_template_data_delivery_confirmation
@@ -35,93 +35,48 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:mail.template,subject:delivery.mail_template_data_delivery_notification
-msgid "${object.subject}"
-msgstr "${object.subject}"
-
-#. module: delivery
#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
-msgstr ""
-
-#. module: delivery
-#: model:mail.template,body_html:delivery.mail_template_data_delivery_notification
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"font-family:Arial,Helvetica,sans-serif; padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n"
-" <tbody>\n"
-" <!-- HEADER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\">\n"
-" <span style=\"font-size:20px; color:white; font-weight: bold;\">${object.record_name}</span>\n"
-" </td>\n"
-" <td valign=\"middle\" align=\"right\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- CONTENT -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
-" <tbody>\n"
-" <td valign=\"top\" style=\"color: #555; font-size: 14px;\">${object.body | safe}</td>\n"
-" </tbody>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- FOOTER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">${user.company_id.name}<br/>${user.company_id.phone or ''}</td>\n"
-" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
-" % if user.company_id.email:\n"
-" <a href=\"mailto:${user.company_id.email}\" style=\"text-decoration:none; color: white;\">${user.company_id.email}</a><br/>\n"
-" % endif\n"
-" % if user.company_id.website:\n"
-" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: white;\">${user.company_id.website}</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td align=\"center\">Powered by <a href=\"https://www.odoo.com\">Odoo</a>.</td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" "
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:76
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/delivery_carrier.py:77
#, python-format
msgid ""
-"<p class=\"oe_view_nocontent\">\n"
+"<p class=\"o_view_nocontent\">\n"
" Buy Odoo Enterprise now to get more providers.\n"
" </p>"
msgstr ""
@@ -129,7 +84,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "<span>kg</span>"
-msgstr ""
+msgstr "<span>kg</span>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
@@ -139,32 +94,36 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
-msgid "<strong>Tracking Number</strong>"
+msgid "<strong>Shipping Weight</strong>"
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
+msgid "<strong>Tracking Number</strong>"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Weight</strong>"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__integration_level
msgid "Action while validating Delivery Orders"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_active
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
msgstr "فعال"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
msgstr "مقدار"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
@@ -176,20 +135,18 @@ msgid "Archived"
msgstr "بایگانی شده"
#. module: delivery
-#: selection:delivery.carrier,delivery_type:0
-msgid "Based on Rules"
+#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
+msgid "Available Carriers"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_bulk
-msgid "Bulk Weight"
+#: selection:delivery.carrier,delivery_type:0
+msgid "Based on Rules"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_quant_package_shipping_weight
-msgid ""
-"Can be changed during the 'put in pack' to adjust the weight of the "
-"shipping."
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_bulk
+msgid "Bulk Weight"
msgstr ""
#. module: delivery
@@ -199,9 +156,9 @@ msgstr "لغو"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_package_carrier_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__carrier_id
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__package_carrier_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_id
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
@@ -209,17 +166,7 @@ msgid "Carrier"
msgstr "پیک"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Click to define a new delivery method."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_company_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
msgstr "شرکت"
@@ -231,33 +178,43 @@ msgstr "شرط"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr "تماس"
+msgstr "مخاطب"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_country_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
msgstr "کشورها"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
msgstr "ایجاد شده توسط"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
msgstr "ایجاد شده در"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
msgid "Debug logging"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Define a new delivery method"
+msgstr ""
+
+#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr "تحویل ها"
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr "تحویل"
@@ -278,14 +235,14 @@ msgid "Delivery Information"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_message
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_message
msgid "Delivery Message"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_users__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_sale_order__carrier_id
msgid "Delivery Method"
msgstr "روش تحویل"
@@ -310,7 +267,7 @@ msgid "Delivery Packages"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__delivery_packaging_id
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
msgstr ""
@@ -321,12 +278,12 @@ msgid "Delivery Price Rules"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
msgid "Delivery Product"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_rating_success
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_rating_success
msgid "Delivery Rating Success"
msgstr ""
@@ -336,7 +293,7 @@ msgid "Destination Availability"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sequence
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__sequence
msgid "Determine the display order"
msgstr ""
@@ -346,11 +303,16 @@ msgid "Discard"
msgstr "رها کردن"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_display_name
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr "نام نشان داده شده"
+msgstr "نام نمایشی"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
+msgid "Display tracking links"
+msgstr ""
#. module: delivery
#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -361,24 +323,23 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__prod_environment
msgid "Environment"
msgstr "محیط کاری"
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
-#: code:addons/delivery/models/delivery_grid.py:109
#, python-format
msgid "Error: no matching grid."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_price
msgid "Estimated Delivery Price"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,help:delivery.field_sale_order__carrier_id
msgid "Fill this field if you plan to invoice the shipping based on picking."
msgstr ""
@@ -391,18 +352,19 @@ msgstr ""
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_fixed_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__fixed_price
msgid "Fixed Price"
-msgstr ""
+msgstr "قیمت مقطوع"
#. module: delivery
+#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__free_over
msgid "Free if order amount is above"
msgstr ""
@@ -422,13 +384,7 @@ msgid "Group By"
msgstr "گروه‌بندی برمبنای"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_height
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
msgstr "ارتفاع"
@@ -438,21 +394,21 @@ msgid "Height must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
msgstr "شناسه"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
msgid ""
"If the order total amount (shipping excluded) is above or equal to this "
"value, the customer benefits from a free shipping"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:125
+#: code:addons/delivery/models/delivery_carrier.py:126
#, python-format
msgid ""
"Info:\n"
@@ -466,43 +422,43 @@ msgid "Install more Providers"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__integration_level
msgid "Integration Level"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_invoice_shipping_on_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order__invoice_shipping_on_delivery
msgid "Invoice Shipping on Delivery"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_is_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__is_delivery
msgid "Is a Delivery"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule___last_update
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
-msgstr "آخرین به‌روزرسانی در تاریخ "
+msgstr "آخرین تغییر در"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_uid
msgid "Last Updated by"
-msgstr "آخرین به روز رسانی توسط"
+msgstr "آخرین تغییر توسط"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_date
msgid "Last Updated on"
msgstr "آخرین به روز رسانی در"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_length
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__length
msgid "Length"
msgstr "طول"
@@ -512,17 +468,12 @@ msgid "Length must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__debug_logging
msgid "Log requests in order to ease debugging"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-msgid "Manage Package Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
msgstr "حاشیه"
@@ -537,7 +488,7 @@ msgid "Margin on Rate"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__max_weight
msgid "Max Weight"
msgstr ""
@@ -547,18 +498,18 @@ msgid "Max Weight must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_max_value
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__max_value
msgid "Maximum Value"
msgstr "حداکثر مقدار"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,help:delivery.field_product_packaging__max_weight
msgid "Maximum weight shippable in this packaging"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
msgstr "نام"
@@ -569,30 +520,24 @@ msgid "No carrier integration"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:73
+#: code:addons/delivery/models/sale_order.py:80
#, python-format
msgid "No carrier set for this order."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_grid.py:100
+#: code:addons/delivery/models/delivery_grid.py:102
#, python-format
msgid "No price rule matching this order; delivery cost cannot be computed."
msgstr ""
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_normal
-#: model:product.template,name:delivery.product_product_delivery_normal_product_template
-msgid "Normal Delivery Charges"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_number_of_packages
-msgid "Number of Packages"
-msgstr ""
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "OK"
+msgstr "تایید"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_operator
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
msgstr "اپراتور"
@@ -602,19 +547,25 @@ msgid "Package"
msgstr "بسته"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_shipper_package_code
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
msgid "Package Code"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:34
-#: code:addons/delivery/models/stock_picking.py:124
+#: code:addons/delivery/models/stock_picking.py:35
+#: code:addons/delivery/models/stock_picking.py:119
#, python-format
msgid "Package Details"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_package_ids
+#: code:addons/delivery/wizard/choose_delivery_package.py:52
+#, python-format
+msgid "Package too heavy!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__package_ids
msgid "Packages"
msgstr "بسته‌ها"
@@ -626,20 +577,20 @@ msgstr "بسته‌بندی"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move_line
msgid "Packing Operation"
-msgstr ""
+msgstr "عملیات بسته بندی"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__stock_quant_package_id
msgid "Physical Package"
msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_quant_package
msgid "Physical Packages"
-msgstr ""
+msgstr "بسته‌های فیزیکی"
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:75
+#: code:addons/delivery/models/sale_order.py:82
#, python-format
msgid ""
"Please use \"Check price\" in order to compute a shipping price for this "
@@ -661,21 +612,16 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Pricing"
-msgstr ""
+msgstr "قیمت گذاری"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_rule_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__price_rule_ids
msgid "Pricing Rules"
msgstr ""
#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr "قالب محصول"
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Provider"
msgstr "فراهم‌کننده"
@@ -683,7 +629,7 @@ msgstr "فراهم‌کننده"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_product_qty
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
msgstr "تعداد"
@@ -698,12 +644,12 @@ msgid "Return Picking"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_base_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_base_price
msgid "Sale Base Price"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
msgid "Sale Price"
msgstr "قیمت فروش"
@@ -728,23 +674,18 @@ msgid "Send to Shipper"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sequence
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
msgstr "دنباله"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:168
+#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid ""
"Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: "
@@ -752,36 +693,44 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_price
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_price
msgid "Shipping Cost"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_shipping_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__shipping_weight
msgid "Shipping Weight"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product_hs_code
-#: model:ir.model.fields,help:delivery.field_product_template_hs_code
-msgid "Standardized code for international shipping and goods declaration"
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Shipping Weight:"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
msgstr "وضعیت ها"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
msgid "Stock Move"
+msgstr "انتقال موجودی"
+
+#. module: delivery
+#: code:addons/delivery/wizard/choose_delivery_package.py:53
+#, python-format
+msgid ""
+"The weight of your package is higher than the maximum weight authorized for "
+"this package type. Please choose another package type."
msgstr ""
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_poste
-#: model:product.template,name:delivery.product_product_delivery_poste_product_template
-msgid "The Poste"
+#: code:addons/delivery/models/delivery_grid.py:111
+#, python-format
+msgid "There is no matching delivery rule."
msgstr ""
#. module: delivery
@@ -793,28 +742,33 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_users__property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__margin
msgid "This percentage will be added to the shipping price."
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "Trackers URL"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
-msgstr ""
+msgstr "ره گیری"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_ref
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_ref
msgid "Tracking Reference"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_url
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_url
msgid "Tracking URL"
msgstr ""
@@ -824,44 +778,44 @@ msgid "Transfer"
msgstr "انتقال"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_uom_id
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_uom_id
msgid "Unit of Measure"
msgstr "واحد اندازه گیری"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_move_weight_uom_id
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_picking_weight_uom_id
+#: model:ir.model.fields,help:delivery.field_stock_picking__weight_uom_id
msgid "Unit of measurement for Weight"
msgstr "واحد اندازه گیری وزن"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr "عدد"
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
msgstr "متغیر"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable_factor
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable_factor
msgid "Variable Factor"
msgstr ""
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_volume
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__volume
msgid "Volume"
msgstr "حجم"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_move__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__weight
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Weight"
msgstr "وزن"
@@ -873,17 +827,28 @@ msgid "Weight * Volume"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight_uom_id
-msgid "Weight Unit of Measure"
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__weight
+msgid "Weight computed based on the sum of the weights of the products."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__shipping_weight
msgid "Weight for Shipping"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_width
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__shipping_weight
+msgid "Weight used to compute the price of the delivery (if applicable)."
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Weight:"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__width
msgid "Width"
msgstr "عرض"
@@ -893,7 +858,7 @@ msgid "Width must be positive"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:206
+#: code:addons/delivery/models/stock_picking.py:217
#, python-format
msgid ""
"You are shipping different packaging types in the same shipment.\n"
@@ -901,13 +866,18 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:71
+#: code:addons/delivery/models/sale_order.py:78
#, python-format
msgid "You can add delivery price only on unconfirmed quotations."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:182
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "You have multiple tracker links, they are available in the chatter."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:180
#, python-format
msgid ""
"Your delivery method has no redirect on courier provider's website to track "
@@ -915,12 +885,12 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_from
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_from
msgid "Zip From"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_to
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_to
msgid "Zip To"
msgstr ""
@@ -928,3 +898,14 @@ msgstr ""
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "e.g. UPS Express"
msgstr ""
+
+#. module: delivery
+#: model:product.product,weight_uom_name:delivery.product_product_delivery
+#: model:product.template,weight_uom_name:delivery.product_product_delivery_product_template
+msgid "kg"
+msgstr "کیلوگرم"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_config_settings
+msgid "res.config.settings"
+msgstr "res.config.settings"
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 416ef5a35d9..081696bc2f8 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -3,23 +3,23 @@
# * delivery
#
# Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Tuomo Aura <tuomo.aura@web-veistamo.fi>, 2017
-# Atte Isopuro <atte.isopuro@web-veistamo.fi>, 2017
-# Kari Lindgren <kari.lindgren@emsystems.fi>, 2017
-# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2017
-# Veikko Väätäjä <veikko.vaataja@gmail.com>, 2017
-# Marko Happonen <marko.happonen@sprintit.fi>, 2017
-# Jussi Lehto <jussi@gulfeo.com>, 2017
-# Eino Mäkitalo <eino.makitalo@netitbe.fi>, 2017
-# Tommi Rintala <tommi.rintala@gmail.com>, 2017
+# Eino Mäkitalo <eino.makitalo@netitbe.fi>, 2018
+# Martin Trigaux, 2018
+# Kari Lindgren <kari.lindgren@emsystems.fi>, 2018
+# Jussi Lehto <jussi@gulfeo.com>, 2018
+# Svante Suominen <svante.suominen@web-veistamo.fi>, 2018
+# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2018
+# Tuomo Aura <tuomo.aura@web-veistamo.fi>, 2018
+# Atte Isopuro <atte.isopuro@web-veistamo.fi>, 2018
+# Marko Happonen <marko.happonen@sprintit.fi>, 2018
+# Veikko Väätäjä <veikko.vaataja@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:12+0000\n"
-"PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Tommi Rintala <tommi.rintala@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Veikko Väätäjä <veikko.vaataja@gmail.com>, 2018\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"
@@ -39,93 +39,48 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:mail.template,subject:delivery.mail_template_data_delivery_notification
-msgid "${object.subject}"
-msgstr "${object.subject}"
-
-#. module: delivery
#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
-msgstr ""
-
-#. module: delivery
-#: model:mail.template,body_html:delivery.mail_template_data_delivery_notification
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"font-family:Arial,Helvetica,sans-serif; padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n"
-" <tbody>\n"
-" <!-- HEADER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\">\n"
-" <span style=\"font-size:20px; color:white; font-weight: bold;\">${object.record_name}</span>\n"
-" </td>\n"
-" <td valign=\"middle\" align=\"right\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- CONTENT -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
-" <tbody>\n"
-" <td valign=\"top\" style=\"color: #555; font-size: 14px;\">${object.body | safe}</td>\n"
-" </tbody>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- FOOTER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">${user.company_id.name}<br/>${user.company_id.phone or ''}</td>\n"
-" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
-" % if user.company_id.email:\n"
-" <a href=\"mailto:${user.company_id.email}\" style=\"text-decoration:none; color: white;\">${user.company_id.email}</a><br/>\n"
-" % endif\n"
-" % if user.company_id.website:\n"
-" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: white;\">${user.company_id.website}</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td align=\"center\">Powered by <a href=\"https://www.odoo.com\">Odoo</a>.</td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" "
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:76
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/delivery_carrier.py:77
#, python-format
msgid ""
-"<p class=\"oe_view_nocontent\">\n"
+"<p class=\"o_view_nocontent\">\n"
" Buy Odoo Enterprise now to get more providers.\n"
" </p>"
msgstr ""
@@ -143,32 +98,36 @@ msgstr "<strong>Huolitsija</strong>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
-msgid "<strong>Tracking Number</strong>"
+msgid "<strong>Shipping Weight</strong>"
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
+msgid "<strong>Tracking Number</strong>"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Weight</strong>"
msgstr "<strong>Paino</strong>"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__integration_level
msgid "Action while validating Delivery Orders"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_active
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
msgstr "Aktiivinen"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
msgstr "Määrä"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
@@ -182,32 +141,30 @@ msgid "Archived"
msgstr "Arkistoitu"
#. module: delivery
-#: selection:delivery.carrier,delivery_type:0
-msgid "Based on Rules"
+#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
+msgid "Available Carriers"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_bulk
-msgid "Bulk Weight"
+#: selection:delivery.carrier,delivery_type:0
+msgid "Based on Rules"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_quant_package_shipping_weight
-msgid ""
-"Can be changed during the 'put in pack' to adjust the weight of the "
-"shipping."
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_bulk
+msgid "Bulk Weight"
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Cancel"
-msgstr "Peru"
+msgstr "Peruuta"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_package_carrier_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__carrier_id
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__package_carrier_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_id
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
@@ -215,17 +172,7 @@ msgid "Carrier"
msgstr "Huolitsija"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Click to define a new delivery method."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_company_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
msgstr "Yritys"
@@ -240,30 +187,40 @@ msgid "Contact"
msgstr "Kontakti"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_country_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
msgstr "Maat"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
msgstr "Luonut"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
msgstr "Luotu"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
msgid "Debug logging"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Define a new delivery method"
+msgstr ""
+
+#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr "Toimitukset"
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr "Toimitus"
@@ -281,17 +238,17 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Delivery Information"
-msgstr ""
+msgstr "Toimituksen tiedot"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_message
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_message
msgid "Delivery Message"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_users__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_sale_order__carrier_id
msgid "Delivery Method"
msgstr "Toimitustapa"
@@ -316,7 +273,7 @@ msgid "Delivery Packages"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__delivery_packaging_id
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
msgstr ""
@@ -327,12 +284,12 @@ msgid "Delivery Price Rules"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
msgid "Delivery Product"
msgstr "Toimitustuote"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_rating_success
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_rating_success
msgid "Delivery Rating Success"
msgstr ""
@@ -342,7 +299,7 @@ msgid "Destination Availability"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sequence
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__sequence
msgid "Determine the display order"
msgstr "Aseta näyttöjärjestys"
@@ -352,13 +309,18 @@ msgid "Discard"
msgstr "Hylkää"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_display_name
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
msgstr "Näyttönimi"
#. module: delivery
+#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
+msgid "Display tracking links"
+msgstr ""
+
+#. module: delivery
#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
msgid ""
"Each carrier (e.g. UPS) can have several delivery methods (e.g.\n"
@@ -367,24 +329,23 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__prod_environment
msgid "Environment"
msgstr "Ympäristö"
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
-#: code:addons/delivery/models/delivery_grid.py:109
#, python-format
msgid "Error: no matching grid."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_price
msgid "Estimated Delivery Price"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,help:delivery.field_sale_order__carrier_id
msgid "Fill this field if you plan to invoice the shipping based on picking."
msgstr ""
@@ -397,18 +358,19 @@ msgstr ""
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_fixed_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__fixed_price
msgid "Fixed Price"
msgstr "Kiinteä hinta"
#. module: delivery
+#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__free_over
msgid "Free if order amount is above"
msgstr ""
@@ -428,13 +390,7 @@ msgid "Group By"
msgstr "Ryhmittely"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_height
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
msgstr "Korkeus"
@@ -444,21 +400,21 @@ msgid "Height must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
msgstr "Tunniste (ID)"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
msgid ""
"If the order total amount (shipping excluded) is above or equal to this "
"value, the customer benefits from a free shipping"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:125
+#: code:addons/delivery/models/delivery_carrier.py:126
#, python-format
msgid ""
"Info:\n"
@@ -472,43 +428,43 @@ msgid "Install more Providers"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__integration_level
msgid "Integration Level"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_invoice_shipping_on_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order__invoice_shipping_on_delivery
msgid "Invoice Shipping on Delivery"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_is_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__is_delivery
msgid "Is a Delivery"
msgstr "On toimitus"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule___last_update
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
msgstr "Viimeksi muokattu"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_uid
msgid "Last Updated by"
msgstr "Viimeksi päivittänyt"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_date
msgid "Last Updated on"
msgstr "Viimeksi päivitetty"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_length
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__length
msgid "Length"
msgstr "Pituus"
@@ -518,17 +474,12 @@ msgid "Length must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__debug_logging
msgid "Log requests in order to ease debugging"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-msgid "Manage Package Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
msgstr "Myyntikate"
@@ -543,7 +494,7 @@ msgid "Margin on Rate"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__max_weight
msgid "Max Weight"
msgstr ""
@@ -553,18 +504,18 @@ msgid "Max Weight must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_max_value
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__max_value
msgid "Maximum Value"
msgstr "Maksimiarvo"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,help:delivery.field_product_packaging__max_weight
msgid "Maximum weight shippable in this packaging"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
msgstr "Nimi"
@@ -575,30 +526,24 @@ msgid "No carrier integration"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:73
+#: code:addons/delivery/models/sale_order.py:80
#, python-format
msgid "No carrier set for this order."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_grid.py:100
+#: code:addons/delivery/models/delivery_grid.py:102
#, python-format
msgid "No price rule matching this order; delivery cost cannot be computed."
msgstr ""
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_normal
-#: model:product.template,name:delivery.product_product_delivery_normal_product_template
-msgid "Normal Delivery Charges"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_number_of_packages
-msgid "Number of Packages"
-msgstr "Pakkausten määrä"
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "OK"
+msgstr "OK"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_operator
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
msgstr "Operaattori"
@@ -608,19 +553,25 @@ msgid "Package"
msgstr "Pakkaus"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_shipper_package_code
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
msgid "Package Code"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:34
-#: code:addons/delivery/models/stock_picking.py:124
+#: code:addons/delivery/models/stock_picking.py:35
+#: code:addons/delivery/models/stock_picking.py:119
#, python-format
msgid "Package Details"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_package_ids
+#: code:addons/delivery/wizard/choose_delivery_package.py:52
+#, python-format
+msgid "Package too heavy!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__package_ids
msgid "Packages"
msgstr "Pakkaukset"
@@ -635,7 +586,7 @@ msgid "Packing Operation"
msgstr "Pakkaustoiminto"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__stock_quant_package_id
msgid "Physical Package"
msgstr ""
@@ -645,7 +596,7 @@ msgid "Physical Packages"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:75
+#: code:addons/delivery/models/sale_order.py:82
#, python-format
msgid ""
"Please use \"Check price\" in order to compute a shipping price for this "
@@ -670,18 +621,13 @@ msgid "Pricing"
msgstr "Hinnoittelu"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_rule_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__price_rule_ids
msgid "Pricing Rules"
msgstr ""
#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr "Tuotemalli"
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Provider"
msgstr "Palveluntarjoaja"
@@ -689,7 +635,7 @@ msgstr "Palveluntarjoaja"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_product_qty
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
msgstr "Määrä"
@@ -704,12 +650,12 @@ msgid "Return Picking"
msgstr "Palauta keräily"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_base_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_base_price
msgid "Sale Base Price"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
msgid "Sale Price"
msgstr "Myyntihinta"
@@ -734,23 +680,18 @@ msgid "Send to Shipper"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sequence
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
msgstr "Järjestys"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:168
+#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid ""
"Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: "
@@ -758,24 +699,24 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_price
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_price
msgid "Shipping Cost"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_shipping_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__shipping_weight
msgid "Shipping Weight"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product_hs_code
-#: model:ir.model.fields,help:delivery.field_product_template_hs_code
-msgid "Standardized code for international shipping and goods declaration"
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Shipping Weight:"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
msgstr "Tilat"
@@ -785,9 +726,17 @@ msgid "Stock Move"
msgstr "Varastosiirto"
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_poste
-#: model:product.template,name:delivery.product_product_delivery_poste_product_template
-msgid "The Poste"
+#: code:addons/delivery/wizard/choose_delivery_package.py:53
+#, python-format
+msgid ""
+"The weight of your package is higher than the maximum weight authorized for "
+"this package type. Please choose another package type."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/delivery_grid.py:111
+#, python-format
+msgid "There is no matching delivery rule."
msgstr ""
#. module: delivery
@@ -799,28 +748,33 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_users__property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
msgstr "Tämä toimitustapa on käytössä kun laskutus tapahtuu keräilystä."
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__margin
msgid "This percentage will be added to the shipping price."
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "Trackers URL"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
msgstr "Seuranta"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_ref
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_ref
msgid "Tracking Reference"
-msgstr ""
+msgstr "Seurantakoodi"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_url
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_url
msgid "Tracking URL"
msgstr ""
@@ -830,44 +784,44 @@ msgid "Transfer"
msgstr "Siirto"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_uom_id
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_uom_id
msgid "Unit of Measure"
msgstr "Mittayksikkö"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_move_weight_uom_id
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Yksikkö (Yksikkö) on painoyksikkö"
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_picking_weight_uom_id
+#: model:ir.model.fields,help:delivery.field_stock_picking__weight_uom_id
msgid "Unit of measurement for Weight"
msgstr "Painoyksikkö"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr "Kpl"
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
msgstr "Vaihteleva"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable_factor
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable_factor
msgid "Variable Factor"
msgstr "Muunnoskerroin"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_volume
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__volume
msgid "Volume"
msgstr "Tilavuus"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_move__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__weight
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Weight"
msgstr "Paino"
@@ -879,17 +833,28 @@ msgid "Weight * Volume"
msgstr "Paino * Tilavuus"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight_uom_id
-msgid "Weight Unit of Measure"
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__weight
+msgid "Weight computed based on the sum of the weights of the products."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__shipping_weight
msgid "Weight for Shipping"
+msgstr "Lähetyksen paino"
+
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__shipping_weight
+msgid "Weight used to compute the price of the delivery (if applicable)."
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Weight:"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_width
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__width
msgid "Width"
msgstr "Leveys"
@@ -899,7 +864,7 @@ msgid "Width must be positive"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:206
+#: code:addons/delivery/models/stock_picking.py:217
#, python-format
msgid ""
"You are shipping different packaging types in the same shipment.\n"
@@ -907,13 +872,18 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:71
+#: code:addons/delivery/models/sale_order.py:78
#, python-format
msgid "You can add delivery price only on unconfirmed quotations."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:182
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "You have multiple tracker links, they are available in the chatter."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:180
#, python-format
msgid ""
"Your delivery method has no redirect on courier provider's website to track "
@@ -921,12 +891,12 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_from
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_from
msgid "Zip From"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_to
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_to
msgid "Zip To"
msgstr ""
@@ -934,3 +904,14 @@ msgstr ""
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "e.g. UPS Express"
msgstr ""
+
+#. module: delivery
+#: model:product.product,weight_uom_name:delivery.product_product_delivery
+#: model:product.template,weight_uom_name:delivery.product_product_delivery_product_template
+msgid "kg"
+msgstr "kg"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_config_settings
+msgid "res.config.settings"
+msgstr "res.config.settings"
diff --git a/addons/delivery/i18n/gu.po b/addons/delivery/i18n/gu.po
index 8990d1c9683..52b65948d77 100644
--- a/addons/delivery/i18n/gu.po
+++ b/addons/delivery/i18n/gu.po
@@ -2,12 +2,18 @@
# This file contains the translation of the following modules:
# * delivery
#
+# Translators:
+# Martin Trigaux, 2018
+# Turkesh Patel <turkesh4friends@gmail.com>, 2018
+# Dharmraj Jhala <dja@openerp.com>, 2018
+# Divya Pandya <dia@odoo.com>, 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-24 09:04+0000\n"
"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Divya Pandya <dia@odoo.com>, 2018\n"
"Language-Team: Gujarati (https://www.transifex.com/odoo/teams/41243/gu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -107,12 +113,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
-msgstr ""
+msgstr "સક્રિય"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
-msgstr ""
+msgstr "કિંમત"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
@@ -144,7 +150,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Cancel"
-msgstr ""
+msgstr "રદ કરો"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
@@ -160,7 +166,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
-msgstr ""
+msgstr "કંપની"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
@@ -170,19 +176,19 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr ""
+msgstr "સંપર્ક"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
-msgstr ""
+msgstr "દેશો"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
-msgstr ""
+msgstr "બનાવનાર"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
@@ -299,7 +305,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr ""
+msgstr "પ્રદર્શન નામ"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
@@ -390,7 +396,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
-msgstr ""
+msgstr "ઓળખ"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
@@ -504,7 +510,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
-msgstr ""
+msgstr "નામ"
#. module: delivery
#: selection:product.packaging,package_carrier_type:0
@@ -526,7 +532,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
msgid "OK"
-msgstr ""
+msgstr "બરાબર"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
@@ -593,7 +599,7 @@ msgstr ""
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Price"
-msgstr ""
+msgstr "કિંમત"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
@@ -623,7 +629,7 @@ msgstr ""
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
-msgstr ""
+msgstr "જથ્થો"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
@@ -653,7 +659,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Save"
-msgstr ""
+msgstr "સંગ્રહો"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -669,7 +675,7 @@ msgstr ""
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
-msgstr ""
+msgstr "ક્રમ"
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
@@ -704,7 +710,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
-msgstr ""
+msgstr "રાજ્યો"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index b52a182c282..81a8ca15278 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -3,15 +3,24 @@
# * delivery
#
# Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
-# Paolo Valier <paolo.valier@hotmail.it>, 2017
+# Sergio Zanchetta <primes2h@gmail.com>, 2018
+# Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018
+# Martin Trigaux, 2018
+# Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018
+# Luca Tralli, 2018
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018
+# Massimo Bianchi <bianchi.massimo@gmail.com>, 2018
+# Paolo Valier, 2018
+# Cécile Collart <cco@odoo.com>, 2018
+# David Minneci <david@numeko.it>, 2018
+# Niccolò Lubello <nlubello@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:12+0000\n"
-"PO-Revision-Date: 2017-11-30 13:12+0000\n"
-"Last-Translator: Paolo Valier <paolo.valier@hotmail.it>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Niccolò Lubello <nlubello@gmail.com>, 2018\n"
"Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,102 +31,58 @@ msgstr ""
#. module: delivery
#: model:mail.template,report_name:delivery.mail_template_data_delivery_confirmation
msgid "${(object.name or '').replace('/','_')}"
-msgstr ""
+msgstr "${(object.name or '').replace('/','_')}"
#. module: delivery
#: model:mail.template,subject:delivery.mail_template_data_delivery_confirmation
msgid ""
"${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })"
msgstr ""
+"${object.company_id.name} Ordine di Consegna (Rif ${object.name or 'n/a' })"
#. module: delivery
-#: model:mail.template,subject:delivery.mail_template_data_delivery_notification
-msgid "${object.subject}"
+#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
msgstr ""
#. module: delivery
-#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
-msgstr ""
-
-#. module: delivery
-#: model:mail.template,body_html:delivery.mail_template_data_delivery_notification
-msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"font-family:Arial,Helvetica,sans-serif; padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n"
-" <tbody>\n"
-" <!-- HEADER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\">\n"
-" <span style=\"font-size:20px; color:white; font-weight: bold;\">${object.record_name}</span>\n"
-" </td>\n"
-" <td valign=\"middle\" align=\"right\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- CONTENT -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
-" <tbody>\n"
-" <td valign=\"top\" style=\"color: #555; font-size: 14px;\">${object.body | safe}</td>\n"
-" </tbody>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <!-- FOOTER -->\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"650\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">${user.company_id.name}<br/>${user.company_id.phone or ''}</td>\n"
-" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
-" % if user.company_id.email:\n"
-" <a href=\"mailto:${user.company_id.email}\" style=\"text-decoration:none; color: white;\">${user.company_id.email}</a><br/>\n"
-" % endif\n"
-" % if user.company_id.website:\n"
-" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: white;\">${user.company_id.website}</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td align=\"center\">Powered by <a href=\"https://www.odoo.com\">Odoo</a>.</td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" "
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:76
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/delivery_carrier.py:77
#, python-format
msgid ""
-"<p class=\"oe_view_nocontent\">\n"
+"<p class=\"o_view_nocontent\">\n"
" Buy Odoo Enterprise now to get more providers.\n"
" </p>"
msgstr ""
@@ -125,12 +90,17 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "<span>kg</span>"
-msgstr ""
+msgstr "<span>kg</span>"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Carrier</strong>"
+msgstr "<strong>Trasportatore</strong>"
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
+msgid "<strong>Shipping Weight</strong>"
msgstr ""
#. module: delivery
@@ -139,54 +109,53 @@ msgid "<strong>Tracking Number</strong>"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Weight</strong>"
-msgstr ""
+msgstr "<strong>Peso</strong>"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__integration_level
msgid "Action while validating Delivery Orders"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_active
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
msgstr "Attivo"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
msgid "Amount"
-msgstr ""
+msgstr "Importo"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_amount
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__amount
msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
msgstr ""
+"Importo dell'ordine per usufruire della spedizione gratuita, espresso nella "
+"valuta dell'azienda"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Archived"
+msgstr "Contatti Archiviati"
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
+msgid "Available Carriers"
msgstr ""
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
msgid "Based on Rules"
-msgstr ""
+msgstr "Basato sulle regole"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_bulk
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_bulk
msgid "Bulk Weight"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_quant_package_shipping_weight
-msgid ""
-"Can be changed during the 'put in pack' to adjust the weight of the "
-"shipping."
-msgstr ""
+msgstr "Peso complessivo"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -195,93 +164,93 @@ msgstr "Annulla"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_package_carrier_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__carrier_id
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__package_carrier_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_id
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Click to define a new delivery method."
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_company_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
msgstr "Azienda"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
msgid "Condition"
-msgstr ""
+msgstr "Condizione"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr ""
+msgstr "Contatto"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_country_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
msgid "Countries"
-msgstr ""
+msgstr "Nazioni"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_uid
msgid "Created by"
msgstr "Creato da"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
msgstr "Creato il"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
msgid "Debug logging"
+msgstr "Debug logging"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Define a new delivery method"
msgstr ""
#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr "Consegne"
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
-msgstr ""
+msgstr "Consegna"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Delivery Carrier"
-msgstr ""
+msgstr "Trasportatore"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
msgid "Delivery Cost"
-msgstr ""
+msgstr "Costo di spedizione"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Delivery Information"
-msgstr ""
+msgstr "Informazioni di Consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_message
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_message
msgid "Delivery Message"
-msgstr ""
+msgstr "Messaggio per la spedizione"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_users__property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_sale_order__carrier_id
msgid "Delivery Method"
msgstr "Metodo di Spedizione"
@@ -303,10 +272,10 @@ msgstr ""
#: model:ir.ui.menu,name:delivery.menu_delivery_packagings
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_tree
msgid "Delivery Packages"
-msgstr ""
+msgstr "Pacchetti di consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__delivery_packaging_id
#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
msgstr ""
@@ -314,39 +283,44 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_price_rule
msgid "Delivery Price Rules"
-msgstr ""
+msgstr "Regole sui costi di consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
msgid "Delivery Product"
-msgstr ""
+msgstr "Prodotto Consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_rating_success
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_rating_success
msgid "Delivery Rating Success"
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Destination Availability"
-msgstr ""
+msgstr "Disponibilità Destinazione"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_sequence
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__sequence
msgid "Determine the display order"
-msgstr ""
+msgstr "Determina l'ordine di visualizzazione"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Discard"
-msgstr ""
+msgstr "Annulla"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_display_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_display_name
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr "Visualizza Nome"
+msgstr "Nome visualizzato"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
+msgid "Display tracking links"
+msgstr ""
#. module: delivery
#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -355,28 +329,32 @@ msgid ""
" UPS Express, UPS Standard) with a set of pricing rules attached\n"
" to each method."
msgstr ""
+"Ogni Trasportatore (es. UPS) può avere diversi metodi di spedizione (es. UPS"
+" express, UPS standard) con un insieme di prezzi e regole legate ad ogni "
+"metodo."
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__prod_environment
msgid "Environment"
-msgstr ""
+msgstr "Ambiente"
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
-#: code:addons/delivery/models/delivery_grid.py:109
#, python-format
msgid "Error: no matching grid."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
+#: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_price
msgid "Estimated Delivery Price"
-msgstr ""
+msgstr "Costo di spedizione stimato"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_sale_order_carrier_id
+#: model:ir.model.fields,help:delivery.field_sale_order__carrier_id
msgid "Fill this field if you plan to invoice the shipping based on picking."
msgstr ""
+"Riempire questo campo se si prevede di fatturare le consegne in base ai "
+"picking."
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
@@ -384,23 +362,26 @@ msgid ""
"Filling this form allows you to filter delivery carriers according to the "
"delivery address of your customer."
msgstr ""
+"La compilazione del form permette di filtrare i corrieri in base "
+"all'indirizzo di consegna del tuo cliente."
#. module: delivery
#: selection:delivery.carrier,delivery_type:0
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_fixed_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__fixed_price
msgid "Fixed Price"
-msgstr ""
+msgstr "Prezzo Fisso"
#. module: delivery
+#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
-msgstr ""
+msgstr "Consegna gratuita"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__free_over
msgid "Free if order amount is above"
-msgstr ""
+msgstr "Gratis se l'importo dell'Ordine è maggiore di"
#. module: delivery
#: selection:delivery.carrier,integration_level:0
@@ -418,37 +399,31 @@ msgid "Group By"
msgstr "Raggruppa per"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_height
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
-msgstr ""
+msgstr "Altezza"
#. module: delivery
#: sql_constraint:product.packaging:0
msgid "Height must be positive"
-msgstr ""
+msgstr "L'altezza deve essere un numero positivo"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_id
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__id
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__id
msgid "ID"
msgstr "ID"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_free_over
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__free_over
msgid ""
"If the order total amount (shipping excluded) is above or equal to this "
"value, the customer benefits from a free shipping"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:125
+#: code:addons/delivery/models/delivery_carrier.py:126
#, python-format
msgid ""
"Info:\n"
@@ -462,65 +437,60 @@ msgid "Install more Providers"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_integration_level
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__integration_level
msgid "Integration Level"
-msgstr ""
+msgstr "Livello di Integrazione"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_invoice_shipping_on_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order__invoice_shipping_on_delivery
msgid "Invoice Shipping on Delivery"
-msgstr ""
+msgstr "Fattura presente nella Consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_is_delivery
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__is_delivery
msgid "Is a Delivery"
-msgstr ""
+msgstr "È una consegna"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier___last_update
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule___last_update
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
msgstr "Data di ultima modifica"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_uid
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_uid
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_uid
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_uid
msgid "Last Updated by"
msgstr "Ultima modifica di"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_write_date
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_write_date
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__write_date
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__write_date
msgid "Last Updated on"
msgstr "Ultima modifica il"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_length
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__length
msgid "Length"
-msgstr ""
+msgstr "Lunghezza"
#. module: delivery
#: sql_constraint:product.packaging:0
msgid "Length must be positive"
-msgstr ""
+msgstr "La lunghezza deve essere positiva"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_debug_logging
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__debug_logging
msgid "Log requests in order to ease debugging"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-msgid "Manage Package Type"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
-msgstr ""
+msgstr "Margine"
#. module: delivery
#: sql_constraint:delivery.carrier:0
@@ -533,9 +503,9 @@ msgid "Margin on Rate"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__max_weight
msgid "Max Weight"
-msgstr ""
+msgstr "Peso massimo"
#. module: delivery
#: sql_constraint:product.packaging:0
@@ -543,21 +513,21 @@ msgid "Max Weight must be positive"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_max_value
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__max_value
msgid "Maximum Value"
-msgstr ""
+msgstr "Valore massimo"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_packaging_max_weight
+#: model:ir.model.fields,help:delivery.field_product_packaging__max_weight
msgid "Maximum weight shippable in this packaging"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_name
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_name
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__name
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__name
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Name"
-msgstr ""
+msgstr "Nome"
#. module: delivery
#: selection:product.packaging,package_carrier_type:0
@@ -565,77 +535,77 @@ msgid "No carrier integration"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:73
+#: code:addons/delivery/models/sale_order.py:80
#, python-format
msgid "No carrier set for this order."
-msgstr ""
+msgstr "Nessun vettore impostato nell'ordine."
#. module: delivery
-#: code:addons/delivery/models/delivery_grid.py:100
+#: code:addons/delivery/models/delivery_grid.py:102
#, python-format
msgid "No price rule matching this order; delivery cost cannot be computed."
msgstr ""
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_normal
-#: model:product.template,name:delivery.product_product_delivery_normal_product_template
-msgid "Normal Delivery Charges"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_number_of_packages
-msgid "Number of Packages"
-msgstr ""
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "OK"
+msgstr "OK"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_operator
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
-msgstr ""
+msgstr "Operatore"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Package"
-msgstr ""
+msgstr "Confezione"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_shipper_package_code
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
msgid "Package Code"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:34
-#: code:addons/delivery/models/stock_picking.py:124
+#: code:addons/delivery/models/stock_picking.py:35
+#: code:addons/delivery/models/stock_picking.py:119
#, python-format
msgid "Package Details"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_package_ids
-msgid "Packages"
+#: code:addons/delivery/wizard/choose_delivery_package.py:52
+#, python-format
+msgid "Package too heavy!"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__package_ids
+msgid "Packages"
+msgstr "Pacchetti"
+
+#. module: delivery
#: model:ir.model,name:delivery.model_product_packaging
msgid "Packaging"
-msgstr ""
+msgstr "Imballaggio"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move_line
msgid "Packing Operation"
-msgstr ""
+msgstr "Operazione di imballaggio"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_stock_quant_package_id
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__stock_quant_package_id
msgid "Physical Package"
msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_quant_package
msgid "Physical Packages"
-msgstr ""
+msgstr "Confezioni Fisiche"
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:75
+#: code:addons/delivery/models/sale_order.py:82
#, python-format
msgid ""
"Please use \"Check price\" in order to compute a shipping price for this "
@@ -652,34 +622,29 @@ msgstr "Prezzo"
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_tree
msgid "Price Rules"
-msgstr ""
+msgstr "Regole per il prezzo"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Pricing"
-msgstr ""
+msgstr "Prezzi"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_rule_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__price_rule_ids
msgid "Pricing Rules"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr "Modello Prodotto"
+msgstr "Regole del prezzo"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Provider"
-msgstr ""
+msgstr "Provider"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_sale_order_line_product_qty
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
msgstr "Quantità"
@@ -691,56 +656,51 @@ msgstr "Preventivo"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_return_picking
msgid "Return Picking"
-msgstr ""
+msgstr "Ritorna Picking"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_base_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_base_price
msgid "Sale Base Price"
-msgstr ""
+msgstr "Prezzo base di vendita"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_list_price
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
msgid "Sale Price"
-msgstr ""
+msgstr "Prezzo di Vendita"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order_line
msgid "Sales Order Line"
-msgstr "Linea ordine di vendita"
+msgstr "Riga Ordine di Vendita"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.choose_delivery_package_view_form
msgid "Save"
-msgstr ""
+msgstr "Salva"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Send Confirmation Email"
-msgstr ""
+msgstr "Invia Email di Conferma"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Send to Shipper"
-msgstr ""
+msgstr "Invia allo spedizioniere"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sequence
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
msgid "Sequence"
msgstr "Sequenza"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_prod_environment
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:168
+#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid ""
"Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: "
@@ -748,36 +708,44 @@ msgid ""
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_price
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_price
msgid "Shipping Cost"
-msgstr ""
+msgstr "Costo Spedizione"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_shipping_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__shipping_weight
msgid "Shipping Weight"
-msgstr ""
+msgstr "Peso Spedizione"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product_hs_code
-#: model:ir.model.fields,help:delivery.field_product_template_hs_code
-msgid "Standardized code for international shipping and goods declaration"
-msgstr ""
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Shipping Weight:"
+msgstr "Peso Spedizione:"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state_ids
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
-msgstr ""
+msgstr "Stati"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
msgid "Stock Move"
+msgstr "Movimento Magazzino"
+
+#. module: delivery
+#: code:addons/delivery/wizard/choose_delivery_package.py:53
+#, python-format
+msgid ""
+"The weight of your package is higher than the maximum weight authorized for "
+"this package type. Please choose another package type."
msgstr ""
#. module: delivery
-#: model:product.product,name:delivery.product_product_delivery_poste
-#: model:product.template,name:delivery.product_product_delivery_poste_product_template
-msgid "The Poste"
+#: code:addons/delivery/models/delivery_grid.py:111
+#, python-format
+msgid "There is no matching delivery rule."
msgstr ""
#. module: delivery
@@ -787,109 +755,128 @@ msgid ""
" according to your settings; on the sales order (based on the\n"
" quotation) or the invoice (based on the delivery orders)."
msgstr ""
+"Questo metodo permette di automatizzare il calcolo dei costi di spedizione\n"
+"secondo le tue impostazioni; nell'ordine cliente (basato sul preventivo) o in fattura (basato sull'ordini di consegna)."
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
-#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_partner__property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_users__property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
msgstr ""
+"Questo metodo di consegna sarà utilizzato quando si fattura da picking."
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_margin
+#: model:ir.model.fields,help:delivery.field_delivery_carrier__margin
msgid "This percentage will be added to the shipping price."
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "Trackers URL"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
-msgstr ""
+msgstr "Traccia"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_ref
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_ref
msgid "Tracking Reference"
-msgstr ""
+msgstr "Tracking di riferimento"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_url
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__carrier_tracking_url
msgid "Tracking URL"
msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking
msgid "Transfer"
-msgstr ""
+msgstr "Trasferisci"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_uom_id
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight_uom_id
msgid "Unit of Measure"
msgstr "Unità di misura"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_move_weight_uom_id
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+#: model:ir.model.fields,help:delivery.field_stock_picking__weight_uom_id
+msgid "Unit of measurement for Weight"
+msgstr "Unità di misura per peso"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_stock_picking_weight_uom_id
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr "unità"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
-msgstr ""
+msgstr "Variabile"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable_factor
+#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable_factor
msgid "Variable Factor"
-msgstr ""
+msgstr "Fattore Variabile"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_volume
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__volume
msgid "Volume"
-msgstr ""
+msgstr "Volume"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight
-#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_move__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__weight
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package__weight
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Weight"
-msgstr ""
+msgstr "Peso"
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
msgid "Weight * Volume"
-msgstr ""
+msgstr "Peso * Volume"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight_uom_id
-msgid "Weight Unit of Measure"
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__weight
+msgid "Weight computed based on the sum of the weights of the products."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_shipping_weight
+#: model:ir.model.fields,field_description:delivery.field_stock_picking__shipping_weight
msgid "Weight for Shipping"
+msgstr "Peso per Spedizione"
+
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_stock_quant_package__shipping_weight
+msgid "Weight used to compute the price of the delivery (if applicable)."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_packaging_width
-msgid "Width"
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_delivery
+#: model:ir.ui.view,arch_db:delivery.report_package_barcode_small_delivery
+msgid "Weight:"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging__width
+msgid "Width"
+msgstr "Larghezza"
+
+#. module: delivery
#: sql_constraint:product.packaging:0
msgid "Width must be positive"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:206
+#: code:addons/delivery/models/stock_picking.py:217
#, python-format
msgid ""
"You are shipping different packaging types in the same shipment.\n"
@@ -897,30 +884,48 @@ msgid ""
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:71
+#: code:addons/delivery/models/sale_order.py:78
#, python-format
msgid "You can add delivery price only on unconfirmed quotations."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:182
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "You have multiple tracker links, they are available in the chatter."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:180
#, python-format
msgid ""
"Your delivery method has no redirect on courier provider's website to track "
"this order."
msgstr ""
+"Il metodo di consegna non reindirizza al sito dello spedizioniere per il "
+"tracking dell'ordine."
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_from
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_from
msgid "Zip From"
-msgstr ""
+msgstr "Da CAP"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_to
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__zip_to
msgid "Zip To"
-msgstr ""
+msgstr "A CAP"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "e.g. UPS Express"
-msgstr ""
+msgstr "es. UPS Express"
+
+#. module: delivery
+#: model:product.product,weight_uom_name:delivery.product_product_delivery
+#: model:product.template,weight_uom_name:delivery.product_product_delivery_product_template
+msgid "kg"
+msgstr "kg"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_config_settings
+msgid "res.config.settings"
+msgstr "res.config.settings"
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index ccce8e91d3e..54faf578b48 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -3,20 +3,22 @@
# * delivery
#
# Translators:
-# grazziano <gra.negocia@gmail.com>, 2016
-# Mateus Lopes <mateus1@gmail.com>, 2016
-# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2016
-# Martin Trigaux, 2016
-# danimaribeiro <danimaribeiro@gmail.com>, 2016
-# falexandresilva <falexandresilva@gmail.com>, 2016
-# Adriel Kotviski <kotviski@gmail.com>, 2017
+# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018
+# danimaribeiro <danimaribeiro@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Mateus Lopes <mateus1@gmail.com>, 2018
+# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018
+# Adriel Kotviski <kotviski@gmail.com>, 2018
+# falexandresilva <falexandresilva@gmail.com>, 2018
+# grazziano <gra.negocia@gmail.com>, 2018
+# André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
-"Last-Translator: Adriel Kotviski <kotviski@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,22 +40,39 @@ msgstr ""
#. module: delivery
#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
msgstr ""
#. module: delivery
@@ -152,11 +171,6 @@ msgid "Carrier"
msgstr "Transportadora"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
msgstr "Empresa"
@@ -201,6 +215,11 @@ msgid "Define a new delivery method"
msgstr ""
#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr "Entregas"
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr "Entrega"
@@ -293,7 +312,7 @@ msgstr "Descartar"
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__display_name
msgid "Display Name"
-msgstr "Nome para Exibição"
+msgstr "Nome exibido"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
@@ -375,12 +394,6 @@ msgid "Group By"
msgstr "Agrupar Por"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product__hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template__hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
msgstr "Altura"
@@ -438,7 +451,7 @@ msgstr "É uma Entrega"
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier____last_update
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule____last_update
msgid "Last Modified on"
-msgstr "Última Modificação em"
+msgstr "Última modificação em"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package__write_uid
@@ -617,11 +630,6 @@ msgid "Pricing Rules"
msgstr "Regra de preços"
#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr "Modelo de Produto"
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -682,11 +690,6 @@ msgid "Sequence"
msgstr "Seqüência"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr "Definir Preço"
-
-#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr ""
@@ -717,12 +720,6 @@ msgid "Shipping Weight:"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product__hs_code
-#: model:ir.model.fields,help:delivery.field_product_template__hs_code
-msgid "Standardized code for international shipping and goods declaration"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
msgstr "Situações"
@@ -805,6 +802,12 @@ msgid "Unit of measurement for Weight"
msgstr "Unidade de medida de peso"
#. module: delivery
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr "UN"
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
msgstr "Variável"
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 09dfa2d639b..02df650660e 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -3,23 +3,23 @@
# * delivery
#
# Translators:
-# Martin Trigaux, 2017
-# Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2017
-# Murat Kaplan <muratk@projetgrup.com>, 2017
-# gezgin biri <gezginbiri@hotmail.com>, 2017
-# Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
-# Ediz Duman <neps1192@gmail.com>, 2017
-# Gökhan Erdoğdu <gokhan.erdogdu@mechsoft.com.tr>, 2017
-# Ramiz Deniz Öner <deniz@denizoner.com>, 2017
-# Gökay Kıvırcıoğlu <riza.gokay@gmail.com>, 2017
-# Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2017
+# Ediz Duman <neps1192@gmail.com>, 2018
+# Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2018
+# Martin Trigaux, 2018
+# Levent Karakaş <levent@mektup.at>, 2018
+# Murat Kaplan <muratk@projetgrup.com>, 2018
+# Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2018
+# Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2018
+# Ertuğrul Güreş <ertugrulg@projetgrup.com>, 2018
+# Ramiz Deniz Öner <deniz@denizoner.com>, 2018
+# Gökay Kıvırcıoğlu <riza.gokay@gmail.com>, 2018
# Umur Akın <umura@projetgrup.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: Umur Akın <umura@projetgrup.com>, 2018\n"
"Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
"MIME-Version: 1.0\n"
@@ -42,22 +42,39 @@ msgstr ""
#. module: delivery
#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
msgid ""
-"<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
msgstr ""
#. module: delivery
@@ -103,7 +120,7 @@ msgstr "Teslimat emirlerini doğrularken alınacak aksiyon"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__active
msgid "Active"
-msgstr "Aktif"
+msgstr "Etkin"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__amount
@@ -116,13 +133,13 @@ msgid ""
"Amount of the order to benefit from a free shipping, expressed in the "
"company currency"
msgstr ""
-"Bedelsiz nakliyeden yararlanacak sipariş tutarı, firma para biriminde "
+"Bedelsiz nakliyeden yararlanacak sipariş tutarı, şirket para biriminde "
"belirtilmiştir."
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Archived"
-msgstr "Arşivlenmiş"
+msgstr "Arşivlendi"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order__available_carrier_ids
@@ -156,14 +173,9 @@ msgid "Carrier"
msgstr "Nakliyeci"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr "Çek Bedeli"
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
-msgstr "Firma"
+msgstr "Şirket"
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_price_rule_form
@@ -173,7 +185,7 @@ msgstr "Koşul"
#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Contact"
-msgstr "Kontak"
+msgstr "İletişim"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__country_ids
@@ -192,7 +204,7 @@ msgstr "Oluşturan"
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__create_date
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__create_date
msgid "Created on"
-msgstr "Oluşturma Tarihi"
+msgstr "Oluşturulma"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__debug_logging
@@ -205,6 +217,11 @@ msgid "Define a new delivery method"
msgstr ""
#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr "Teslimatlar"
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr "Teslimat"
@@ -357,7 +374,7 @@ msgstr "Sabit Fiyat"
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
-msgstr "Ücretsiz teslimat ücretleri"
+msgstr "Ücretsiz taşıma maliyetleri"
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__free_over
@@ -380,12 +397,6 @@ msgid "Group By"
msgstr "Grupla"
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product__hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template__hs_code
-msgid "HS Code"
-msgstr "GTIP Kodu"
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
msgstr "Yükseklik"
@@ -601,8 +612,8 @@ msgid ""
"Please use \"Check price\" in order to compute a shipping price for this "
"quotation."
msgstr ""
-"Bu teklif için gönderim ücretini hesaplamak için lütfen 'Bedeli Kontrol et'i"
-" kullan."
+"Bu teklif için gönderim ücretini hesaplamak için lütfen \"Fiyatı Kontrol "
+"Et\" i kullan."
#. module: delivery
#: selection:delivery.price.rule,variable:0
@@ -627,11 +638,6 @@ msgid "Pricing Rules"
msgstr "Fiyatlandırma Kuralları"
#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr "Ürün Şablonu"
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -643,7 +649,7 @@ msgstr "Sağlayıcı"
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_sale_order_line__product_qty
msgid "Quantity"
-msgstr "Adet"
+msgstr "Miktar"
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order
@@ -692,11 +698,6 @@ msgid "Sequence"
msgstr "Sıra"
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr "Fiyat belirle"
-
-#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr "Kimlik bilgileriniz üretim için onaylandıysa, True olarak ayarlayın."
@@ -727,15 +728,9 @@ msgid "Shipping Weight:"
msgstr "Kargo Ağırlığı:"
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product__hs_code
-#: model:ir.model.fields,help:delivery.field_product_template__hs_code
-msgid "Standardized code for international shipping and goods declaration"
-msgstr "Uluslararası nakliye ve mal beyannamesi için standartlaştırılmış kod"
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
-msgstr "Durumu"
+msgstr "Durum"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_move
@@ -816,6 +811,12 @@ msgid "Unit of measurement for Weight"
msgstr "Ağırlık ölçü birimi"
#. module: delivery
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr "Adet"
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
msgstr "Değişken"