[I18N] Update 8.0 translations with latest changes from Launchpad

49 files changed, 18180 insertions, 22924 deletions

diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 9d4f3b47bd3..8921ba71d7a 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Arabic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-08 02:51+0000\n"
-"Last-Translator: kifcaliph <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "مرجع الأمر"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "التسليم عن طريق هيئة البريد"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "المقصد"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "الوزن الصافي"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "نشط"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "خط شبكة التسليم"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "شبكات التسليم"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "تسعير متقدم على حسب الوجهة"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "حجم"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "المقدار"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "خط التسليم"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "الناقل"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "امر تسليم"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "مرجع تعقب الناقل"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "اختيار ما تريد عمل له فاتورة"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "اكمل هذا الحقل اذا كنت تخطط لعمل فاتورة  للشحن بناءًا على الإختيار."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "شرط"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "وتعطي امر المتتابعة عند عرض قائمة شبكة التسليم."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "سعر التكلفة"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "بلدان"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "أمر التوصيل :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "عامل متغير"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "السعر الافتراضي"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "المقدار"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "التسليم"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "شبكة التسليم"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "ثابت"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "خط شبكة التسليم"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "شبكات التسليم"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,121 +201,112 @@ msgid "Delivery Method"
 msgstr "طريقة التوصيل"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "لا يوجد سعر!"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "حركة مخزن"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "مرجع تعقب الناقل"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "طرق التسليم"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "صافي الوزن"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "قائمة اسعار التسليم"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "خطوط الشبكة"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "المنتج المُسلم"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "تعريف الشبكة"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "التسليم عن طريق هيئة البريد"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "تحذير!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "شبكات التسليم"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "عملية"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "المقصد"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "شريك"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "ثابت"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "أمر المبيعات"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "أوامر التوصيل"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "شبكة التسليم"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "وتعطي امر المتتابعة عند عرض قائمة شبكة التسليم."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "الفاتورة لـ"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "شبكية"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "قائمة الالتقاط"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "خط التسليم"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "الاسم"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "خطوط الشبكة"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "اسم الشبكية"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "تعريف الشبكة"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "معرّف"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "شبكية"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+"اذا كان الحقل النشط خاطيء, ستسمح لك بإخفاء ناقل التسليم بدون إزالتها."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -290,55 +317,27 @@ msgstr ""
 "اذا كان الحقل النشط خاطيء, ستسمح لك بإخفاء شبكة التسليم بدون ازالتها."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "إلى الرمز"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "السعر الافتراضي"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "السعر الافتراضي (العادي)"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "تاريخ الأمر"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "اسم الشبكية"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "عدد العبوات"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "الوزن"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,169 +347,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "لا يوجد شبكة متاحة !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "الامر غير موجود في حالة السحب !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "القيمة القصوى"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "دفعة"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "الاسم"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "نشط"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "صافي الوزن"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "تاريخ الشحن"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "الوزن الصافي"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "المنتج المُسلم"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "شرط"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "سعر التكلفة"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "السعر الافتراضي (العادي)"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "متغير"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "عدد العبوات"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "سيستخدم اسلوب التسليم عندما تكون الفاتورة بالإختيار."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "عملية"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "القيمة القصوى"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "شريك"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "كمية"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "قائمة الالتقاط"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "ابدأ الرمز"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "اختيار ما تريد عمل له فاتورة"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "اكمل هذا الحقل اذا كنت تخطط لعمل فاتورة  للشحن بناءًا على الإختيار."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "السعر"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "نوع السعر"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "الشحنات الواردة"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "معلومات التسعير"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "كمية"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "سعر البيع"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "وصف"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "أمر المبيعات"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"اذا كان الحقل النشط خاطيء, ستسمح لك بإخفاء ناقل التسليم بدون إزالتها."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "قائمة اسعار التسليم"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "السعر"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "مسلسل"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "لا توجد شبكة متوافقة مع هذا الناقل !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "ابدأ الرمز"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "التسليم"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "حالات"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "الوزن * المقدار"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "حركة مخزن"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -519,62 +503,42 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "الناقل %s (id: %d( لا يوجد لديها شبكة تسليم!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "معلومات التسعير"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "تسعير متقدم على حسب الوجهة"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "الناقل"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "طرق التسليم"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "يُسجل حالة الامر كمسودة ليضاف الى خطوط التسليم."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "شبكات التسليم"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "مسلسل"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "سيستخدم اسلوب التسليم عندما تكون الفاتورة بالإختيار."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "سعر البيع"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "إلى الرمز"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "اطبع طلب توصيل"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "حالات"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -583,126 +547,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "نوع السعر"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "متغير"
 
-#~ msgid "Delivery Order"
-#~ msgstr "أمر التسليم"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "عامل متغير"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "السعر غير متاح!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "حجم"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "تحذير"
-
-#~ msgid "_Cancel"
-#~ msgstr "ال_غاء"
-
-#~ msgid "Weights"
-#~ msgstr "الأوزان"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "خطأ! لا يمكنك إنشاء أعضاء ذوي ارتباطات متداخلة."
-
-#~ msgid "Delivery Costs"
-#~ msgstr "تكاليف التسليم"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "المبيعات و المشتريات"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
+msgid "Warning!"
+msgstr "تحذير!"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "الوزن"
 
-#~ msgid "ID"
-#~ msgstr "معرّف"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "الوزن * المقدار"
 
-#~ msgid "_Apply"
-#~ msgstr "تطبيق"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "خصائص التسليمات"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "لا يوجد خط متوافق مع هذا الامر في شبكات التسليم المختارة !"
-
-#~ msgid "Make Delievery"
-#~ msgstr "قم بالتسلم"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "الشريك الناقل"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "الناقلات و التسليمات"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "انت تحاول تخصيص الكثير من ما هو دون المنتج نفسه"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "انشيء عمليات التسليم"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "يسمح لك بإضافة طرق التسليم في أوامر البيع و الاختيار.\n"
-#~ "يمكنك تحديد الناقل الخاص وشبكات تسليم للأسعار.\n"
-#~ "عند إنشاء الفواتير من الاختيار، OpenERP قادر على إضافة وحساب خط الشحن.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "قم بإنشاء وإدارة وسائل التسليم التي تحتاجها لأنشطة المبيعات الخاصة بك. يمكن "
-#~ "تعيين كل طريقة تسليم إلى قائمة السعر الذي يحسب على سعر التسليم وفقا للمنتجات "
-#~ "المباعة او المسلمة."
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "تسمح لك قائمة أسعار التسليم  لحساب التكلفة وسعر البيع للتسليم وفقا لوزن "
-#~ "المنتجات وغيرها من المعايير. يمكنك تحديد عدة قوائم للأسعار لطريقة تسليم "
-#~ "واحدة، في كل بلد أو منطقة في بلد معين محدد من قبل مجموعة اكواد بريدية."
-
-#~ msgid "Picking Policy"
-#~ msgstr "سياسة الالتقاط"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "المرجع يجب أن يكون فريداً لكل شركة علي حدا!"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "لا يمكنك نقل المنتجات أو المكان من المستعرض."
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "مرجع الأمر يجب أن يكون فريداً لكل شركة علي حدا!"
-
-#~ msgid "Cancel"
-#~ msgstr "إلغاء"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
-
-#~ msgid "Apply"
-#~ msgstr "تطبيق"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "خطأ: رقم ترميز منتجات عالمي(EAN) غير صالح"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index cac9071aa76..38ef6de3532 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-01 20:40+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Отпратка към поръчка"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Доставка по поща"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Местоназначение"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Нето тегло"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Ред от доставка"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Матрици за доставки"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Обем"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Ред от матрица"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Поръчка за доставка"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Превозвач"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Състояние"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Себестойност"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Държави"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Поръчка за доставка :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Променлив коефициент"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Доставка"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Матрица на доставка"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Фиксирана"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Ред от доставка"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Матрици на доставка"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,123 +201,113 @@ msgid "Delivery Method"
 msgstr "Начин на доставка"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Движение на наличности"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Ценоразпис за доставка"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Нето тегло"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Доставка на продукт"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Редове от матрица"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Доставка по поща"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Задание на матрица"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Матрици за доставки"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Местоназначение"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Фиксирана"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Партньор"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Нареждане за продажба"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Матрица на доставка"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Матрица"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Фактурирано към"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Ред от матрица"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Списък за товарене"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Редове от матрица"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Име"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Име на матрица"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Задание на матрица"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Матрица"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -289,55 +315,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "За пощенски код"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Дата на поръчка"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Име на матрица"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Брой пакети"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Тегло"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -347,170 +345,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Поръчката не в състояние проект !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Максимална стойност"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Партида"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Име"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Активен"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Нето тегло"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Дата на доставка"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Нето тегло"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Доставка на продукт"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Състояние"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Себестойност"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Променлив"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Брой пакети"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Този метод на доставка ще бъде използван при фактуриране от списък за "
-"товарене."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Максимална стойност"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Партньор"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Количество"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Списък за товарене"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Начален пощ. код"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Цена"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Вид цена"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Продажна цена"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Описание"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Нареждане за продажба"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Ценоразпис за доставка"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Цена"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Няма матрица която да отговаря на този транспорт !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Начален пощ. код"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Доставка"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Области"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Тегло * Обем"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Движение на наличности"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -519,33 +501,7 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Транспорт %s (идентификатор %d) няма таблица на доставки!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Превозвач"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -553,30 +509,38 @@ msgstr ""
 "редове за доставка"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Матрици на доставка"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Този метод на доставка ще бъде използван при фактуриране от списък за "
+"товарене."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Продажна цена"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "За пощенски код"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Области"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -585,149 +549,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Вид цена"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Продажби&Покупки"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Този метод на доставка ще бъде използван за фактуриране при доставка"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Ред от матрица за доставка"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Свойства на доставките"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Добавяне на цена за доставка"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Грешка: Мер. ед. по подрабиране и мер. ед. на поръчката трябва да са от една "
-#~ "и съща категория"
-
-#~ msgid "Notes"
-#~ msgstr "Бележки"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Партньор за транспорт"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Транспорт и доставки"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Цени за доставка"
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Пакетиране за фактуриране"
-
-#~ msgid "Cancel"
-#~ msgstr "Отказ"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Не е налична цена !"
-
-#~ msgid "Delivery method"
-#~ msgstr "Метод на доставка"
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Предупреждение"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "ДДС изглежда не е вярно."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Попълнете това поле ако планирате да фактурирате доставка на базата на "
-#~ "пакетиране."
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Матрици за транспорт и доставка"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Грешка: Продажни Единици трябва да е в различна категория от Мерни Единици"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Невалидно име на модел при задаване на действие"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Генериране на проект на фактура при приемане"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Променлив"
 
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Позволява да добавите методи на достава в поръчките за продажба и "
-#~ "пакетиране. Може да зададете собствени матрици за цени на доставка. Когато "
-#~ "се създават фактури от товарене Open ERP може да добави и изчисли реда за "
-#~ "доставка."
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Променлив коефициент"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Грешка: Невалиден бар код"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Обем"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "Няма ред от таблици за доставка който да съвпада със поръчката !"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Порчъка за доставка"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Означението на поръчката трябва да бъде уникално!"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Отказ"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Направи доставка"
-
-#~ msgid "Weights"
-#~ msgstr "Тегла"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Опитвате да свържете партида, която не е от същия продукт"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Тегло"
 
-#~ msgid "_Apply"
-#~ msgstr "_Прилагане"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Тегло * Обем"
 
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Създайте и управлявайте методите на доставка, от които се нуждаете за вашиет "
-#~ "продажби. Всеки метод на доставка може да бъде свързан с ценова листа, която "
-#~ "изчислява цената на доставка според продадените или доставни продукти."
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Създайте доставки"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Трябва да зададете партида за производство на този продукт"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index 3b5a5c1efad..4cf4c2e219a 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Bosnian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-02-03 19:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. narudžbe"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Dostava poštom"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " u funkciji "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Odredište"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Neto težina"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Stavka isporuke"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Jedinica mjere"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Dostavne mreže"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Poštanski broj"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linija mreže"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner koji obavlja uslugu dostave."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Otpremna narudžba"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Nema linije koja se podudara sa ovim proizvodom ili narudžbom za odabranu "
-"mrežu dostave."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Prikupljeni proizvodi koje će biti fakturisani"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Napredni sistem cijena"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Daje redosljed sekvenci kada prikazujete listu mreža isporuke."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Države"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -149,111 +55,147 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Narudžba dostave:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Varijabilni Faktor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Iznos"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Dodaj u predračun"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fiksni"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Napredni sistem cijena"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Način Dostave"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Napredne postavke cijena po destinaciji"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "CIjene nisu dostupne!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Kretanje zalihe"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Iznos narudžbe da bi dostava bila besplatna, izražena u valuti kompanije"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. praćenja prevoznika"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Neto težina"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Prevoznik"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linije Mreže"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definicija mreže"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. praćenja prevoznika"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Zakačite ovu kućicu ako želite da upravljate cijenama dostave koje zavise od "
+"destinacije, težine, ukupne vrijednosti narudžbe, itd."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operater"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Dovršite ovo polje ako planirate da fakturišete isporuku bazirano na "
+"prikupljanju proizvoda."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Uslov"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Prodajna narudžba"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cijena koštanja"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Narudžba dostave"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Države"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Ako ne dodate na narudžbu, doslovna cijena će biti izračunata kada budete "
-"fakturisali bazirano na nalozima dostave."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Prevoznik"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Zadana cijena"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -261,36 +203,61 @@ msgid "Delivery Grid"
 msgstr "Dostavna Mreža"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturirano na"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Stavka isporuke"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista prikupljanja proizvoda"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne Mreže"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Naziv"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Način Dostave"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Ako je narudžba skuplja od određenog iznosa, kupac može profitirati "
-"besplatnom dostavom."
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Metode dostave"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Iznos narudžbe da bi dostava bila besplatna, izražena u valuti kompanije"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cjenovnik dostave"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Proizvod dostave"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Dostava poštom"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Odredište"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fiksni"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -298,39 +265,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Besplatno ako je iznos narudžbe  veći od"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Meža"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Besplatno za više od %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Ako su aktivna polja postavljena na netačno, dozvoliti će Vam da sakrijete "
-"mrežu dostave bez da je uklanjate."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Na Pošt. Broj"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Zadana cijena"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Daje redosljed sekvenci kada prikazujete listu mreža isporuke."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normalna cijena"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Meža"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum narudžbe"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linija mreže"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linije Mreže"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -338,137 +307,84 @@ msgid "Grid Name"
 msgstr "Naziv Mreže"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Broj paketa"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definicija mreže"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Težina"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Zakačite ovu kućicu ako želite da upravljate cijenama dostave koje zavise od "
-"destinacije, težine, ukupne vrijednosti narudžbe, itd."
+"Ako je aktivno polje postavljeno na netačno, dozvoliti će Vam da sakrijete "
+"prevoznika bez da ga uklonite."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Ostavite prazno ako cjena zavisi od naprednih postavki cijena po destinaciji"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Mreža nije dostupna !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Nalog nije u pripremi !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivan"
+"Ako su aktivna polja postavljena na netačno, dozvoliti će Vam da sakrijete "
+"mrežu dostave bez da je uklanjate."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum Otpreme"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Ako je narudžba skuplja od određenog iznosa, kupac može profitirati "
+"besplatnom dostavom."
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Proizvod dostave"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Ako ne dodate na narudžbu, doslovna cijena će biti izračunata kada budete "
+"fakturisali bazirano na nalozima dostave."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Uslov"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cijena koštanja"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Promjenljiva"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Ostavite prazno ako cjena zavisi od naprednih postavki cijena po destinaciji"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Metoda dostave će se koristiti kada se fakturiše iz prikupljanja proizvoda."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite da definišete novu metodu dostave. \n"
-"              </p><p>\n"
-"                Svaki prevoznik (npr.: UPS) može da ima nekoliko metoda "
-"dostave \n"
-"               (npr.: UPS Express, UPS Standard) sa skupom cjenovnih "
-"pravila\n"
-"                pridruženih svakoj metodi.\n"
-"              </p><p>\n"
-"                Ove metode Vam dozvoljavaju da automatski izračunate cijenu "
-"dostave\n"
-"                u odnosu na vaše postavke; na prodajnim narudžbama "
-"(baziranim na\n"
-"                predračunima) ili fakturama (baziranim na nalozima "
-"dostave).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -476,63 +392,67 @@ msgid "Maximum Value"
 msgstr "Maksimalna vrijednost"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Količina"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Naziv"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Početni poštanski broj"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Neto težina"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Dovršite ovo polje ako planirate da fakturišete isporuku bazirano na "
-"prikupljanju proizvoda."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Neto težina"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Besplatno za više od %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Pošiljke u dolasku"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normalna cijena"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Jedinica mjere za težinu"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Broj paketa"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operater"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Ako je aktivno polje postavljeno na netačno, dozvoliti će Vam da sakrijete "
-"prevoznika bez da ga uklonite."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cjenovnik dostave"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista prikupljanja proizvoda"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Prikupljeni proizvodi koje će biti fakturisani"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -542,85 +462,110 @@ msgid "Price"
 msgstr "Cijena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nema mreže koja odgovara ovom prevozniku !"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tip cijene"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostava"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informacije o cijenama"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Težina * Zapremina"
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajne cijene"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajna narudžba"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Prevoznik %s (id: %d) nema mrežu dostave!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informacije o cijenama"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Napredne postavke cijena po destinaciji"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Početni poštanski broj"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Prevoznik"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Status"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Metode dostave"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Kretanje zalihe"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Prevoznik %s (id: %d) nema mrežu dostave!"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Status narudžbe mora biti u pripremi da bi ste dodali stavke."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Dostavne Mreže"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner koji obavlja uslugu dostave."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Metoda dostave će se koristiti kada se fakturiše iz prikupljanja proizvoda."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodajne cijene"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na Pošt. Broj"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Štampaj narudžbu dostave"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Prevoznik"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Status"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Jedinica mjere"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -629,12 +574,62 @@ msgid ""
 msgstr "Jedinica mjere je JM težine."
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tip cijene"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Jedinica mjere za težinu"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Varijabilni Faktor"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodaja i nabava"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Težina"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Težina * Zapremina"
+
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Poštanski broj"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 2188ebe5440..1bca62c0d42 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -1,164 +1,198 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Catalan translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-10-30 09:21+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. comanda"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Enviament per correu postal"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destí"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Pes net"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Línia quadrícula lliurament"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Actiu"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Quadrícules d'enviament"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volum"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Línia de la quadrícula"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Ordre de lliurament"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Albarà per ser facturat"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguiment transportista"
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
-"Indica l'ordre de seqüència quan es mostra una llista de la xarxa de "
-"lliurament"
+"Completeu aquest camp si teniu previst facturar l'enviament segons l'albarà."
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condició"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preu cost"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Països"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordre de lliurament :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Enviament"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Quadrícula d'enviament"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fix"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línia quadrícula lliurament"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Quadrícules d'enviament"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -168,121 +202,115 @@ msgid "Delivery Method"
 msgstr "Mètode d'enviament"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Moviment d'estoc"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. seguiment transportista"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifes d'enviament"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Pes net"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producte d'enviament"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Línies de la quadrícula"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Enviament per correu postal"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definició de la quadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Quadrícules d'enviament"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destí"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fix"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Comanda de venda"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista de la xarxa de "
+"lliurament"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Quadrícula d'enviament"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Quadrícula"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturat a"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línia de la quadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Albarà"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Línies de la quadrícula"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nom"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nom de quadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definició de la quadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Quadrícula"
+"Si el camp actiu es desmarca, permet amagar el transportista sense eliminar-"
+"lo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -294,55 +322,27 @@ msgstr ""
 "eliminar-la."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data comanda"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nom de quadrícula"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de paquets"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Pes"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -352,173 +352,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "No hi ha una xarxa disponible!"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "L'ordre no està en estat borrador!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor màxim"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nom"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Actiu"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Pes net"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data d'enviament"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Pes net"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producte d'enviament"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condició"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preu cost"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de paquets"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Aquest mètode de lliurament serà utilitzat quan es facturi a partir de "
-"l'albarà."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor màxim"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantitat"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarà"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Albarà per ser facturat"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Completeu aquest camp si teniu previst facturar l'enviament segons l'albarà."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Preu"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipus de preu"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Quantitat"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Preu de venda"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descripció"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Comanda de venda"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Si el camp actiu es desmarca, permet amagar el transportista sense eliminar-"
-"lo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifes d'enviament"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Preu"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "No concorda quadrícula per aquest transportista!"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Enviament"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Estats"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Pes * Volum"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Moviment d'estoc"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -527,63 +508,45 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "El transportista %s (id: %d) no disposa de quadrícula d'enviament!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
+"L'ordre ha d'estar en estat esborrany per afegir-hi línies d'enviament."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
-"L'ordre ha d'estar en estat esborrany per afegir-hi línies d'enviament."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Quadrícules d'enviament"
+"Aquest mètode de lliurament serà utilitzat quan es facturi a partir de "
+"l'albarà."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Preu de venda"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Estats"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -592,181 +555,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipus de preu"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vendes & Compres"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Genera factures esborrany en recepcions"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Línia d'enviament de la quadrícula"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propietats d'enviament"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Quadrícula de transportistes i enviaments"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV ha d'estar en una categoria diferent que la UdM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
-#~ "categoria."
-
-#~ msgid "Notes"
-#~ msgstr "Notes"
-
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "No hi ha quadrícula disponible!"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Afegeix costos d'enviament"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
-#~ msgid "Carrier Partner"
-#~ msgstr "Empresa transportista"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volum"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "No existeix línia que concordi amb aquesta ordre en les quadrícules "
-#~ "d'enviament seleccionades!"
+msgid "Warning!"
+msgstr ""
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "No hi ha preu disponible!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Pes"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Costos d'enviament"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Pes * Volum"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Codi EAN erroni"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Cancel"
-#~ msgstr "Cancel·la"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Avís"
-
-#~ msgid "Delivery method"
-#~ msgstr "Mètode d'enviament"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "El CIF/NIF no sembla ser correcte."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Completeu aquest camp si voleu facturar els enviaments des d'albarans."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permet afegir els mètodes d'enviament en les comandes de venda i albarans. "
-#~ "Podeu definir les seves pròpies taules de transportistes i destinacions pel "
-#~ "còmput de preus. En crear factures des albarans, OpenERP és capaç de sumar i "
-#~ "calcular la línia de despeses d'enviament."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Paquets a facturar"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistes i enviaments"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Aquest mètode d'enviament s'utilitzarà quan es facturi des albarans."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Error! No podeu crear membres associats recursivament."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "La referència de la comanda ha de ser única!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La llista de preus per lliurament li permet calcular el cost i preu de venda "
-#~ "del lliurament en funció del pes dels productes i d'altres criteris. Podeu "
-#~ "definir diversos preus per un mètode de lliurament, per país, o per zona "
-#~ "d'un país específic, definit per un rang de codis postals."
-
-#~ msgid "_Cancel"
-#~ msgstr "_Canceŀla"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Esteu intentant assignar un lot que no és del mateix producte"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplica"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Heu d'assignar un lot de producció per a aquest producte"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crea lliuraments"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Ordre de lliurament"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Creeu i gestioneu els mètodes de lliurament que necessiteu per a la seva "
-#~ "activitat de vendes. Cada mètode de lliurament pot ser assignat a una llista "
-#~ "de preus que calcula el preu del lliurament en funció dels productes venuts "
-#~ "o lliurats."
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realitza lliurament"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permet afegir mètodes d'enviament en comandes de venda i albarans.\n"
-#~ "     Podeu definir el seu propi transportista i xarxes de lliurament per als "
-#~ "preus.\n"
-#~ "     En crear les factures des d'albarans, OpenERP és capaç d'afegir i "
-#~ "calcular la línia de transport.\n"
-#~ "\n"
-#~ "     "
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index 5d8df9a19c3..9c762dc602f 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -1,122 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Czech translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-25 14:16+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"X-Poedit-Language: Czech\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Zn. objednávky"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Dodání poštou"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " je funkce "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Cíl"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Čistá hmotnost"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Řádek cenové úrovně"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Měrná jednotka"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Cenové úrovně"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Objem"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "PSČ"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Řádek cenové úrovně"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner, který provádí dodání."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Příkaz dodání"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"S výrobkem nebo objednávkou se neshoduje žádný řádek ve zvolených cenových "
-"úrovních dopravy."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Dodání k fakturaci"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Pokročilé nacenění"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Udává pořadí posloupnosti při zobrazení seznamu cenových úrovní dopravy."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Země"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -147,111 +51,146 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Příkaz dodání:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Proměnný koeficient"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Částka"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivní"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Přidat do nabídky"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Pevné"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Pokročilé nacenění"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Způsob doručení"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Pokročilé nacenění podle cílové adresy"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Není dostupná žádná cena!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Částka"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Pohyb zásob"
+#: help:delivery.carrier,amount:0
+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
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Sledovací číslo přepravce"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Čistá hmotnost"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Přepravce"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Řádky cenové úrovně dopravy"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definice cenových úrovní dopravy"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Sledovací číslo přepravce"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Varování!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Zaškrtněte toto pole pokud chcete spravovat ceny dopravy v závislosti na "
+"dodací adrese, hmotnosti, celkové ceně objednávky a podobně."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operátor"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Vyplňte toto pole pokud plánujete fakturovat dopravu na základě naskladnění."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Podmínka"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Prodejní objednávka"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Nákladová cena"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Příkaz dodání"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Země"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Pokud nepoužijete 'Přidat do nabídky', bude přesná cena spočítána při "
-"fakturaci na základě příkazů dodání."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Přepravce"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Výchozí cena"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dodání"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -259,36 +198,61 @@ msgid "Delivery Grid"
 msgstr "Cenové úrovně dopravy"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturováno"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Řádek cenové úrovně"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Dodací list"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cenové úrovně dopravy"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Název"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Způsob doručení"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Pokud je cena objednávky vyšší než určitá cena, může zákazník profitovat z "
-"dopravy zdarma"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Způsoby dodání"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-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"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Ceník dopravy"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Dodání výrobku"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Dodání poštou"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Cenové úrovně"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Cíl"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Pevné"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -296,39 +260,42 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Zdarma pokud je celková cena vyšší než"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Cen. úrovně"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Zdarma pokud je více než %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Pokud je aktivní pole nastaveno na nepravdu, můžete skrýt cenové úrovně "
-"dopravy bez jejich odebrání."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Na PSČ"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Výchozí cena"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Udává pořadí posloupnosti při zobrazení seznamu cenových úrovní dopravy."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Běžná cena"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cen. úrovně"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum objednání"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Řádek cenové úrovně"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Řádky cenové úrovně dopravy"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -336,285 +303,264 @@ msgid "Grid Name"
 msgstr "Název cenové úrovně"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Počet balíků"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definice cenových úrovní dopravy"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Hmotnost"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Zaškrtněte toto pole pokud chcete spravovat ceny dopravy v závislosti na "
-"dodací adrese, hmotnosti, celkové ceně objednávky a podobně."
+"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to skrýt dodacího "
+"přepravce bez jeho odebrání."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Ponechte prázdné pokud cena závisí na pokročilém nacenění k cílové adrese"
+"Pokud je aktivní pole nastaveno na nepravdu, můžete skrýt cenové úrovně "
+"dopravy bez jejich odebrání."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Žádné dostupné cenové úrovně"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Pokud je cena objednávky vyšší než určitá cena, může zákazník profitovat z "
+"dopravy zdarma"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Pokud nepoužijete 'Přidat do nabídky', bude přesná cena spočítána při "
+"fakturaci na základě příkazů dodání."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Objednávka není ve stavu koncept !"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Šarže"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivní"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Ponechte prázdné pokud cena závisí na pokročilém nacenění k cílové adrese"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum expedice"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Dodání výrobku"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Podmínka"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maximální hodnota"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Nákladová cena"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Název"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Proměnná"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Čistá hmotnost"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Způsob dodání bude použit při fakturaci z naskladnění."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Čistá hmotnost"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klikněte pro přidání nového způsobu dopravy.\n"
-"              </p><p>\n"
-"                Každý dopravce (např. UPS) může mít několik způsobů dopravy\n"
-"                (např. UPS Express, UPS Standard) spolu se sadou pravidel u "
-"každého\n"
-"                způsobu.\n"
-"              </p><p>\n"
-"                Tyto způsoby vám umožňují automaticky spočítat cenu\n"
-"                dopravy v závislosti na vašich nastaveních; na potvrzení "
-"objednávky\n"
-"                (v závislosti na nabídce) nebo faktuře (v závislosti na\n"
-"                příkazu dodání).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maximální hodnota"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Množství"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Běžná cena"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Počáteční PSČ"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Počet balíků"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Vyplňte toto pole pokud plánujete fakturovat dopravu na základě naskladnění."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operátor"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Zdarma pokud je více než %.2f"
+msgid "Order not in Draft State!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Příchozí zásilky"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Dodací list"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Měrná jednotka hmotnosti"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Dodání k fakturaci"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Popis"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to skrýt dodacího "
-"přepravce bez jeho odebrání."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Typ ceny"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Ceník dopravy"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informace o ceně"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Cena"
+msgid "Quantity"
+msgstr "Množství"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Žádná cenová úroveň pro tohoto přepravce!"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodejní cena"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dodání"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Prodejní objednávka"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Hmotnost * Objem"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Přepravce %s (id: %d) nemá cenové úrovně dopravy!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informace o ceně"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Posloupnost"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Pokročilé nacenění podle cílové adresy"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Počáteční PSČ"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Přepravce"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stavy"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Způsoby dodání"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Pohyb zásob"
+
+#. module: delivery
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Přepravce %s (id: %d) nemá cenové úrovně dopravy!"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Stav objednávky musí být koncept pro přidání dodacích řádků."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cenové úrovně dopravy"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner, který provádí dodání."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Posloupnost"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Způsob dodání bude použit při fakturaci z naskladnění."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodejní cena"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na PSČ"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Vytisknout příkaz dodání"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Přepravce"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Stavy"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Měrná jednotka"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -624,108 +570,62 @@ msgstr ""
 "Měrná jednotka (Měrná jednotka) je jednotka, ve které se měří hmotnost"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Typ ceny"
-
-#~ msgid "Cancel"
-#~ msgstr "Storno"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Měrná jednotka hmotnosti"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Objednávka doručení"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Proměnná"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Žádná dostupná cena !"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Odkaz objednávky musí být jedinečný !"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Vlastnosti doručení"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Ceník dodání vám umožní spočítat cenu a prodejní cenu přepravy podle "
-#~ "hmotnosti výrobků a dalších kritérií. Můžete určit několik ceníků pro jednu "
-#~ "dodací metodu podle země nebo zóny ve specifické zemi určené podle rozsahu "
-#~ "počtovního kódu."
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Proměnný koeficient"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Neodpovídají žádné řádky této objednávce, pokud je vybrána dodací síť !"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Vytvořit a spravovat dodací metody, které chcete pro vaše prodejní aktivity. "
-#~ "Každá dodací metoda může být přiřazena k ceníku, který spočítá cenu přepravy "
-#~ "podle výrobků prodaných nebo dodaných."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Objem"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Varování"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Zrušit"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Provést dodání"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Umožní vám přidat dodací metody v prodejním příkazu a navádění.\n"
-#~ "     Můžete určit vaše ceny přepravce and dodací sítě.\n"
-#~ "     Když vytváříte faktury z navádění, OpenERP je schopný přidat a spočítat "
-#~ "dodací řádky.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Weights"
-#~ msgstr "Váhy"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Chyba ! Nemůžete vytvořit rekurzivní asociované členy."
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Přepravní partner"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodeje & Nákupy"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Vytvořit dodání"
+msgid "Warning!"
+msgstr "Varování!"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Ceny dodání"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Hmotnost"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Hmotnost * Objem"
 
-#~ msgid "_Apply"
-#~ msgstr "_Použít"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "PSČ"
 
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Přepravci a doručení"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index e0fbd02292a..226f38069c8 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -1,162 +1,197 @@
 # Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-08 22:36+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ordre ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Levering med post"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Mål"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Netto vægt"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr ""
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr "Tilføj i tilbud"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Enhed"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Avanceret prissætning"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr ""
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Avanceret prisstyring pr. destination"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Mængde/beløb"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Postnummer"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "Ordrebeløb for at få fri levering, angivet i firmaets valuta"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner der står for leveringen."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportør"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Leverings ordre"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Transportør sporings reference"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Pluk til fakturering"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "Udfyld dette felt hvis du vil fakturere transport baseret på pluk."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Avanceret prissætning"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Betingelse"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kost pris"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Lande"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Leverings ordre :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Variabel faktor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Standard pris"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Mængde/beløb"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Levering"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr "Tilføj i tilbud"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fast"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,120 +201,110 @@ msgid "Delivery Method"
 msgstr "Leveringsmåde"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Ingen pris findes !"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Leveringsmåder"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Lager flytning"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Leverings prisliste"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Transportør sporings reference"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Netto vægt"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Levering med post"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Mål"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Advarsel!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operatør"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "Fri hvis ordre total er mere end"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis hvis større end %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Salgsordre"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Leverings-ordrer"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transport firma"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Faktureret til"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Plukliste"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Navn"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr "Hvis ordren overstiger et vist beløb, kan kunden få fri levering"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr "Ordrebeløb for at få fri levering, angivet i firmaets valuta"
-
-#. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "Fri hvis ordre total er mere end"
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
@@ -290,55 +315,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Standard pris"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normal Pris"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Ordredato"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr "Hvis ordren overstiger et vist beløb, kan kunden få fri levering"
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Antal pakker"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Vægt"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,168 +345,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Ordren er ikke i kladde status !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimal værdi"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Navn"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiv"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netto vægt"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Forsendelses dato"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Netto vægt"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Betingelse"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kost pris"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normal Pris"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "variabel"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Antal pakker"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Leveringsmåden bruges ved fakturering fra pluk."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatør"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maksimal værdi"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Mængde"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Plukliste"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Pluk til fakturering"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "Udfyld dette felt hvis du vil fakturere transport baseret på pluk."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis hvis større end %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Pris type"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Indkommende leverancer"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Pris information"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Mængde"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Vægt enhed"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Salgspris"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Beskrivelse"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Leverings prisliste"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Pris"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Rækkefølge"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Levering"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Vægt * volumen"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lager flytning"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -518,85 +501,107 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Pris information"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Avanceret prisstyring pr. destination"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportør"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Leveringsmåder"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 "Ordren skal være i kladde-status for at man kan tilføje leverings-linier."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr ""
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner der står for leveringen."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Rækkefølge"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Leveringsmåden bruges ved fakturering fra pluk."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Salgspris"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Udskriv leverings ordre"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transport firma"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Enhed"
+
+#. module: delivery
 #: help:stock.move,weight_uom_id:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr "Enhed er enheden for vægt."
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Pris type"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Vægt enhed"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Ingen pris tilgængelig"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "variabel"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabel faktor"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Advarsel!"
+msgid "Warning!"
+msgstr "Advarsel!"
 
-#~ msgid "Weights"
-#~ msgstr "Vægte"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Vægt"
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Vægt * volumen"
+
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Postnummer"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index fa1f6d4b357..39439174074 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -1,121 +1,27 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# German translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-09 21:56+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-28 10:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
-"Language-Team: \n"
+"Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-30 08:37+0000\n"
+"X-Generator: Launchpad (build 17176)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Referenz Auslieferung"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Auslieferung durch DHL"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " in Bezug auf "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Lieferziel"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Nettogewicht"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Liefertarifposition"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Einheit"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Auslieferungstarif"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "PLZ"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Tarifpositionen"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Der Partner, der die Lieferung abwickelt"
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Lieferauftrag"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Keine Zeile entspricht dem Produkt oder Auftrag in der gewählten "
-"Liefertabelle."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Abzurechnende Lieferungen"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Vorauskasse"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Reihenfolge bei Anzeige der Liste für Frachttarife"
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Länder"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -134,7 +40,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"p class=\"oe_view_nocontent_create\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "\n"
 "Klicken Sie, um eine Preisliste für spezifische Regionen zu definieren.\n"
 "              </p><p>\n"
@@ -150,111 +56,163 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Lieferauftrag:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie hier zur Erstellung einer neuen "
+"Auslieferungsmethode.\n"
+"              </p><p>\n"
+"                Jeder Frachtführer (z.B. UPS) kann verschiedene "
+"Auslieferungsmethoden (e.g.\n"
+"                UPS Express, UPS Standard) mit unterschiedlichen "
+"Tarifbedingungen anbieten.\n"
+"              </p><p>\n"
+"                Die Auslieferungsmethode ermöglicht eine  genaue Kalkulation "
+"der Frachtkosten\n"
+"                nach Ihren Einstellungen; wahlweise beim Angebot (auf Basis\n"
+"                eines Angebots) oder spätestens bei der Rechnung (auf Basis "
+"von Auslieferungen).\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Variabl. Faktor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Betrag"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
-msgstr "Um Angebot erweitern"
+msgstr "Dem Angebot hinzufügen"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fest"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Detaillierte Preisfindung"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Auslieferungsmethode"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Vorauskasss je Destination"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Kein Preis verfügbar!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Betrag"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Lagerbuchung"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Betrag (in Unternehmenswährung) des Auftrags ab dem kostenfrei geliefert wird"
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr "Verfügbar"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Frachtführer"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr "Frachtführerinformation"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "Frachtführer Referenz"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Nettogewicht"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Tarifpositionen"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Ankreuzen, wenn Ihre Lieferpreise von Ziel, Gewicht, Gesamtbetrag, etc "
+"abhängen"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definition Auslieferungstarif"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Tragen Sie in diesem Feld etwas ein, wenn Sie die Auslieferung bei "
+"Rechnungsstellung über den Lieferauftrag mit abrechnen möchten."
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Warnung !"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Konditionen"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Herstellungskosten"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Länder"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Verkaufsauftrag"
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr "Erstellt von"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Auslieferung Aufträge"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr "Erstellt am"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr ""
-"Wenn Sie nicht 'Hinzufügen in Rechnung' aktivieren, wird der exakte Preis "
-"bei der Abrechnung im Rahmen der Lieferung berechnet."
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Standardpreis"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportfirma"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Lieferung"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,213 +220,186 @@ msgid "Delivery Grid"
 msgstr "Auslieferungstarif"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Berechnet an"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Liefertarifposition"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lieferschein"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Auslieferungstarif"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Name"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Auslieferungsmethode"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Wenn der Verkaufsauftrag einen bestimmten  Betrag übersteigt, kann der Kunde "
-"eine kostenfreie Lieferung erhalten"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Auslieferungsmethoden"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Betrag (in Unternehmenswährung) des Auftrags ab dem kostenfrei geliefert wird"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Auslieferungstarife"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "Kostenfrei wenn Gesamtbetrag höher ist als"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Auslieferungsprodukt"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Tarif"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Auslieferung durch DHL"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr "Durch Deaktivierung können Sie die  Liefertarife ausblenden"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Auslieferungstarif"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "An PLZ"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Lieferziel"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Standardpreis"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fest"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normalpreis"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "Kostenfrei wenn Gesamtbetrag höher ist als"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Auftragsdatum"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Frei wenn mehr als %.2f"
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Tarif"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr "Grundinformation"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Anzahl der Pakete"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr "Reihenfolge bei Anzeige der Liste für Frachttarife"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Gewicht"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Reihenfolge bei Anzeige der Liste für Frachttarife"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
-msgstr ""
-"Ankreuzen, wenn Ihre Lieferpreise von Ziel, Gewicht, Gesamtbetrag, etc "
-"abhängen"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tarif"
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr ""
-"Leer lassen, wenn die Preisfindung von der erweiterten Preisfindung je Ziel "
-"abhängt"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Tarifpositionen"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Kein Tarif definiert!"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Tarifpositionen"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Tarifbezeichnung"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Auftrag nicht im Entwurfsstadium!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definition Auslieferungstarif"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Los"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiv"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+"Durch Deaktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Lieferdatum"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr "Durch Deaktivierung können Sie die  Liefertarife ausblenden"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Auslieferungsprodukt"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Wenn der Verkaufsauftrag einen bestimmten  Betrag übersteigt, kann der Kunde "
+"eine kostenfreie Lieferung erhalten"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Konditionen"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Wenn Sie nicht 'Hinzufügen in Rechnung' aktivieren, wird der exakte Preis "
+"bei der Abrechnung im Rahmen der Lieferung berechnet."
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Herstellungskosten"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr "Ist eine Auslieferung"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabel"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr "Ist diese Frachtmethode für den Auftrag möglich."
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
-"Diese Auslieferungsmethode wird angewendet, wenn vom Lieferauftrag auch die "
-"Rechnung erstellt wird."
+"Leer lassen, wenn die Preisfindung von der erweiterten Preisfindung je Ziel "
+"abhängt"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klicken Sie hier zur Erstellung einer neuen "
-"Auslieferungsmethode.\n"
-"              </p><p>\n"
-"                Jeder Frachtführer (z.B. UPS) kann verschiedene "
-"Auslieferungsmethoden (e.g.\n"
-"                UPS Express, UPS Standard) mit unterschiedlichen "
-"Tarifbedingungen anbieten.\n"
-"              </p><p>\n"
-"                Die Auslieferungsmethode ermöglicht eine  genaue Kalkulation "
-"der Frachtkosten\n"
-"                nach Ihren Einstellungen; wahlweise beim Angebot (auf Basis\n"
-"                eines Angebots) oder spätestens bei der Rechnung (auf Basis "
-"von Auslieferungen).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert durch"
+
+#. module: delivery
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -476,62 +407,67 @@ msgid "Maximum Value"
 msgstr "Max. Wert"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Menge"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Name"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Start PLZ"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Nettogewicht"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Tragen Sie in diesem Feld etwas ein, wenn Sie die Auslieferung bei "
-"Rechnungsstellung über den Lieferauftrag mit abrechnen möchten."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Nettogewicht"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Frei wenn mehr als %.2f"
+msgid "No Grid Available!"
+msgstr "Es ist kein Tarif verfügbar!"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Wareneingang"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr "Es gibt keinen Tarif für den Frachtführer!"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normalpreis"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Gewichtseinheit"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Anzahl der Pakete"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Beschreibung"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Ausführender"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Durch Aktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
+msgstr "Der Auftrag ist nicht im Entwurf Status!"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Auslieferungstarife"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lieferschein"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Abzurechnende Lieferungen"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -541,339 +477,178 @@ msgid "Price"
 msgstr "Preis"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Kein Tarif für diesen Frachtführer definiert!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Preistyp"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Lieferung"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Preisinformation"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Gewicht * Volumen"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Der Frachtführer %s (id: %d) hat kein passendes Tarifmodell!"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Preisinformation"
+msgid "Quantity"
+msgstr "Menge"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Vorauskasss je Destination"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Verkaufspreis"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Frachtführer"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Verkaufsauftrag"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Auslieferungsmethoden"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
-"Der Auftragsstatus muss 'Entwurf' sein, um Versandpositionen hinzuzufügen."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Auslieferungstarif"
+"Das ausgewählte Produkt zu dieser Auslieferungsmethode erfüllt keine der "
+"Tarif Kriterien."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Folge"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Verkaufspreis"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Lieferauftrag drucken"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Start PLZ"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Staaten"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Mengeneinheit (ME) ist die Einheit für die Ermittlung des Gewichts"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerbuchung"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Preistyp"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Lieferkosten Hinzufügen"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Lieferungen Eigenschaften"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Der Frachtführer %s (id: %d) hat kein passendes Tarifmodell!"
 
-#~ msgid "Sales & Purchases"
-#~ msgstr "Verkauf & Einkauf"
+#. module: delivery
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Der Auftragsstatus muss 'Entwurf' sein, um Versandpositionen hinzuzufügen."
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Der Partner, der die Lieferung abwickelt"
 
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Erzeuge Rechnung im Entwurf aus Reservierung"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Diese Auslieferungsmethode wird angewendet, wenn vom Lieferauftrag auch die "
+"Rechnung erstellt wird."
 
-#~ msgid "Delivery line of grid"
-#~ msgstr "Auslieferungsposition"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Bis PLZ"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportfirma"
 
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Ausliefererungsnetz"
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr "Es kann keine Auslieferungsmethode ermittelt werden!"
 
-#~ msgid "Notes"
-#~ msgstr "Bemerkungen"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Einheit"
 
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Kein Netz verfügbar!"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Mengeneinheit (ME) ist die Einheit für die Ermittlung des Gewichts"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Lieferkosten"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Gewichtseinheit"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Fehler: Falscher EAN code"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabel"
 
-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabl. Faktor"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Warnung"
-
-#~ msgid "Delivery method"
-#~ msgstr "Auslieferungsmethode"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Die USt. scheint falsch zu sein."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Lieferungen zu verrechnen"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Erlaubt Liefermethoden für Verkäufe und Lieferungen zu definieren. Sie "
-#~ "können Ihre eigenen Matrizen für Fächter und Preise festlegen. Wenn die "
-#~ "Rechnungslegung vom Lieferschein erfolgt, kann OpenERP die Liefermethode "
-#~ "festlegen."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Dieses Feld ausfüllen, wenn die Rechnungslegung aufgrund der Lieferung "
-#~ "erfolgen soll"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Diese Liefermethode wird verwendet, wenn die Rechnungslegung aufgrund der "
-#~ "Lieferscheine erfolgt"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
-#~ "Mengeneinheit"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fehler: Die Standard Mengeneinheit sowie die Beschaffungs Mengeneinheit muss "
-#~ "in derselben Kategorie sein."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Kein Preis verfügbar!"
+msgid "Warning!"
+msgstr "Warnung!"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Gewicht"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Keine Auftragsposition passend zum ausgewählten Tarifmodell des "
-#~ "Logistikpartners."
-
-#~ msgid "_Cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Beginne Auslieferung"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Sie können die Auslieferungsmethode in Ihrem Verkaufsauftrag oder beim "
-#~ "Lieferschein angeben.\n"
-#~ "  Hierbei können Sie Ihre Paketdienste oder Ihre eigenen Transportmittel für "
-#~ "die Versendung mitsamt der Tarife und Liefernetze definieren.\n"
-#~ "  Wenn Sie dann Rechnungen vom Lieferauftrag direkt erstellen, ist OpenERP "
-#~ "in der Lage die  Fracht- und Versendungskosten mit abzurechnen.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Weights"
-#~ msgstr "Gewichte"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Logistik Partner"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Erstelle Auslieferungsauftrag"
-
-#~ msgid "_Apply"
-#~ msgstr "Anwenden"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Frachtführer und Lieferungen"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Lieferauftrag"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr ""
-#~ "Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Die Bestellreferenz muss eindeutig sein!"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Erstellen und verwalten Sie die Auslieferungsmethoden, die für die "
-#~ "Abwicklung und Abrechnung der Distribution Ihrer Lieferungen benötigt "
-#~ "werden. Jede Auslieferungsmethode kann dabei fest mit einer Preisliste "
-#~ "verbunden werden, die eine individuelle Berechnung der Frachtkosten für "
-#~ "einen Lieferauftrag ermöglicht."
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Die Anwendung Auslieferungstarif ermöglicht eine Kalkulation von "
-#~ "Selbstkosten- und Verkaufspreis der Frachtkosten in Abhängigkeit von Produkt-"
-#~ " und Verpackungsgewicht, Entfernung und anderer Kriterien des "
-#~ "Lieferauftrags. Sie können dabei je nach Land, Postleitzahlenbereich oder "
-#~ "Region verschiedene Tarife für Ihre Auslieferungsmethoden definieren."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Definieren Sie Ihre Auslieferungsmethoden und deren Preisfindung. Die "
-#~ "Lieferkosten können auf dem Verkaufsauftrag oder der Rechnung ausgewiesen "
-#~ "werden, basierend auf dem Verkaufsauftrag."
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definiere Liefermethode"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Bestimmen Sie Ihre Liefermethode."
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Liefermethode"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Die Referenz muss je Firma eindeutig sein"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Wählen Sie Ihre Standard Liefer Methode"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Alle Produkte auf einmal Liefern"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Frei wenn mehr als"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Definieren Sie die Liefermethoden und deren Preisfindung, um die "
-#~ "Lieferkosten zu fakturieren, wenn die Rechnung auf Lieferaufträgen basiert"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Gewicht * Volumen"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Liefere jedes Produkt bei Verfügbarkeit"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr "Berechnung an:"
 
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Apply"
-#~ msgstr "Anwenden"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "PLZ"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Keine Zeile des Auslieferungsplans trifft für das gewählte Produkt zu."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr "im Auftrag von"
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index dac550ae0f5..06b237f6b0c 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -1,162 +1,197 @@
 # Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-25 17:31+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Παρ. Παραγγελίας"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Παράδοση μέσω Ταχυδρομείου"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Προορισμός"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Καθαρό βάρος"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Ενεργό"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Πίνακες Παραδόσεων"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Όγκος"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Γραμμή Πίνακα"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Εντολή παράδοσης"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Μεταφορέας"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Κατάσταση"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Τιμή Κόστους"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Χώρες"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Εντολή παράδοσης:"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Παράγοντας Μεταβλητής"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Παράδοση"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Πίνακας Παραδόσεων"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Σταθερό"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Πλέγμα Παράδοσης"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,123 +201,113 @@ msgid "Delivery Method"
 msgstr "Μέθοδος Παράδοσης"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Κίνηση Αποθέματος"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Τιμοκατάλογος Παραδόσεων"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr ""
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Προϊόν Παράδοσης"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Γραμμές Πίνακα"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Παράδοση μέσω Ταχυδρομείου"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Ορισμός πίνακα"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Πίνακες Παραδόσεων"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Προορισμός"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Λειτουργός"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Σταθερό"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Συνεργάτης"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Παραγγελία Πώλησης"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Πίνακας Παραδόσεων"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Πίνακας"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Τιμολογημένο σε"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Γραμμή Πίνακα"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Λίστα Παραλαβής"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Γραμμές Πίνακα"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Όνομα"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Όνομα Πλέγματος"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Ορισμός πίνακα"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Πίνακας"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -290,55 +315,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Έως ΤΚ"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Ημερομηνία Παραγγελίας"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Όνομα Πλέγματος"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Αριθμός Πακέτων"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Βάρος"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,168 +345,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Η εντολή δεν βρίσκεται σε πρόχειρη κατάσταση!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Μέγιστη Τιμή"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Παρτίδα"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Όνομα"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Ενεργό"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Ημερομηνία Αποστολής"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Καθαρό βάρος"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Προϊόν Παράδοσης"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Κατάσταση"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Τιμή Κόστους"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Μεταβλητή"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Αριθμός Πακέτων"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Λειτουργός"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Μέγιστη Τιμή"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Συνεργάτης"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Ποσότητα"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Λίστα Παραλαβής"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Έναρξη ΤΚ"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Τιμή"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Τύπος Τιμής"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Ποσότητα"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Τιμή Πώλησης"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Περιγραφή"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Παραγγελία Πώλησης"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Τιμοκατάλογος Παραδόσεων"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Τιμή"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Αλληλουχία"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Κανένας πίνακας δεν ταιριάζει με αυτόν τον μεταφορέα!"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Έναρξη ΤΚ"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Παράδοση"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Καταστάσεις"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Βάρος * Όγκος"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Κίνηση Αποθέματος"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -518,33 +501,7 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Ο μεταφορέας %s (κωδ: %d) δεν έχει πίνακα παραδόσεων!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Μεταφορέας"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -552,30 +509,36 @@ msgstr ""
 "γραμμές παράδοσης"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Πλέγμα Παράδοσης"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Αλληλουχία"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Τιμή Πώλησης"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Έως ΤΚ"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Καταστάσεις"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -584,129 +547,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Τύπος Τιμής"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Πωλήσεις & Αγορές"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
-#~ "ειδικούς χαρακτήρες!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Αυτή η μέθοδος παράδοσης θα χρησιμοποιείται όταν τιμολογείτε απο φόρτωση."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Σφάλμα! Δεν επιτρέπεται η δημιουργία μελών σε κυκλικό συσχετισμό"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Γραμμή Παράδοσης του πίνακα"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Δημιουργία Πρόχειρων Τιμολογίων Απο Παραλαβές"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Ιδιότητες Παραδόσεων"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Μεταφορέας και πίνακας παραδόσεων"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Σφάλμα: η 2η ΜΜ θα πρέπει να είναι σε διαφορετική κατηγορία απο την 1η ΜΜ"
-
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Κανένα διαθέσιμο πλέγμα!"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Σφάλμα: Η προκαθορισμένη 1η ΜΜ και η 1η ΜΜ αγορών θα πρέπει να ανήκουν στην "
-#~ "ίδια κατηγορία."
-
-#~ msgid "Notes"
-#~ msgstr "Σημειώσεις"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Προσθήκη Κόστους Παράδοσης"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Μεταφορείς και παραδόσεις"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Κόστη Παραδόσεων"
-
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Καμία γραμμή δεν ταιριάζει με αυτήν την εντολή για τον επιλεγμένο πίνακα "
-#~ "παραδόσεων!"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Συνεργάτης Μεταφορέας"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Συμπληρώστε αυτό το πεδίο εάν σχεδιάζετε να τιμολογείτε την μεταφορά "
-#~ "βασιζόμενη στην φόρτωση."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Σας επιτρέπει να προσθέτετε μεθόδους παραδόσεων σε εντολές πωλήσεων και "
-#~ "παραδόσεων. Μπορείτε να ορίσετε τον δικό σας μεταφορέα και τους πίνακες "
-#~ "παραδόσεων για τιμές. Όταν δημιουργείτε ένα τιμολόγιιο απο φορτώσεις, το "
-#~ "Open ERP είναι ικανό να προσθέτει και να υπολογίζει την μεταφορά."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Φορτώσεις που περιμένουν να τιμολογηθούν"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Καμία διαθέσιμη τιμή!"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Μεταβλητή"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Ο ΦΠΑ φαίνεται να μην είναι σωστός."
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Παράγοντας Μεταβλητής"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Σφάλμα: Άκυρος κωδικός EAN"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Όγκος"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Προειδοποίηση"
-
-#~ msgid "Delivery method"
-#~ msgstr "Μέθοδος Παραδόσεων"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Cancel"
-#~ msgstr "Άκυρο"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Βάρος"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Βάρος * Όγκος"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Εντολή Παράδοσης"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "_Cancel"
-#~ msgstr "_Άκυρο"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid "_Apply"
-#~ msgstr "_Εφαρμογή"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 8f5782c23c3..244e5b9f977 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -1,122 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Spanish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-24 10:20+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-15 08:19+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-16 06:55+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " en función de "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso neto"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Línea cuadrícula envío"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Cuadrículas de envío"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "C.P."
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Línea de la cuadrícula"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Empresa que realiza el servicio de entrega."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orden entrega"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"No existe línea para este producto o pedido en la tabla de envío "
-"seleccionada."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Albarán para ser facturado"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Precio avanzado"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
-"envío."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Países"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -149,149 +53,221 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden entrega :"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir un nuevo método de envío.\n"
+"</p><p>\n"
+"Cada transportista (por ejemplo, UPS) puede tener varios método de\n"
+"envío (por ejemplo, UPS express, UPS estándar) con un conjunto de\n"
+"reglas de precio relacionadas con cada método.\n"
+"</p><p>\n"
+"Estos métodos permite calcular automáticamente el precio de envío,\n"
+"de acuerdo con su configuración, en los pedidos de venta (basados en\n"
+"presupuestos) o en la factura (basada en los albaranes de entrega).\n"
+"</p>\n"
+"            "
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Importe"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Añadir en presupuesto"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fijo"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Precio avanzado"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Método de envío"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Precio avanzado por destino"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "¡Precio no disponible!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Importe"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Importe del pedido que se beneficiaría de una entrega gratuita, expresado en "
+"la moneda de la compañía"
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr "Disponible"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr "Información del transportista"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "Ref. seguimiento transportista"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso neto"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Marque esta casilla si desea administrar precios de entrega que dependen del "
+"destino, el peso, el total del pedido, etc"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Líneas de la cuadrícula"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo si tiene previsto facturar el envío según el albarán."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición de la cuadrícula"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Países"
+
+#. module: delivery
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: delivery
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
 #, python-format
-msgid "Warning!"
-msgstr "¡Aviso!"
+msgid "Default price"
+msgstr "Precio por defecto"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Tabla de envío"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línea de la tabla de envío"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Albaranes de salida"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Tablas de envío"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr ""
-"Si no se 'Añade en presupuesto', el precio exacto se calculará cuando "
-"facture a partir de albaran(es)."
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Método de envío"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportista"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Formas de envío"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Cuadrícula de envío"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Tablas de envío"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Si el pedido es superior a cierto importe, el cliente puede ser beneficiado "
-"con envío gratuito."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Importe del pedido que se beneficiaría de una entrega gratuita, expresado en "
-"la moneda de la compañía"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -299,235 +275,196 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Gratis si el total del pedido es mayor que"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Cuadrícula"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis si es superior a %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr "Información general"
+
+#. module: delivery
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la cuadrícula de envío sin "
-"eliminarla."
+"Proporciona el orden de secuencia cuando se calcula la tabla de envíos."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de tablas de envío."
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Precio por defecto"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tabla"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Precio normal"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de la tabla"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha entrega"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Líneas de la tabla"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr "Nombre cuadrícula"
+msgstr "Nombre de la tabla"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de bultos"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición de la tabla"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Marque esta casilla si desea administrar precios de entrega que dependen del "
-"destino, el peso, el total del pedido, etc"
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Dejar vacío si el precio depende de un precio anticipado por destino."
+"Si el campo activo se desmarca, permite ocultar la tabla de envío sin "
+"eliminarla."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "¡No hay una cuadrícula disponible!"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Si el pedido es superior a cierto importe, el cliente puede ser beneficiado "
+"con envío gratuito."
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Si no se 'Añade en presupuesto', el precio exacto se calculará cuando "
+"facture a partir de albarán(es)."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "¡La orden no está en estado borrador!"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr "Es un envío"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr "El método de envío es posible con el pedido actual."
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Dejar vacío si el precio depende de un precio anticipado por destino."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha envío"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr "Última actualización de"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producto de envío"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr "Última actualización en"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Este método de entrega será utilizado cuando se facture a partir del albarán."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para definir una nueva forma de envío.\n"
-"</p><p>\n"
-"Cada transportista (por ejemplo, UPS) puede tener varias formas de envío "
-"(por ejemplo, UPS express, UPS estándar) con un conjunto de reglas de "
-"precios para cada método.\n"
-"</p><p>\n"
-"Estos método permiten calcular automáticamente el precio del envío de "
-"acuerdo a su configuración: sobre el pedido de venta (basado en el "
-"presupuesto) o sobre la factura (basado en las órdenes de entrega).\n"
-"</p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr "Sin datos de gastos disponibles"
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr "No hay coincidencia de tabla de envío para este transportista"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Precio normal"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complete este campo si tiene previsto facturar el envío según el albarán."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis si es superior a %.2f"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Albaranes de entrada"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+msgid "Order not in Draft State!"
+msgstr "El pedido no está en borrador"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unidad de medida para el peso"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descripción"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el transportista sin "
-"eliminarlo."
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -537,329 +474,176 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "¡No concuerda cuadrícula para este transportista!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Envío"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Información de precios"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volumen"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Información de precios"
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Precio avanzado por destino"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Formas de envío"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea de pedido de venta"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
+"El producto seleccionado en el método de envío no cumple ninguno de los "
+"criterios de la tabla de envíos"
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Precio de venta"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Imprimir albarán de salida"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Provincias"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "La unidad de medida es la unidad de medición del peso"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de precio"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventas & Compras"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generar facturas borrador en recepciones"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Línea de envío de la cuadrícula"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades de envío"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Cuadrícula de transportistas y envíos"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-#~ "categoría."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "¡No hay cuadrícula disponible!"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Añadir costes de envío"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Empresa transportista"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
-#~ "seleccionadas!"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "¡El transportista %s (id: %d) no dispone de una tabla de envío!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "¡No existe precio disponible!"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Costes de envío"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Empresa que realiza el servicio de entrega."
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Este método de entrega será utilizado cuando se facture a partir del albarán."
 
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "Delivery method"
-#~ msgstr "Método de envío"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "El CIF/NIF no parece estar correcto."
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistas y envíos"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Este método de envío se utilizará cuando se facture desde albaranes."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Complete este campo si desea facturar los envíos desde albaranes."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite añadir los métodos de envío en los pedidos de venta y albaranes. "
-#~ "Puede definir sus propias tablas de transportistas y destinos para el "
-#~ "cálculo de precios. Al crear facturas desde albaranes, OpenERP es capaz de "
-#~ "sumar y calcular la línea de gastos de envío."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Albaranes a facturar"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar entrega"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crear entregas"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite añadir métodos de envío en pedidos de venta y albaranes.\n"
-#~ "    Puede definir su propio transportista y cuadrículas de envío para los "
-#~ "precios.\n"
-#~ "    Al crear las facturas desde albaranes, OpenERP es capaz de añadir y "
-#~ "calcular la línea de transporte.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Delivery Order"
-#~ msgstr "Orden de entrega"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de producción para este producto"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Cree y gestione los métodos de entrega que necesite para su actividad de "
-#~ "ventas. Cada método de entrega puede ser asignado a una lista de precios que "
-#~ "calcula el precio de la entrega en función de los productos vendidos o "
-#~ "entregados."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "¡La referencia del pedido debe ser única!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La lista de precios por entrega le permite calcular el coste y precio de "
-#~ "venta de la entrega en funvión del peso de los productos y de otros "
-#~ "criterios. Puede definir varios precios por un método de entrega, por país, "
-#~ "o por zona de un páis específico, definido por un rango de códigos postales."
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratis si es más que"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Elija la política de envío predeterminada"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportista"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Ninguna línea coincide con este producto o el pedido en la cuadrícula de "
-#~ "envío elegida."
+msgid "Unable to fetch delivery method!"
+msgstr "No se puede obtener el método de envío"
 
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Defina sus métodos de entrega con sus precios. Los gastos de envío pueden "
-#~ "ser agregados en el pedido de venta o en la factura, basados en las órdenes "
-#~ "de entrega."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "Asistente de definición de los pasos de entrega"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definir métodos de envío"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "La unidad de medida es la unidad de medición del peso"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Configure su política de envío"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unidad de medida para el peso"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Política de envío"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "¡La referencia debe ser única por compañía!"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Entregar todos los productos a la vez"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "¡Aviso!"
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Defina los métodos de entrega que está usando y sus precios para poder "
-#~ "facturar los gastos de envío cuando se realiza facturación basada en los "
-#~ "órdenes de entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "¡La referencia del pedido debe ser única por compañía!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr "Será facturado a:"
 
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "C.P."
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Entregar cada producto cuando esté disponible"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr "en función de"
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 866ca378e2e..e9261dda1b0 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-16 04:48+0000\n"
-"Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr ""
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr ""
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr "Añadir en Presupuesto"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Precio Avanzado"
+
+#. module: delivery
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Grillas de Entrega"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Monto"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Línea de Grillas"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio de costo"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Entrega"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Grilla de entrega"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fijo"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Grilla de Línea de Envío"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,123 +201,115 @@ msgid "Delivery Method"
 msgstr "Método entrega"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr ""
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de entrega"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Líneas de Grillas"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición de Grilla"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Grillas de Entrega"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Grilla de entrega"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Grilla"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de Grillas"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Líneas de Grillas"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nombre de Grilla"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición de Grilla"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Grilla"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -289,226 +317,184 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Código Postal hasta"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nombre de Grilla"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,normal_price:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "¡La orden no está en estado borrador!"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr ""
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso Neto"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producto de entrega"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio de costo"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Remito para ser facturado"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Código Postal desde"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de Precio"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
+#: code:addons/delivery/delivery.py:237
+#, python-format
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
-
-#. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Precio"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "No concuerda la grilla para éste transportista"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Código Postal desde"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Entrega"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Provincias"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volumen"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de Stock"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -517,62 +503,42 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner que realiza el servicio de entrega."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Precio de venta"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Código Postal hasta"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Provincias"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidad de Medida"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -581,113 +547,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de Precio"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Grillas de Transporte y Entrega"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventas & Compras"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Este método de envío se utilizará cuando se facture desde remitos."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Grilla de línea de Entrega"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generar facturas borrador en recepciones"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades de entrega"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "¡No hay cuadrícula disponible!"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Agregar costos de envío"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM predeterminada y la UdM de compra deben estar en la misma "
-#~ "categoría."
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transporte y envíos"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Costos de envío"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
-#~ "seleccionadas!"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Complete este campo si planea facturar los envíos desde el packing."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite agregar los métodos de envío en los pedidos de venta y packings. "
-#~ "Puede definir sus propias tablas de transportistas y destinos para el "
-#~ "cómputo de precios. Al crear facturas desde picking, OpenERP puede agregar y "
-#~ "calcular la línea de gastos de envío."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Packing listo para facturar"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner transportista"
+msgid "Warning!"
+msgstr ""
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "¡El precio no está disponible!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "El CUIT no parece ser correcto"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
 
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "C.P."
 
-#~ msgid "Delivery method"
-#~ msgstr "Método de entrega"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/es_CR.po b/addons/delivery/i18n/es_CR.po
index f0c1ed8cf6d..c5e88162ef3 100644
--- a/addons/delivery/i18n/es_CR.po
+++ b/addons/delivery/i18n/es_CR.po
@@ -1,164 +1,202 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* delivery
+# Spanish (Costa Rica) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-15 20:38+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"Language: \n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso neto"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Línea cuadrícula envío"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr ""
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Advanced Pricing"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Cuadrículas de envío"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Anticipado Precio por destino"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Monto"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
+"Importe a fin de beneficiarse de un envío libre, expresada en la moneda de "
+"la empresa"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Línea de la cuadrícula"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "El socio que está haciendo el servicio de entrega."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orden entrega"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimiento transportista"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
+"Marque esta casilla si desea administrar los precios de entrega que depende "
+"del destino, el peso, el total de la orden, etc"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Albarán para ser facturado"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo si tiene previsto facturar el envío según el albarán."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Advanced Pricing"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
-"envío."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden entrega :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Precio por defecto"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Monto"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Cuadrícula de envío"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fijo"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línea cuadrícula envío"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -168,125 +206,115 @@ msgid "Delivery Method"
 msgstr "Método de envío"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "¡Precio no disponible!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. seguimiento transportista"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso neto"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Líneas de la cuadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición de la cuadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis si hay más de%.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transporte de Empresa"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cuadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Cuadrícula de envío"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de la cuadrícula"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Líneas de la cuadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nombre cuadrícula"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Si la orden es más caro que una cierta cantidad, el cliente puede "
-"beneficiarse de un envío gratuito"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Importe a fin de beneficiarse de un envío libre, expresada en la moneda de "
-"la empresa"
-
-#. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Cuadrícula"
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -298,58 +326,30 @@ msgstr ""
 "eliminarla."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Precio por defecto"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Precio Normal"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha entrega"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nombre cuadrícula"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Si la orden es más caro que una cierta cantidad, el cliente puede "
+"beneficiarse de un envío gratuito"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de bultos"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
-"Marque esta casilla si desea administrar los precios de entrega que depende "
-"del destino, el peso, el total de la orden, etc"
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -360,84 +360,17 @@ msgstr ""
 "destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "¡No hay una cuadrícula disponible!"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "¡La orden no está en estado borrador!"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha envío"
-
-#. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producto de envío"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
-
-#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
-
-#. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
-
-#. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Este método de entrega será utilizado cuando se facture a partir del albarán."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
@@ -446,62 +379,67 @@ msgid "Maximum Value"
 msgstr "Valor máximo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complete este campo si tiene previsto facturar el envío según el albarán."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis si hay más de%.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Precio Normal"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descripción"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar el transportista sin "
-"eliminarlo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -511,329 +449,174 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "¡No concuerda cuadrícula para este transportista!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Envío"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Información de precios"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volumen"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Información de precios"
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Anticipado Precio por destino"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Precio de venta"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr ""
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Provincias"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de precio"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades de envío"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La lista de precios por entrega le permite calcular el coste y precio de "
-#~ "venta de la entrega en funvión del peso de los productos y de otros "
-#~ "criterios. Puede definir varios precios por un método de entrega, por país, "
-#~ "o por zona de un páis específico, definido por un rango de códigos postales."
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar entrega"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventas & Compras"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de producción para este producto"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crear entregas"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Costes de envío"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generar facturas borrador en recepciones"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Línea de envío de la cuadrícula"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Cuadrícula de transportistas y envíos"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-#~ "categoría."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "¡No hay cuadrícula disponible!"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
 
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Añadir costes de envío"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "El socio que está haciendo el servicio de entrega."
 
-#~ msgid "Carrier Partner"
-#~ msgstr "Empresa transportista"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Este método de entrega será utilizado cuando se facture a partir del albarán."
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
-#~ "seleccionadas!"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "¡No existe precio disponible!"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
-
-#~ msgid "Delivery method"
-#~ msgstr "Método de envío"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "El CIF/NIF no parece estar correcto."
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistas y envíos"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Este método de envío se utilizará cuando se facture desde albaranes."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Complete este campo si desea facturar los envíos desde albaranes."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite añadir los métodos de envío en los pedidos de venta y albaranes. "
-#~ "Puede definir sus propias tablas de transportistas y destinos para el "
-#~ "cálculo de precios. Al crear facturas desde albaranes, OpenERP es capaz de "
-#~ "sumar y calcular la línea de gastos de envío."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Albaranes a facturar"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite añadir métodos de envío en pedidos de venta y albaranes.\n"
-#~ "    Puede definir su propio transportista y cuadrículas de envío para los "
-#~ "precios.\n"
-#~ "    Al crear las facturas desde albaranes, OpenERP es capaz de añadir y "
-#~ "calcular la línea de transporte.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Cree y gestione los métodos de entrega que necesite para su actividad de "
-#~ "ventas. Cada método de entrega puede ser asignado a una lista de precios que "
-#~ "calcula el precio de la entrega en función de los productos vendidos o "
-#~ "entregados."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "¡La referencia del pedido debe ser única!"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Albarán de salida"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transporte de Empresa"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "No hay línea coincida con este producto o el orden en la red de suministro "
-#~ "elegido."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Defina sus métodos de entrega y sus precios. Los gastos de envío se puede "
-#~ "agregar en el formulario de pedido de venta o en la factura, en base a las "
-#~ "órdenes de entrega."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Defina método de entrega"
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Configuración de Política de envió"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
-#~ msgid "Picking Policy"
-#~ msgstr "Política de envío"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referencia debe ser única por compañía!"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Elija su Política de envio por defecto"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Entrega de todos los productos a la vez"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
-#~ msgid "Free If More Than"
-#~ msgstr "Gratis Si más de"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr ""
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Definir los métodos de entrega que se está utilizando y su política de "
-#~ "precios con el fin de reinvoice los gastos de envío cuando usted está "
-#~ "haciendo la facturación sobre la base de órdenes de entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "¡La referencia de la compra debe ser única por compañía!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Entregar cada producto cuando esté disponible"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index 6dc4d7eacd1..2006bd3d257 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.po
@@ -1,164 +1,202 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-12-31 15:56+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso neto"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Línea cuadrícula envío"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr ""
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Precio Avanzado"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Cuadrículas de envío"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Precio avanzado por destino"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volúmen"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Monto"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
+"Monto de la orden por envío gratuito, expresado en la moneda de la compañía"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Línea de la cuadrícula"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "La empresa que esta realizando el servicio de transporte"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orden de Entrega"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimiento transportista"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
+"Seleccione esta opción si usted quiere manejar los precios de envío "
+"dependiendo de el destino, el preso, el total de la orden, etc."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Orden de Entrega para ser Facturada"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo si tiene previsto facturar el envío según la orden de "
+"entrega"
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Precio Avanzado"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
-"envío."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio Costo"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden de Entrega :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Precio por Defecto"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Monto"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Cuadrícula de envío"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fijo"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Línea cuadrícula envío"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -168,124 +206,115 @@ msgid "Delivery Method"
 msgstr "Método de envío"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Moviemiento de stock"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. seguimiento transportista"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso neto"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Líneas de cuadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición de la cuadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis si es mayor a %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de Venta"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Compañia de Transporte"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cuadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Cuadrícula de envío"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Línea de la cuadrícula"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Líneas de cuadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de Envios"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nombre cuadrícula"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Si la orden tiene un monto mayor a cierto monto, el cliente se puede "
-"beneficiar con un envío gratuito"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "Identificador"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Monto de la orden por envío gratuito, expresado en la moneda de la compañía"
-
-#. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Cuadrícula"
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -297,58 +326,30 @@ msgstr ""
 "eliminarla."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Precio por Defecto"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Precio Normal"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha del Pedido"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nombre cuadrícula"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Si la orden tiene un monto mayor a cierto monto, el cliente se puede "
+"beneficiar con un envío gratuito"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de bultos"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
-"Seleccione esta opción si usted quiere manejar los precios de envío "
-"dependiendo de el destino, el preso, el total de la orden, etc."
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -358,173 +359,154 @@ msgstr ""
 "Mantenga vacío si el precio deprende de el precio avanzado por destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "¡No hay una cuadrícula disponible!"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "¡La orden no está en estado borrador!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha de envío"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producto de envío"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio Costo"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Precio Normal"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"El método de envío sera usado cuando se facture desde la orden de entrega"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de Envios"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Orden de Entrega para ser Facturada"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complete este campo si tiene previsto facturar el envío según la orden de "
-"entrega"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis si es mayor a %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Información de Precio"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de Venta"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descripción"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venta"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar el transportista sin "
-"eliminarlo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Precio"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "¡No concuerda cuadrícula para este transportista!"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Envío"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Provincias"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volumen"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Moviemiento de stock"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -533,62 +515,43 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Información de Precio"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Precio avanzado por destino"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "La empresa que esta realizando el servicio de transporte"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"El método de envío sera usado cuando se facture desde la orden de entrega"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Precio de Venta"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Compañia de Transporte"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Provincias"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -597,204 +560,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de precio"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventas & Compras"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Este método de envío se utilizará cuando se facture desde albaranes."
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generar facturas borrador en recepciones"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Línea de envío de la cuadrícula"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades de envío"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Cuadrícula de transportistas y envíos"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-#~ "categoría."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Añadir costes de envío"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistas y envíos"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Empresa transportista"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite añadir los métodos de envío en los pedidos de venta y albaranes. "
-#~ "Puede definir sus propias tablas de transportistas y destinos para el "
-#~ "cálculo de precios. Al crear facturas desde albaranes, OpenERP es capaz de "
-#~ "sumar y calcular la línea de gastos de envío."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Albaranes a facturar"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Complete este campo si desea facturar los envíos desde albaranes."
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Costes de envío"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Delivery method"
-#~ msgstr "Método de envío"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "El CIF/NIF no parece estar correcto."
-
-#~ msgid "Delivery Order"
-#~ msgstr "Orden de Entrega"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "¡No existe precio disponible!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La lista de precios por entrega le permite calcular el coste y precio de "
-#~ "venta de la entrega en funvión del peso de los productos y de otros "
-#~ "criterios. Puede definir varios precios por un método de entrega, por país, "
-#~ "o por zona de un páis específico, definido por un rango de códigos postales."
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
-#~ "seleccionadas!"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volúmen"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Alerta"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Usted no puede mover productos desde o hacia una ubicación de tipo vista"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Política de envío"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Seleccione la política de envío por defecto"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Define Métodos de Envío"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Configure su Política de Envíos"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "¡La referencia debe ser única por Compañia!"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratis si es mayor"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Define los métodos de envío que usted esta usando, y sus respectivos precios "
-#~ "en el pedido para re-facturar los costos de envío cuando usted esta haciendo "
-#~ "las facturas basadas en las notas de entrega"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "¡La orden de referencia debe ser única por Compañía!"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de producción para este producto"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crear envíos"
-
-#~ msgid "ID"
-#~ msgstr "Identificador"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Error! Usted no puede crear miembros asociados recursivos"
-
-#~ msgid "Deliver each product when available"
-#~ msgstr "Enviar cada producto cuando este disponible"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
 
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "Asistente de Envíos"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Enviar todos los productos a la vez"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Define sus métodos de envío y sus precios. Los costos de envío pueden ser "
-#~ "agregados en el pedido de venta o en la factura, basado en las ordenes de "
-#~ "entrega"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/es_MX.po b/addons/delivery/i18n/es_MX.po
index e28beb3f5e8..0e39a2de293 100644
--- a/addons/delivery/i18n/es_MX.po
+++ b/addons/delivery/i18n/es_MX.po
@@ -1,161 +1,196 @@
 # Spanish (Mexico) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-11 17:57+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orden entrega"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Albarán para ser facturado"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,422 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Albaranes de salida"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
diff --git a/addons/delivery/i18n/es_PY.po b/addons/delivery/i18n/es_PY.po
index 3a75246cb84..54375ffc09a 100644
--- a/addons/delivery/i18n/es_PY.po
+++ b/addons/delivery/i18n/es_PY.po
@@ -1,164 +1,198 @@
 # Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-19 13:37+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso neto"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volúmen"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orden entrega"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Nota de envio a ser facturado"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimiento transportista"
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
-"envío."
+"Complete este campo si tiene previsto facturar el envío según el albarán."
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Precio coste"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden entrega :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fijo"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -168,121 +202,115 @@ msgid "Delivery Method"
 msgstr "Método entrega"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. seguimiento transportista"
-
-#. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso neto"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr ""
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Producto de envío"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición de la cuadrícula"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Socio"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fijo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venta"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de cuadrícula de "
+"envío."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de empaquetado"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nombre"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición de la cuadrícula"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el transportista sin "
+"eliminarlo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -294,55 +322,27 @@ msgstr ""
 "eliminarla."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha entrega"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de bultos"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -352,172 +352,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "¡La orden no está en estado borrador!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nombre"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha envío"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Producto de envío"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Precio coste"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de bultos"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Este método de entrega será utilizado cuando se facture a partir del albarán."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Socio"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de empaquetado"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Nota de envio a ser facturado"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complete este campo si tiene previsto facturar el envío según el albarán."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de precio"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descripción"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar el transportista sin "
-"eliminarlo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Precio"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "¡No concuerda cuadrícula para este transportista!"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Envío"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Departamento:"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volumen"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -526,172 +508,107 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "¡El transportista %s (id: %d) no dispone de cuadrícula de envío!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
+
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Este método de entrega será utilizado cuando se facture a partir del albarán."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "La orden debe estar en estado borrador para añadir líneas de envío."
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Precio de venta"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr ""
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Departamento:"
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volúmen"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de precio"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "¡La referencia del pedido debe ser única!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Orden de entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volumen"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "¡No existe precio disponible!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La lista de precios por entrega le permite calcular el coste y precio de "
-#~ "venta de la entrega en funvión del peso de los productos y de otros "
-#~ "criterios. Puede definir varios precios por un método de entrega, por país, "
-#~ "o por zona de un páis específico, definido por un rango de códigos postales."
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades de envío"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "¡No existe línea que concuerde con esta orden en las cuadrículas de envío "
-#~ "seleccionadas!"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Advertencia"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Cree y gestione los métodos de entrega que necesite para su actividad de "
-#~ "ventas. Cada método de entrega puede ser asignado a una lista de precios que "
-#~ "calcula el precio de la entrega en función de los productos vendidos o "
-#~ "entregados."
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite añadir métodos de envío en pedidos de venta y albaranes.\n"
-#~ "    Puede definir su propio transportista y cuadrículas de envío para los "
-#~ "precios.\n"
-#~ "    Al crear las facturas desde albaranes, OpenERP es capaz de añadir y "
-#~ "calcular la línea de transporte.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar entrega"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Costes de envío"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventas & Compras"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Empresa transportista"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de producción para este producto"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crear entregas"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistas y envíos"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index a0487f46923..720f61f4d37 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Estonian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-10-11 17:52+0000\n"
-"Last-Translator: Aare Vesi <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Tellimuse viide"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Tarnimine postiteel"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Sihtpunkt"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Netokaal"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiivne"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Ruumala"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Tarnetellimus"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Tarnija"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Seisukord"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Ostuhind"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Riigid"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Tarnetellimus :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Muutuja faktor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Kättetoimetamine"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fikseeritud"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,179 +201,141 @@ msgid "Delivery Method"
 msgstr "Tarneviis"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Laoseisu liikumine"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Netokaal"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarnimise hinnakiri"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Alusvõrgu jooned"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Toote tarnimine"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr ""
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Tarnimine postiteel"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operaator"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Sihtpunkt"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Müügitellimus"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fikseeritud"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Noppeleht"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Alusvõrk"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nimi"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Alusvõrgu jooned"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Alusvõrk"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: help:delivery.carrier,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Tellimuse Kuupäev"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Pakkide arv"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Kaal"
-
-#. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -347,168 +345,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr ""
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimumväärtus"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Partii"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nimi"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiivne"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netokaal"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Tarnimise kuupäev"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Netokaal"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Toote tarnimine"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Seisukord"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Ostuhind"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Muutuja"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Pakkide arv"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operaator"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maksimumväärtus"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Kogus"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Noppeleht"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Hind"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Hinnatüüp"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Kogus"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Müügihind"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Kirjeldus"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Müügitellimus"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarnimise hinnakiri"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Hind"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Jada"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Kättetoimetamine"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "staatused"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Kaal * Ruumala"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Laoseisu liikumine"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -517,62 +501,42 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Tarnija"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Jada"
-
-#. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Müügihind"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "staatused"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -581,81 +545,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Hinnatüüp"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Müügid ja ostud"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Tarnete omadused"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Viga: vaikimisi mõõtühik ja ostu mõõtühik peavad olema samast kategooriast."
-
-#~ msgid "Notes"
-#~ msgstr "Märkmed"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Lisa tarnemaksumus"
-
-#~ msgid "ID"
-#~ msgstr "ID"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Hinda pole saadaval !"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Muutuja"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Tarnekulud"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Muutuja faktor"
 
-#~ msgid "Cancel"
-#~ msgstr "Loobu"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Ruumala"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Hoiatus"
-
-#~ msgid "Delivery method"
-#~ msgstr "Tarneviis"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Käibemaksukohuslase numbris on viga"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid seotud liikmeid."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Viga: Vigane EAN kood"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Kaal"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Tarnekorraldus"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Kaal * Ruumala"
 
-#~ msgid "_Cancel"
-#~ msgstr "_Tühista"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Weights"
-#~ msgstr "Kaalud"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid "_Apply"
-#~ msgstr "_Rakenda"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 2cb2ab01090..1a6ae7b6789 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -1,120 +1,26 @@
 # Finnish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-12 15:24+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Tilauksen viite"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Toimitus postilla"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " toiminto "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Kohde"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Nettopaino"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Toimitustaulukon rivi"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Yksikkö"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Toimitustaulukot"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Tilavuus"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Postinumero"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Taulukon rivi"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Kumppani joka toteuttaa huolintapalvelun"
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Toimitustilaus"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Valitun toimitustaulukon yksikään rivi ei vastaa tätä tuotetta tai tilausta."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Laskutettava keräily"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Edistyksellinen hinnoittelu"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Antaa järjestyksen näytettäessä luetteloa toimitustaulukosta."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Maat"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -146,111 +52,147 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Toimitustilaus :"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Muunnoskerroin"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Määrä"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiivinen"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Lisäys tarjoukseen"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Kiinteä"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Edistyksellinen hinnoittelu"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Toimitustapa"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Edistyksellinen hinnoittelu kohteen mukaan"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Hintaa ei saatavilla!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Määrä"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Varastosiirto"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Summa jonka ylittyessä toimitus on ilmainen, ilmaistuna yrityksen valuutassa."
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Huolitsijan seurantakoodi"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Nettopaino"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Huolitsija"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Taulukon rivit"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Taulukon määrittely"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Huolitsijan seurantakoodi"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Varoitus!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Valitse tämä valintaruutu, jos haluat hallita toimitushintoja. Hinnat voivat "
+"riippua kohteesta, painosta ja tilauksen summasta yms."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operaattori"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Täytä tämä kenttä, jos suunnittelet laskuttavasi toimituksen keräilyn "
+"perusteella."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Kumppani"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Tila"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Myyntitilaus"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kustannushinta"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Toimitustilaukset"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Maat"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Jos et käytä \"Lisäys tarjoukseen\" -toimintoa, tarkka hinta lasketaan kun "
-"laskutetaan toimitustilauksia."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Kuljetusyritys"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Oletushinta"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Toimitus"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -258,36 +200,61 @@ msgid "Delivery Grid"
 msgstr "Toimitustaulukko"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Laskutuksen kohde"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Toimitustaulukon rivi"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Keräilyluettelo"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Toimitustaulukot"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nimi"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Toimitustapa"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Jos tilaus on arvokkaampi kuin tietty määrä, asiakas hyötyy ilmaisesta "
-"toimituksesta."
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Toimitustavat"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Summa jonka ylittyessä toimitus on ilmainen, ilmaistuna yrityksen valuutassa."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Toimitushinnasto"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Toimitustuote"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Toimitus postilla"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Toimitustaulukot"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Kohde"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Kiinteä"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -295,39 +262,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Ilmainen jos tilauksen kokonaisarvo on enemmän kuin"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Taulukko"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Ilmainen jos enemmän kuin %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Jos aktiivisen kentän tilaksi on asetettu epätosi, voit piilottaa "
-"toimitustaulukon poistamatta sitä."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Kohteen postinumero"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Oletushinta"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Antaa järjestyksen näytettäessä luetteloa toimitustaulukosta."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normaalihinta"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Taulukko"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Tilauspäivä"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Taulukon rivi"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Taulukon rivit"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -335,135 +304,85 @@ msgid "Grid Name"
 msgstr "Taulukon nimi"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Pakkausten määrä"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Taulukon määrittely"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Paino"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Valitse tämä valintaruutu, jos haluat hallita toimitushintoja. Hinnat voivat "
-"riippua kohteesta, painosta ja tilauksen summasta yms."
+"Jos aktiivisen kentän tila on epätosi, voit piilottaa toimituksen "
+"huolitsijan poistamatta tätä."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Jätä tyhjäksi jos hinnoittelu riippuu kohdekohtaisesta edistyksellisestä "
-"hinnoittelusta"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Taulukkoa ei ole saatavilla !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Tila ei ole tilausehdotus!"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Erä"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiivinen"
+"Jos aktiivisen kentän tilaksi on asetettu epätosi, voit piilottaa "
+"toimitustaulukon poistamatta sitä."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Lähetyspäivä"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Jos tilaus on arvokkaampi kuin tietty määrä, asiakas hyötyy ilmaisesta "
+"toimituksesta."
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Toimitustuote"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Jos et käytä \"Lisäys tarjoukseen\" -toimintoa, tarkka hinta lasketaan kun "
+"laskutetaan toimitustilauksia."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Tila"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kustannushinta"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Muuttuva"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Jätä tyhjäksi jos hinnoittelu riippuu kohdekohtaisesta edistyksellisestä "
+"hinnoittelusta"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Tämä toimitustapa on käytössä kun laskutus tapahtuu keräilystä."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klikkaa määritelläksesi uuden toimitustavan. \n"
-"              </p><p>\n"
-"                Jokaisella huolintaliikkeellä voi olla useita "
-"logistiikkapalveluita, \n"
-"                joiden hinnoittelusääntöjen joukko on kytketty kuhunkin "
-"toimitustapaan.\n"
-"              </p><p>\n"
-"                Hinnoittelutavat sallivat toimitushinnan automaattisen "
-"laskennan\n"
-"                perustuen annettuihin sääntöihin: Myyntitilauksilla "
-"perustuen tarjouksiin\n"
-"                tai laskulla perustuen toimitustilauksiin.\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -471,363 +390,243 @@ msgid "Maximum Value"
 msgstr "Maksimiarvo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Määrä"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nimi"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Alku pnro"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Nettopaino"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Täytä tämä kenttä, jos suunnittelet laskuttavasi toimituksen keräilyn "
-"perusteella."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Nettopaino"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Ilmainen jos enemmän kuin %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Vastaanotot"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normaalihinta"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Painoyksikkö"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Pakkausten määrä"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Kuvaus"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operaattori"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Jos aktiivisen kentän tila on epätosi, voit piilottaa toimituksen "
-"huolitsijan poistamatta tätä."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Toimitushinnasto"
-
-#. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Hinta"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Kumppani"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Tälle huolitsijalle ei ole määritelty kuljetustaulukkoa !"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilyluettelo"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Toimitus"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Laskutettava keräily"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Paino * Tilavuus"
+msgid "Price"
+msgstr "Hinta"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Huolitsijalla %s (tunnus: %d) ei ole kuljetustaulukkoa!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Hintatyyppi"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "Hinnoittelutiedot"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Edistyksellinen hinnoittelu kohteen mukaan"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Määrä"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Huolitsija"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Myyntihinta"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Toimitustavat"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Myyntitilaus"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "Vain tilausehdotuksille voi lisätä tilausrivejä."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Toimitustaulukot"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Sarja"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Myyntihinta"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Tulosta toimitustilaus"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Alku pnro"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Valtiot"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Yksikkö (Yksikkö) on painoyksikkö"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Varastosiirto"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Hintatyyppi"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Toimituksien ominaisuudet"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Huomautukset"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Lisää toimituskustannukset"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Virhe: Virheellinen EAN-koodi"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Toimituskustannukset"
-
-#~ msgid "Delivery method"
-#~ msgstr "Toimitustapa"
-
-#~ msgid "Cancel"
-#~ msgstr "Peruuta"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Myynti ja hankinta"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Tätä toimitustapaa käytetään kun lähetyksen toimituksesta laskutetaan."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Virhe! Et voi luoda itseään toistavasti rinnastettuja jäseniä."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Taulukon toimitusrivi"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Luo laskuluonnos vastaanotetuista"
-
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Taulukkoa kuljetukselle ei saatavilla!"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
-#~ "kategoriassa."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö."
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Kuljetus- ja toimitustaulukot"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Kuljetusliikkeet ja toimitukset"
-
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "Yksikään valitun toimitustaulukon rivi ei vastaa tilausta!"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Mahdollistaa toimitustavan lisäämisen tilauksen käsittelyssä tai "
-#~ "pakkauksessa. Voit määritellä omat kuljetusliikkeesi ja taulukot "
-#~ "toimituksien hinnoille. Kun keräilyn pohjalta tehdään lasku, voi OpenERP "
-#~ "laskea ja lisätä siihen toimitusmaksun."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Laskutettava pakkaus"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Täytä tämä kenttä jos haluat laskuttaa toimituksesta pakkauksen perusteella."
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Kuljetusliike kumppani"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Ei hintaa saatavilla!"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "ALV ei vaikuta olevan oikein."
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Huolitsijalla %s (tunnus: %d) ei ole kuljetustaulukkoa!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Varoitus"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Tilauksen viite tulee olla yksilöllinen!"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Tee keräily"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Toimitusmääräys"
-
-#~ msgid "Weights"
-#~ msgstr "Painot"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Erä ei ole samaa tuotetta"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Peruuta"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "Vain tilausehdotuksille voi lisätä tilausrivejä."
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Kumppani joka toteuttaa huolintapalvelun"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Luo toimitukset"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Tämä toimitustapa on käytössä kun laskutus tapahtuu keräilystä."
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Määrittele keräilypolitiikka"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Kohteen postinumero"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Keräilysäännöt"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Kuljetusyritys"
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "Et voi siirtää tuotteita paikkaan tai paikasta tässä näkymässä."
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Yksikkö"
 
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Valitse oletuskeräilysääntö"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Yksikkö (Yksikkö) on painoyksikkö"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Toimita kaikki tuotteet kerralla"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Painoyksikkö"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Määrittele toimitusmetodit"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Muuttuva"
 
-#~ msgid "Free If More Than"
-#~ msgstr "Ilmainen, jos enemmän kuin"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Muunnoskerroin"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Tilavuus"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Virhe! Rekursiivisen kumppanin luonti ei ole sallittu."
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Varoitus!"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Toimita jokainen tuote kun saaatavilla"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Paino"
 
-#~ msgid "_Apply"
-#~ msgstr "_käytä"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Paino * Tilavuus"
 
-#~ msgid "Apply"
-#~ msgstr "Käytä"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Määrittele toimitustavat joita käyttä ja niiden hinnoittlu veloittaaksesi "
-#~ "toimitusten mukaiset toimituskulut"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Postinumero"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Mikään rivi ei täsmännyt tähän tuotteeseen valitussa toimitusruudukossa."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Määrittele toimitusmuodot ja niiden hinnoittelu. Toimituskulut voidaan "
-#~ "lisätä myyntitilaukselle tai laskulle, toimitusmääräysten mukaisesti."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Kuljetushinnasto mahdollistaa toimitukskulujen laskennan painon ja muiden "
-#~ "kriteerien mukaan. Voit määritellä monta hinnastoa yhdelle toimitustavalla, "
-#~ "maakohtaisesti, alueittain tai postinumeron mukaan."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 0c6550827d3..7aae22852ba 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -1,128 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# French translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-18 18:25+0000\n"
-"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue !"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Réf. commande"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Livraison par la poste"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " en fonction de "
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destination"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Poids net"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Ligne du tarif de livraison"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unité de mesure"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Tarifs de livraison"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Code Postal"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Ligne de tarif"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Le partenaire qui assure la livraison"
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Bon de livraison"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Aucune ligne ne correspond à ce produit ou à cette commande dans la grille "
-"de livraison choisie."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Colisages à facturer"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Tarification avancée"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Donne l'ordre de séquence lors de l'affichage d'une liste de tarifs de "
-"livraison."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Pays"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -157,112 +55,148 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Bon de livraison"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Facteur variable"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Montant"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Actif"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Ajouter au devis"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fixe"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Tarification avancée"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Méthode de livraison"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Tarification avancée en fonction de la destination"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Aucun prix disponible !"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Montant"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Mouvement de stock"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Montant de la commande pour bénéficier de la livraison gratuite, exprimé "
+"dans la devise de la société"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Référence de suivi du transporteur"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Poids net"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transporteur"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Lignes de tarif"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Définition des tarifs"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Référence de suivi du transporteur"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Attention !"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Cochez cette case si vous souhaitez gérer les frais de livraison dépendants "
+"de la destination, du poids, du montant de la commande, etc"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Opérateur"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complétez ce champ si vous envisagez de facturer l'expédition en fonction "
+"des colisages."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condition"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Commande de ventes"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Prix de revient"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Bons de livraison"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Pays"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Si vous ne cochez pas « Ajouter au devis », les frais de livraison exacts "
-"seront calculés lors de la génération de la facture, à partir du bon de "
-"livraison."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transporteur"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Prix par défaut"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Livraison"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -270,37 +204,61 @@ msgid "Delivery Grid"
 msgstr "Tarifs de livraison"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturé à"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Ligne du tarif de livraison"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Liste de colisage"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Grilles de Livraison"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nom"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Méthode de livraison"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Si la commande dépasse un certain montant, le client peut bénéficier d'une "
-"livraison gratuite"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Méthodes de livraison"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Montant de la commande pour bénéficier de la livraison gratuite, exprimé "
-"dans la devise de la société"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Liste de prix de livraison"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Article de livraison"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Livraison par la poste"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Tarifs de livraison"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destination"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fixe"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -308,39 +266,43 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Gratuit si le montant total de la commande est supérieur à"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Tarifs"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratuit si plus de %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Si le champ actif est paramétré à Faux, cela vous permet de masquer la "
-"grille de tarif de livraison sans pour autant la supprimer."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Code postal destination"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Prix par défaut"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Donne l'ordre de séquence lors de l'affichage d'une liste de tarifs de "
+"livraison."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Prix normal"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tarifs"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Ligne de tarif"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Date de commande"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Lignes de tarif"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -348,135 +310,85 @@ msgid "Grid Name"
 msgstr "Nom du tarif"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Nombre de colis"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Définition des tarifs"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Poids"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Cochez cette case si vous souhaitez gérer les frais de livraison dépendants "
-"de la destination, du poids, du montant de la commande, etc"
+"Si le champ actif est paramétré à Faux, cela vous permet de masquer le "
+"transporteur de la livraison sans pour autant le supprimer."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Gardez vide si le prix dépend de la tarification avancée par destination"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Pas de grille tarifaire disponible !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "La commande n'est pas à l'état de brouillon"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Actif"
+"Si le champ actif est paramétré à Faux, cela vous permet de masquer la "
+"grille de tarif de livraison sans pour autant la supprimer."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Date d'expédition"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Si la commande dépasse un certain montant, le client peut bénéficier d'une "
+"livraison gratuite"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Article de livraison"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Si vous ne cochez pas « Ajouter au devis », les frais de livraison exacts "
+"seront calculés lors de la génération de la facture, à partir du bon de "
+"livraison."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condition"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Prix de revient"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Gardez vide si le prix dépend de la tarification avancée par destination"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Cette méthode de livraison sera utilisée lorsqu'on facturera sur base du "
-"colisage."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Cliquez pour ajouter un nouveau mode de livraison.\n"
-"              </p><p>\n"
-"Chaque transporteur (ex. UPS) peut avoir plusieurs modes de livraison (ex.\n"
-"UPS Express, UPS Standard), chacun avec un jeu de règles de facturation "
-"propre.\n"
-"              </p><p>\n"
-"Ajouter un mode de livraison permet de calculer automatiquement\n"
-"les frais de livraison selon les critères que vous entrez, et ce en "
-"fonction\n"
-"du bon de commande (obtenu à partir du devis) ou de la facture (obtenue à\n"
-"partir des bons de livraison).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -484,400 +396,247 @@ msgid "Maximum Value"
 msgstr "Valeur maximum"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantité"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nom"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Code postal départ"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Poids net"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complétez ce champ si vous envisagez de facturer l'expédition en fonction "
-"des colisages."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Poids net"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratuit si plus de %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Livraisons à recevoir"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Prix normal"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unité de mesure du poids"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Nombre de colis"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Description"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Opérateur"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Si le champ actif est paramétré à Faux, cela vous permet de masquer le "
-"transporteur de la livraison sans pour autant le supprimer."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Liste de prix de livraison"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Prix"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Aucun tarif correspondant pour ce transporteur !"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Liste de colisage"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Livraison"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Colisages à facturer"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Poids * volume"
+msgid "Price"
+msgstr "Prix"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Le transporteur %s (id: %d) n'a pas de tarif de livraison !"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Type de prix"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "Information sur tarification"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Tarification avancée en fonction de la destination"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Quantité"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transporteur"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prix de vente"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Méthodes de livraison"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Bon de commande"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"La commande doit être à l'état de brouillon pour ajouter les lignes de "
-"livraison"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Grilles de Livraison"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Séquence"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prix de vente"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Imprimer le bon de livraison"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Code postal départ"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "États"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "'Unité de mesure' est l'unité de mesure pour le poids"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Type de prix"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Aucun prix disponible !"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Ajouter les frais de port"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Frais de port"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partenaire transporteur"
-
-#~ msgid "Delivery method"
-#~ msgstr "Méthode de livraison"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Notes"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Erreur: code EAN invalide"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Le numéro de TVA ne semble pas correct."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Ligne de tarif de livraison"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Le transporteur %s (id: %d) n'a pas de tarif de livraison !"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Aucun tarif disponible !"
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"La commande doit être à l'état de brouillon pour ajouter les lignes de "
+"livraison"
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Le partenaire qui assure la livraison"
 
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Cette méthode de livraison sera utilisé lors de la facturation depuis les "
-#~ "colisages"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Cette méthode de livraison sera utilisée lorsqu'on facturera sur base du "
+"colisage."
 
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr ""
-#~ "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Code postal destination"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Aucune ligne ne correspond à cette commande dans le tarif de livraison choisi"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transporteur"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Averstissement"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Remplissez ce champ si vous prévoyez de facturer le port en vous basant sur "
-#~ "les colisages."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permet d'ajouter une méthode de livraison aux commandes de ventes et aux "
-#~ "colisages. Vous pouvez définir votre transporteur et les tarifs de "
-#~ "livraisons pour les prix. Lorsqu'une facture est crée depuis le colisage, "
-#~ "OpenERP est capable d'ajouter une ligne de livraison et d'en calculer le "
-#~ "prix."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Colisage à facturer"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transporteurs et livraisons"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Transporteur et tarifs de livraison"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Ventes et achats"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
-#~ "caractères spéciaux !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle non valide dans la définition de l'action."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
-#~ "catégorie."
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Créer les factures brouillon sur les réceptions"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propriétés des livraisons"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Annuler"
-
-#~ msgid "Weights"
-#~ msgstr "Poids"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crée les livraisons"
-
-#~ msgid "_Apply"
-#~ msgstr "_Appliquer"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Vous permet d'ajouter une méthode de livraison dans une commande de vente et "
-#~ "un colisage.\n"
-#~ "     Vous pouvez définir votre propre transporteur et votre propre grille de "
-#~ "tarif pour les livraisons.\n"
-#~ "     Quand OpenERP va créer les factures des colisages, il sera capable "
-#~ "d'ajouter et de calculer la ligne de livraison.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Make Delievery"
-#~ msgstr "Faire la livraison"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Vous devez affecter un lot de fabrication à ce produit."
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Créez et gérez les méthodes de livraison dont vous avez besoin pour vos "
-#~ "activités de ventes. Chaque méthode de livraison peut être attribuée à une "
-#~ "liste de prix qui calcule le prix de la livraison selon les produits vendus "
-#~ "ou livrés."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "La référence de la commande doit être unique !"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "La liste de prix de livraison vous permet de calculer le coût et le prix de "
-#~ "vente de la livraison selon le poids des produits et d'autres critères. Vous "
-#~ "pouvez définir plusieurs listes de prix pour une méthode de livraison, par "
-#~ "pays ou zone d'un pays spécifique définie par un intervalle de code postal."
-
-#~ msgid "Delivery Order"
-#~ msgstr "Bon de livraison"
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Définissez vos méthodes de livraison et de leur prix. Les frais de livraison "
-#~ "peuvent être ajoutés sur le bon de commande ou sur la facture, basés sur les "
-#~ "bons de livraison."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Paramétrer votre politique de livraison"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Choisissez votre politique de livraison par défaut"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratuit si plus élevé que"
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Pas de ligne ou de commande associée à ce produit dans la grille de "
-#~ "livraison choisie."
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unité de mesure"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Paramétrer les méthodes de livraison"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "'Unité de mesure' est l'unité de mesure pour le poids"
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Définir les méthodes de livraison que vous utilisez et leur prix afin de "
-#~ "refacturer les frais de livraison quand vous faites de la facturation basée "
-#~ "sur des ordres de livraison"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unité de mesure du poids"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Livraison de tous les produits en une fois"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Facteur variable"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "La référence de commande doit être unique par société !"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Politique de livraison"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Attention !"
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Vous ne pouvez pas déplacer des produits depuis ou vers un emplacement de "
-#~ "type \"vue\"."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Poids"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Livrer chaque produit dès qu'il est disponible"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Poids * volume"
 
-#~ msgid "Apply"
-#~ msgstr "Appliquer"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "La référence doit être unique par société !"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Code Postal"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr ""
-#~ "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/gl.po b/addons/delivery/i18n/gl.po
index f5235c4732b..1379a5e92e1 100644
--- a/addons/delivery/i18n/gl.po
+++ b/addons/delivery/i18n/gl.po
@@ -1,163 +1,197 @@
 # Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-28 11:26+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Envío por correo postal"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso neto"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Liña cuadrícula envío"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Cuadrículas de envío"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Liña da cuadrícula"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Orde de entrega"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref. seguimento transportista"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Albarán para ser facturado"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "Encha este campo se ten previsto facturar o envío segundo o albará."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condición"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Indica a orde de secuencia cando se amosa unha lista de cuadrícula de envío."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Prezo custo"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orde de entrega:"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variable"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Envío"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Cuadrícula de envío"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Corrixido"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Liña cuadrícula envío"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -167,121 +201,113 @@ msgid "Delivery Method"
 msgstr "Método de entrega"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movemento de stock"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref. seguimento transportista"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Tarifas de envío"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso neto"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Produto de envío"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Liñas da cuadrícula"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Envío por correo postal"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definición da cuadrícula"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Cuadrículas de envío"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Corrixido"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Socio"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de venda"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Indica a orde de secuencia cando se amosa unha lista de cuadrícula de envío."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Cuadrícula de envío"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Cuadrícula"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Liña da cuadrícula"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Albará"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Liñas da cuadrícula"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nome"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nome cuadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definición da cuadrícula"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Cuadrícula"
+"Se se desmarca o campo activo, permite ocultar o transportista sen eliminalo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -293,55 +319,27 @@ msgstr ""
 "eliminala."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "C.Postal final"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data do pedido"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nome cuadrícula"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de vultos"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -351,170 +349,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Non hai unha cuadrícula dispoñible!"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "A orde non está en estado de borrador!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activo"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data de envío"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Produto de envío"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condición"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Prezo custo"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variable"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de vultos"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Este método de entrega utilizarase cando se facture a partir do albará."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Socio"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidade"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Albará"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "C.Postal inicial"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Albarán para ser facturado"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "Encha este campo se ten previsto facturar o envío segundo o albará."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Prezo"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de prezo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Cantidade"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prezo de venda"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descrición"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venda"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Se se desmarca o campo activo, permite ocultar o transportista sen eliminalo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Tarifas de envío"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Prezo"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Non existe ningunha cuadrícula concordante para este transportista!"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "C.Postal inicial"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Envío"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Estados"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volume"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movemento de stock"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -523,170 +505,107 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "O transportista %s (id: %d) non dispón de cuadrícula de envío!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "A orde debe estar en estado de borrador para engadir liñas de envío."
+
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Este método de entrega utilizarase cando se facture a partir do albará."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportista"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "C.Postal final"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "A orde debe estar en estado de borrador para engadir liñas de envío."
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Cuadrículas de envío"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prezo de venda"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr ""
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variable"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Estados"
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variable"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de prezo"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "A referencia do pedido debe ser única!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Orde de entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volume"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Non existe prezo dispoñible!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "A lista de prezos por entrega permítelle calcular o custo e prezo de venda "
-#~ "da entrega en función do peso dos produtos e doutros criterios. Pode definir "
-#~ "varios prezos para un método de entrega, país ou zona dun país específico "
-#~ "definida por un rango de códigos postais."
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propiedades do envío"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Non existe liñas que concorden con esta orde nas cuadrículas de envío "
-#~ "seleccionadas!"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Cree e xestione os métodos de entrega que necesite para a súa actividade de "
-#~ "vendas. Pódese asignar cada método de entrega  a unha lista de prezos que "
-#~ "calcula o prezo da entrega en función dos produtos vendidos ou entregados."
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite engadir métodos de envío en pedidos de venda e albarás. Pode definir "
-#~ "o seu propio transportista e cuadrículas de envío para os prezos. Ó crear as "
-#~ "facturas desde albarás, OpenERP é capaz de engadir e calcular a liña de "
-#~ "transporte.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar entrega"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Erro! Non pode crear membros asociados recursivos."
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Tenta asignar un lote que non pertence ó mesmo produto."
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Custos de envío"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vendas e Compras"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Transportista"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Debe asignar un lote de produción para este produto"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Crear entregas"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportistas e envíos"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/hi.po b/addons/delivery/i18n/hi.po
index 723ee3b45c6..b37b6992698 100644
--- a/addons/delivery/i18n/hi.po
+++ b/addons/delivery/i18n/hi.po
@@ -1,161 +1,196 @@
 # Hindi translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-20 10:00+0000\n"
-"Last-Translator: Tejas Tank <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "आदेश संदर्भ"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "खत  से डीलिइवरी"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "मंज़िल"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "अंतिम वजन"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "आवाज़"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,432 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr ""
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "खत  से डीलिइवरी"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "मंज़िल"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr ""
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "अंतिम वजन"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "आवाज़"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "आदेश संदर्भ अद्वितीय होना चाहिए!"
-
-#~ msgid "Delivery Order"
-#~ msgstr "वितरण आदसे"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "मूल्य उपलब्ध नहीं"
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 6a3c467147f..770827ce959 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * delivery
-# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
+# Croatian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-17 21:09+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Vinteh\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"Language: hr\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "modul: isporuka (delivery)"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Dostava Poštom"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " u funkciji "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Odredište"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Neto težina"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Stavka isporuke"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Jedinica mjere"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Dostavne mreže"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volumen"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Poštanski br."
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "?Grid line"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner koji obavlja uslugu dostave."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Otpremnica"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"U odabranim stavkama isporuke nema proizvoda ili narudžbe koji ste tražili."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Izlazno pakiranje za fakturiranje"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Detaljni sustav cijena"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Upišite redoslijed prikazivanja za stavke isporuke"
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Zemlje"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -144,109 +50,142 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Otpremnica"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Varijabilni Faktor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Iznos"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivno"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Dodaj u ponudu"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fiksno"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Detaljni sustav cijena"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Način Dostave"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Napredna cijene po odredištu"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Cijena nije dostupna !"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Iznos"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Skladišni prijenos"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Neto težina"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Prijevoznik"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "?Grid line"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definicija mreže"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Upozorenje!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Uvjet"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Prodajni nalog"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cijena Koštanja"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Otpremnice"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Zemlje"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Dostavljačka tvrtka"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Predefinirana cijena"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -254,33 +193,61 @@ msgid "Delivery Grid"
 msgstr "Dostavna Mreža"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturirano na"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Stavka isporuke"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Skladišni dokument"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne Mreže"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Naziv"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Način Dostave"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Načini dostave"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cjenik Dostave"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Proizvod za Isporuku"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Dostava Poštom"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Odredište"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -288,37 +255,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Besplatno ako je iznos narudžbe  veći od"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Mreža"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Na Pošt. Broj"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Predefinirana cijena"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Upišite redoslijed prikazivanja za stavke isporuke"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Standardna cijena"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Mreža"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "?Grid line"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum narudžbe"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "?Grid line"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -326,131 +297,75 @@ msgid "Grid Name"
 msgstr "Naziv Mreže"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Broj paketa"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definicija mreže"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Težina"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Nalog nije u nacrtu!"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum Otpreme"
-
-#. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Proizvod za Isporuku"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Uvjet"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cijena Koštanja"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Varijabla"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Pritisnite za kreiranje novog načina dostave. \n"
-"              </p><p>\n"
-"                Svaki dostavljač (npr. UPS, Overseas ...) može imati više "
-"vrsta dostave (npr.\n"
-"                Ekspresna dostava, Standardna dostava) sa različitim "
-"cijenama.\n"
-"              </p><p>\n"
-"                Svaka metoda dostave omogućava automatski izračun cijene "
-"dostave\n"
-"                sukladno postavkama; na prodajnom nalogu (baziranom na "
-"ponudi) \n"
-"                ili računu (baziran na otpremnicama).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -458,59 +373,67 @@ msgid "Maximum Value"
 msgstr "Maksimalna Vrijednost"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Količina"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Naziv"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "?Start Zip"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Neto težina"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Neto težina"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Primke"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Standardna cijena"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Broj paketa"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Skladišni dokument"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cjenik Dostave"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Izlazno pakiranje za fakturiranje"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -520,186 +443,173 @@ msgid "Price"
 msgstr "Cijena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Ne postoji odgovarajuća mreža za ovog dostavljača"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Vrsta Cijene"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostava"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr ""
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Težina * Volumen"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Dostavljač %s(id: %d) nema dostavne mreže!"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr ""
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Napredna cijene po odredištu"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajna Cijena"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Prijevoznik"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Načini dostave"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "Stanje nalog mora biti 'Nacrt' da biste mogli dodavati stavke."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Dostavne Mreže"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodajna Cijena"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Ispiši otpremnicu"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "?Start Zip"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Stanja"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Skladišni prijenos"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Vrsta Cijene"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Bilješke"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Delivery method"
-#~ msgstr "Način dostave"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora početi sa x_ i ne smije sadržavati nikakve specijalne "
-#~ "znakove !"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodaja i Nabava"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Svojstva Dostave"
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Dostavljač %s(id: %d) nema dostavne mreže!"
 
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Dodaj Troškove Dostave"
+#. module: delivery
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "Stanje nalog mora biti 'Nacrt' da biste mogli dodavati stavke."
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Troškovi Dostave"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner koji obavlja uslugu dostave."
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML format za Arhitekturu Prikaza!"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nevažeće ime modela u definiciji Radnje."
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na Pošt. Broj"
 
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Ovaj će način isporuke biti korišten kada se Račun radi kod Pakiranja."
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Dostavljačka tvrtka"
 
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generiraj Nacrte Računa kod Zaprimanja"
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "Delivery line of grid"
-#~ msgstr "? Delivery line of grid"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Jedinica mjere"
 
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Mreža Prijevoza i Isporuka"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Greška: UOS mora biti u kategoriji drogačijoj od one u kojoj je UOM"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Varijabla"
 
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Prijevoznici i Isporuke"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Varijabilni Faktor"
 
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner Prijevoznik"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volumen"
 
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Omogućuje Vam da dodate načine isporuke Prodajnim narudžbama i pakiranjima. "
-#~ "Možete odrediti vlastitog prijevoznika i cjenike  mreže isporuke. Kada se "
-#~ "Računi kreiraju kod preuzimanja, Open ERP može dodati i izračunati način i "
-#~ "troškove otpreme."
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
 
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Pakiranje za koje treba izdati račun"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Težina"
 
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Popunite ovo polje ako planirate Otpremu fakturirati na bazi Pakiranja."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Težina * Volumen"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Greška: Nepravilan ean kod"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Cancel"
-#~ msgstr "Otkaži"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Poštanski br."
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "PDV nije točno naveden."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 5a0f5e7e724..dfb42aeb009 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * delivery
+# Hungarian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-03 12:10+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Megrendelés hiv."
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Postai szállítás"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " ennek a szerepe "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Célállomás"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Nettó súly"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Szállítási tarifatáblázat sor"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Mértékegység"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Szállítási tarifatáblázatok"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Térfogat"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Irányítószám"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Tarifatáblázat sor"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "A partner aki a szállítást biztosítja."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Szállítólevél"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"A kiválasztott szállítási szűrésnek megfelelő termék vagy rendelési sor nem "
-"található."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Kiszedés számlázható"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Bővített árazás"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Megadja a szállítási tarifatáblázatok listázási sorrendjét."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Országok"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -148,111 +54,147 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Szállítólevél :"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Változó tényező"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Összeg"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktív"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Árajánlathoz ad"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Állandó"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Bővített árazás"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Szállítási mód"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Célállomásonkénti haladó díjszabás"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Nincs elérhető ár!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Összeg"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Készletmozgás"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Rendelési érték ami után a vevő ingyenes szállítást vehet igénybe, a "
+"vállalat pénznemében kifejezve."
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Fuvarozó hiv."
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Nettó súly"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Fuvarozás"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Tarifatáblázat sorok"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Tarifatáblázat meghatározása"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Fuvarozó hiv."
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Figyelem!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Jelölje be a négyzetet ha azokat a szállítási árakat akarja kezelni amik "
+"függenek a szállítás célpontjától, súlyától, a megrendelés összértékétől, "
+"stb."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operátor"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "Töltse ki ezt a mezőt, ha szállítólevél alapján számláznak."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Feltétel"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Vevői megrendelés"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Bekerülési érték"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Kiszállítások kézbesítési bizonylatai"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Országok"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Ha nem 'Árajánlathoz ad', a pontos ár lesz számolva a számlán a "
-"megrendelés(eke)t alapul véve."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Szállítmányozó cég"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Alapértelmezett ár"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Szállítás"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -260,215 +202,185 @@ msgid "Delivery Grid"
 msgstr "Szállítási tarifatáblázat"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Számlázás ide"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Szállítási tarifatáblázat sor"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Kiszedési lista"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Szállítási tarifatáblázatok"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Név"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Szállítási mód"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Ha megrendelés sokkal többe kerül mint egy megadott érték, a vevő ingyenes "
-"szállítást vehet igénybe"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Szállítás módja"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Rendelési érték ami után a vevő ingyenes szállítást vehet igénybe, a "
-"vállalat pénznemében kifejezve."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Szállítási árlista"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "Ingyenes, ha a megrendelés összértéke nagyobb mint"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Szállítási termék"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Tarifatáblázat"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Postai szállítás"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a tarifatáblázat."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Szállítási tarifatáblázatok"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Érkezési hely irányítószáma"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Célállomás"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Alapértelmezett ár"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Állandó"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normál ár"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "Ingyenes, ha a megrendelés összértéke nagyobb mint"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Megrendelés dátuma"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Ingyenes , ha több mint %.2f"
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Tarifatáblázat neve"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Csomagok száma"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Súly"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Megadja a szállítási tarifatáblázatok listázási sorrendjét."
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
-msgstr ""
-"Jelölje be a négyzetet ha azokat a szállítási árakat akarja kezelni amik "
-"függenek a szállítás célpontjától, súlyától, a megrendelés összértékétől, "
-"stb."
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tarifatáblázat"
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr ""
-"Hagyja üresen ha az ár az előre beírt célállomásonkénti haladó díjszabásától "
-"függjön"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Tarifatáblázat sor"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nincs tarifatáblázat!"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Tarifatáblázat sorok"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Tarifatáblázat neve"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "A megrendelés nincs tervezet állapotban!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Tarifatáblázat meghatározása"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Tétel"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktív"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr "Ha az aktív mező nincs bejelölve, nem használható a fuvarozó."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Szállítási dátum"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr "Ha az aktív mező nincs bejelölve, nem használható a tarifatáblázat."
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Szállítási termék"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Ha megrendelés sokkal többe kerül mint egy megadott érték, a vevő ingyenes "
+"szállítást vehet igénybe"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Feltétel"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Ha nem 'Árajánlathoz ad', a pontos ár lesz számolva a számlán a "
+"megrendelés(eke)t alapul véve."
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Bekerülési érték"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Változó"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
-"Ez a szállítási mód lesz használva, ha szállítólevél alapján számláznak."
+"Hagyja üresen ha az ár az előre beírt célállomásonkénti haladó díjszabásától "
+"függjön"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kattintson új szállítási mód meghatározásához. \n"
-"              </p><p>\n"
-"                Mindegyik szállítónak (pl. UPS, DHL) többféle szállítási "
-"módja van (pl.\n"
-"                UPS Express, UPS Standard, DHL Express) egyedi díjszabási "
-"szabályokkal\n"
-"                mindegyik módhoz.\n"
-"              </p><p>\n"
-"                Ezek a mósok lehetővé teszik a szállítási ár automatikus "
-"kiszámítását\n"
-"                a beállítások alapján; ezeken a megrendeléseken (az "
-"árajánlat \n"
-"                alapján) vagy a számlákon (a kézbesítési bizonylatok "
-"alapján).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -476,59 +388,67 @@ msgid "Maximum Value"
 msgstr "Maximum érték"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Mennyiség"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Név"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Indulási hely irányítószáma"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Nettó súly"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "Töltse ki ezt a mezőt, ha szállítólevél alapján számláznak."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Nettó súly"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Ingyenes , ha több mint %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Beérkező szállítmányok"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normál ár"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "A súly mértékegysége"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Csomagok száma"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Leírás"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operátor"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a fuvarozó."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Szállítási árlista"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Kiszedési lista"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Kiszedés számlázható"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -538,56 +458,74 @@ msgid "Price"
 msgstr "Ár"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nincs ehhez a fuvarozóhoz illeszkedő tarifatáblázat!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Ártípus"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Szállítás"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Díjszabási információ"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Súly * térfogat"
+msgid "Quantity"
+msgstr "Mennyiség"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Eladási ár"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Vevői megrendelés"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "%s (kód: %d) fuvarozónak nincs szállítási tarifatáblázata!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Díjszabási információ"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Célállomásonkénti haladó díjszabás"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Indulási hely irányítószáma"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Fuvarozás"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Állapotok"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Szállítás módja"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Készletmozgás"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "%s (kód: %d) fuvarozónak nincs szállítási tarifatáblázata!"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -595,30 +533,37 @@ msgstr ""
 "sort létre lehessen hozni benne."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Szállítási tarifatáblázatok"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "A partner aki a szállítást biztosítja."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sorszám"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Ez a szállítási mód lesz használva, ha szállítólevél alapján számláznak."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Eladási ár"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Érkezési hely irányítószáma"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Szállítási megbízás nyomtatása"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Szállítmányozó cég"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Állapotok"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Mértékegység"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -627,95 +572,62 @@ msgid ""
 msgstr "Mérték egysége (Mértékegység) a súly mértékegysége"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Ártípus"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "A súly mértékegysége"
 
-#~ msgid "Notes"
-#~ msgstr "Jegyzetek"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Változó"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nincs érvényes ár !"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Változó tényező"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Szállítások tulajdonságai"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Térfogat"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Figyelmeztetés"
-
-#~ msgid "Weights"
-#~ msgstr "Súly"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Hiba! Nem hozhat létre rekurzív társult tagokat."
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Fuvarozó partner"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Értékesítés és Beszerzés"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "A megrendelés hivatkozásnak egyedinek kell lennie!"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Szállítási költségek"
+msgid "Warning!"
+msgstr "Figyelem!"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Súly"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Szálllítások létrehozása"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Súly * térfogat"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Szállítólevél"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "A szállítási díj lista lehetővé teszi a szállítás költségének és díjának "
-#~ "kiszámítását a termékek súlya és egyéb kritériumok alapján. Egy szállítási "
-#~ "módra több árlistát is meghatározhat, országonként vagy az irányítószámok "
-#~ "szerint kialakított országon belüli zónánként."
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Irányítószám"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "A kiválasztott szállítási tarifatáblázatban nincs a megrendeléshez "
-#~ "illeszkedő sor."
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Itt hozhatja létre és kezelheti az értékesítéshez szükséges szállítási "
-#~ "módokat. Minden szállítási mód hozzárendelhető egy árlistához, amely az "
-#~ "eladott vagy kiszállított termékek alapján kiszámítja a szállítási díjat."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Ez a modul lehetővé teszi a szállítási módok megadását a vevői "
-#~ "megrendelésekben és a szállítólevelekben.\n"
-#~ "     Meghatározhatja a saját fuvarozóját és szállítási tarifatáblázatát.\n"
-#~ "     Ha szállítólevél alapján számláznak, a rendszer létrehozza a szállítási "
-#~ "díj sort a számlában, és kiszámítja annak értékét.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Fuvarozók és szállítások"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 7eee7b33773..2f6d52f36ec 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Indonesian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-19 02:49+0000\n"
-"Last-Translator: Budi Iskandar <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Tujuan"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Paket yang akan di-invoice-kan"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Memberikan urutan Order ketika ditampilkan urutan Pengiriman"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Negara"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Nota Pengiriman"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Faktor Variasi"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Diperbaiki"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,96 +201,117 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Perpindahan Stok"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Berat Bersih"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definisi Grid"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Tujuan"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Diperbaiki"
+
+#. module: delivery
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:151
 #, python-format
-msgid "Warning!"
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Rekanan"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Order Penjualan"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Memberikan urutan Order ketika ditampilkan urutan Pengiriman"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Ditagihkan Ke"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definisi Grid"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
@@ -265,332 +322,285 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: help:delivery.carrier,normal_price:0
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Tanggal Order"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Jumlah Paket"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Berat"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Berat Bersih"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Order tidak dalam status Draft !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr ""
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Jumlah Paket"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr ""
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr ""
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Rekanan"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Paket yang akan di-invoice-kan"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr ""
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Order Penjualan"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr ""
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Perpindahan Stok"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr ""
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Faktor Variasi"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Berat"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Peringatan"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Batal"
-
-#~ msgid "Weights"
-#~ msgstr "Berat"
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index 6a9bee824bc..91605267011 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -1,161 +1,201 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Italian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-18 23:16+0000\n"
-"Last-Translator: lollo_Ge <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Rif. Ordine"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Consegna a mezzo Posta"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " In funzione di "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destinazione"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso Netto"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Attivo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unità di misura"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Griglie Di Spedizione"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "CAP"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Importo"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Riga Griglia"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner che sta effettuando il servizio spedizioni."
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Ordine di Consegna"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Trasportatore"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Picking da fatturare"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Rif. Monitoraggio Vettore"
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
+"Spuntare questa casella per gestire i prezzi delle consegne in funzione "
+"della destinazione, del peso, del totale dell'ordine, ecc."
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Completare questo campo se si prevede di fatturare le consegne in base ai "
+"picking."
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condizione"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Prezzo di Costo"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Nazioni"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordine di consegna:"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Fattore Variabile"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Prezzo di default"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Importo"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Consegna"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Griglia di Distribuzione"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fisso"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Griglie di Consegna"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,121 +205,113 @@ msgid "Delivery Method"
 msgstr "Metodo di Consegna"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Nessun prezzo disponibile!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Metodi di Consegna"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movimento Magazzino"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Listino Distribuzione"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Rif. Monitoraggio Vettore"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Prodotto Distribuzione"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso netto"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Consegna a mezzo Posta"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Righe Griglia"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Griglie Di Spedizione"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definizione Griglia"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destinazione"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Attenzione!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fisso"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operatore"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "Gratuito se il totale ordinato e' più di"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratuito se maggiore di %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Ordine di vendita"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Ordini di Consegna"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Azienda di Spedizioni"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Griglia"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Griglia di Distribuzione"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Riga Griglia"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fatturato a"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Righe Griglia"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Bolla di prelievo"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nome Griglia"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nome"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definizione Griglia"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "Gratuito se il totale ordinato e' più di"
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Griglia"
+"Se il campo attivo e' impostato su falso, permetterà di nascondere il "
+"vettore senza rimuoverlo."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -289,58 +321,28 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "A CAP"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Prezzo di default"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Prezzo normale"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data ordine"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nome Griglia"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Numero di Colli"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
-"Spuntare questa casella per gestire i prezzi delle consegne in funzione "
-"della destinazione, del peso, del totale dell'ordine, ecc."
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -349,173 +351,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nessuna griglia disponibile !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "L'ordine non è in stato di bozza!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valore massimo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lotto"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Attivo"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso netto"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data Spedizione"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso Netto"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Prodotto Distribuzione"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condizione"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Prezzo di Costo"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Prezzo normale"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabile"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Numero di Colli"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Questo metodo di consegna sarà utilizzato quando si fattura da picking."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatore"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valore massimo"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantità"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Bolla di prelievo"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Da CAP"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Picking da fatturare"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Completare questo campo se si prevede di fatturare le consegne in base ai "
-"picking."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Prezzo"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratuito se maggiore di %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo Prezzo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Spedizioni in Ingresso"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informazioni sui Prezzi"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Quantità"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unità di misura per peso"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prezzo di Vendita"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descrizione"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Ordine di vendita"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Se il campo attivo e' impostato su falso, permetterà di nascondere il "
-"vettore senza rimuoverlo."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Listino Distribuzione"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Prezzo"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Non ci sono risultati nella ricerca per questo trasportatore !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Da CAP"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Consegna"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stati"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volume"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento Magazzino"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -524,33 +507,7 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Il trasportatore %s (id: %d) non ha una griglia di consegne !"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informazioni sui Prezzi"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Trasportatore"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Metodi di Consegna"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -558,30 +515,37 @@ msgstr ""
 "consegna."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Griglie di Consegna"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner che sta effettuando il servizio spedizioni."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
+#: help:res.partner,property_delivery_carrier:0
+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
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prezzo di Vendita"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "A CAP"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Stampa Ordine di Consegna"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Azienda di Spedizioni"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Stati"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unità di misura"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -590,130 +554,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo Prezzo"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Proprietà Consegna"
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Attenzione"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vendite e Acquisti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Genera Bozze di Fattura su Ricevimento"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Riga di Distribuzione della Griglia"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Griglie di distribuzione e di Trasportatori"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
-#~ "dell'Unità di misura"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Errore: l'unità di misura predefinita e l'unità di misura d'acquisto devono "
-#~ "trovarsi nella stessa categoria"
-
-#~ msgid "Notes"
-#~ msgstr "Note"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner Trasportatore"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Errore: codice EAN non valido"
-
-#~ msgid "Cancel"
-#~ msgstr "Annulla"
-
-#~ msgid "Delivery method"
-#~ msgstr "Metodo Consegna"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "L'IVA non sembra essere corretta"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permette di aggiungere metodi di spedizione in ordini di vendita ed imballo. "
-#~ "È possibile definire il proprio Vettore e griglie di prezzo. Durante la "
-#~ "creazione di spedizioni, Open ERP è in grado di aggiungere e calcolare la "
-#~ "linea di spedizione."
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Aggiungere spese di spedizione"
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Merce da Fatturare"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Trasportatori e Vettori"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Metodo di consegna usato con fatturazione per pacco."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Errore! Non puoi creare dei membri associati ricorsivi."
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unità di misura per peso"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Costi di spedizione"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabile"
 
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Completa questo campo se si prevede di fatturare la spedizione."
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Fattore Variabile"
 
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Nessuna griglia disponibile !"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nessun prezzo disponibile !"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Il riferimento ordine deve essere unico!"
+msgid "Warning!"
+msgstr "Attenzione!"
 
-#~ msgid "Delivery Order"
-#~ msgstr "Ordine di consegna"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "_Cancel"
-#~ msgstr "_Annulla"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volume"
 
-#~ msgid "Weights"
-#~ msgstr "Pesi"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "È necessario assegnare un lotto di produzione per questo prodotto"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "CAP"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Crea Consegne"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index b842a3974be..7507cca8f58 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/i18n/ja.po
@@ -1,162 +1,197 @@
 # Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-06-28 04:08+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "オーダ参照"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "郵送配達"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "宛先"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "正味重量"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "仕掛り中"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "配送グリッドライン"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "単位"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "前払価格"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "配送グリッド"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "目的地ごとの事前確認価格"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "容積"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "金額"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "郵便番号"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "配達無料、会社負担の速達の適用を受けるためのオーダー金額"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "グリッドライン"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "配達サービスを行うパートナです。"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "運搬会社"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "配達オーダー"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "運搬会社追跡の参照"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "請求のための集荷"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr "到着地、重量、オーダー金額合計などに応じて配達料を管理したいのであれば、このボックスをチェックします。"
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "前払価格"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "集荷を基本として出荷を請求する予定ならば、この項目を完成させて下さい。"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "配達グリッド一覧の順序番号を指定します。"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "条件"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "原価"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "国"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "配達オーダー："
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "可変の要素"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "デフォルト価格"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "金額"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "配達"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "配達グリッド"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "固定"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "配送グリッドライン"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "配達グリッド"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,121 +201,111 @@ msgid "Delivery Method"
 msgstr "配送方法"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "価格未定"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "ストック移動"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "運搬会社追跡の参照"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "配送方法"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "正味重量"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "配達価格リスト"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "グリッドライン"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "配達製品"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "グリッドの定義"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "郵送配達"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "配送グリッド"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "操作員"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "宛先"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "取引先"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "受注"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "配送"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "%.2f 以上であれば無料"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "配送会社"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "配達グリッド"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "配達グリッド一覧の順序番号を指定します。"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "請求先"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "グリッド"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "集荷リスト"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "グリッドライン"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "氏名"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "グリッドライン"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr "オーダーが特定金額以上の場合は、顧客は配達無料の特典を受けることができます。"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "グリッド名"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr "配達無料、会社負担の速達の適用を受けるためのオーダー金額"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "グリッドの定義"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "グリッド"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr "このアクティブ項目を無しに設定すると、運搬会社を削除することなく、非表示にできます。"
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -290,56 +315,28 @@ msgid ""
 msgstr "このアクティブ項目を無しに設定すると、配達グリッドを削除することなく非表示にできます。"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "配達先郵便番号"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "デフォルト価格"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "標準価格"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "発注日"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "グリッド名"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr "オーダーが特定金額以上の場合は、顧客は配達無料の特典を受けることができます。"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "パッケージの数"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "重量"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
-msgstr "到着地、重量、オーダー金額合計などに応じて配達料を管理したいのであれば、このボックスをチェックします。"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -348,168 +345,154 @@ msgid ""
 msgstr "到着地ごとに前払い価格が決まっているのであれば、空白にします。"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "グリッドがありません。"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "発注が予定状態ではありません。"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "最大値"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "ロット"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "氏名"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "仕掛り中"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "正味重量"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "出荷日"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "正味重量"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "配達製品"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "条件"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "原価"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "標準価格"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "変数"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "パッケージの数"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "集荷から請求をするときに、この配送方法が使われます。"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "操作員"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "最大値"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "取引先"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "数量"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "出発点の郵便番号"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "請求のための集荷"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "集荷を基本として出荷を請求する予定ならば、この項目を完成させて下さい。"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "価格"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "%.2f 以上であれば無料"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "価格タイプ"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "価格情報"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "数量"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "販売価格"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "詳細"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "受注"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr "このアクティブ項目を無しに設定すると、運搬会社を削除することなく、非表示にできます。"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "配達価格リスト"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "価格"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "順序"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "この運搬会社に合致するグリッドがありません。"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "出発点の郵便番号"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "配達"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "状態"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "重量×数量"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "ストック移動"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -518,62 +501,42 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "運搬会社 %s（ID：%d）の配達グリッドがありません。"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "価格情報"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "目的地ごとの事前確認価格"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "運搬会社"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "配送方法"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "配達ラインがを追加するために、オーダー状態はドラフトである必要があります。"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "配達グリッド"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "配達サービスを行うパートナです。"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "順序"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "集荷から請求をするときに、この配送方法が使われます。"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "販売価格"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "配達先郵便番号"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "配送会社"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "状態"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "単位"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -582,115 +545,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "価格タイプ"
-
-#~ msgid "_Cancel"
-#~ msgstr "キャンセル(_C)"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid "Weights"
-#~ msgstr "重量"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "タイプ表示では、プロダクトを動かすことはできません。"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "違う製品のロットを割り当てることはできません。"
-
-#~ msgid "Cancel"
-#~ msgstr "キャンセル"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "参照は会社内で固有でなければいけません"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "受注と発注"
-
-#~ msgid "Free If More Than"
-#~ msgstr "これ以上であれば無料"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "発注参照は、会社内で固有でなければなりません。"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "この製品に生産ロットを割り当てて下さい。"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "エラー：重複したメンバーを作ることはできません。"
-
-#~ msgid "_Apply"
-#~ msgstr "適用する(_A)"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Apply"
-#~ msgstr "適用する"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "変数"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "利用可能になった時に各製品を配達"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "可変の要素"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "全ての製品を一緒に配達"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "容積"
 
-#~ msgid "Picking Policy"
-#~ msgstr "集荷方針"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Delivery Order"
-#~ msgstr "配達オーダー"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "重量"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "集荷方針を定義します。"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "重量×数量"
 
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "デフォルトの集荷方針を選んで下さい。"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "配達の属性"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "郵便番号"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr "指定した配達グリッドの中に、この製品あるいはオーダーに合致したラインがありません。"
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr "配達方法とその価格を定義して下さい。配達オーダーに応じて、配達料金は受注オーダーあるいは請求書の中に追加することができます。"
-
-#~ msgid "Make Delievery"
-#~ msgstr "配達する"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr "配達オーダーを基本とする請求を行う場合は、あなたが使用している配達方法と、配達料を再請求するための価格を定義して下さい。"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "配達の作成"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "配達コスト"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "製品の重量や他の基準に基づいて配送の原価と販売価格を計算するために配達価格リストを使います。１つの配達方法について、国別、郵便番号に応じた地域別といった複"
-#~ "数の価格リストを定義することができます。"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "配達方法の定義"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index aea5484c504..66b67277a12 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -1,162 +1,197 @@
 # Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 15:49+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "목적지"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "활성"
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "배송 그리드"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "체적"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "그리드 라인"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "운송자"
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "조건"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "원가 가격"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "국가"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "변수 팩터"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "배송"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "배송 그리드"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "고정됨"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "배송 그리드"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,123 +201,113 @@ msgid "Delivery Method"
 msgstr "운송 방식"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "배송 가격리스트"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr ""
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "상품 배송"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "그리드 라인"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "그리드 정의"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "배송 그리드"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "목적지"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "오퍼레이터"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "고정됨"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "배송 그리드"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "그리드"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "그리드 라인"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "그리드 라인"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "이름"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "그리드 이름"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "그리드 정의"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "그리드"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -290,55 +315,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "그리드 이름"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "무게"
-
-#. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,146 +345,88 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr ""
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "주문이 드래프트 상태가 아님!"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "활성"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "상품 배송"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "조건"
-
-#. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "원가 가격"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "최대 가치"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "변수"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "이름"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "최대 가치"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "오퍼레이터"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "배송 가격리스트"
-
-#. module: delivery
 #: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
@@ -495,189 +434,173 @@ msgid "Price"
 msgstr "가격"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "이 운송자에 부합하는 그리드가 없습니다 !"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "가격 타입"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "배송"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr ""
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "무게 + 체적"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "운송자 %s (id: %d) 는 배송 그리드가 없습니다."
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "판매 가격"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "운송자"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "배송 라인을 추가하려면, 주문 상태가 드래프트여야 합니다."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "배송 그리드"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "시퀀스"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "판매 가격"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "상태"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "가격 타입"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "판매 & 구매"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "에러 ! 재귀적인 관련 멤버를 만들 수는 없습니다."
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "이 배송 방법은 포장으로부터 인보이스를 생성할 때 사용됩니다."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "그리드 배송 라인"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "수령 시 드래프트 인보이스 생성"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "배송 속성들"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "운송자와 배송 그리드"
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "운송자 %s (id: %d) 는 배송 그리드가 없습니다."
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "그리드가 없음!"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "배송 라인을 추가하려면, 주문 상태가 드래프트여야 합니다."
 
-#~ msgid "Notes"
-#~ msgstr "노트"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
 
-#~ msgid "Add Delivery Costs"
-#~ msgstr "운송료 추가"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
-#~ msgid "Carriers and deliveries"
-#~ msgstr "운상자와 운송"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
 
-#~ msgid "Delivery Costs"
-#~ msgstr "배송료"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr ""
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "선택한 배송 그리드에는 이 주문에 부합하는 라인이 없습니다."
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "포작에 기초하여 인보이스와 배송을 계획하려면 이 필드를 작성하십시오."
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "판매 주문과 포장에서 배송 방식을 추가하도록 합니다. 가격 별로 귀하 자신의 운송자와 배송 그리드를 설정할 수 있으며, 시스템이 배송 "
-#~ "라인을 계산 및 추가할 수 있습니다."
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Packing to be invoiced"
-#~ msgstr "인보이스할 포장"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Carrier Partner"
-#~ msgstr "운송 파트너"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "변수"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "가용한 가격이 없음!"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "변수 팩터"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "에러: 유효하지 않은 EAN 코드"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "체적"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "경고"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "VAT가 올바르지 않습니다."
-
-#~ msgid "Delivery method"
-#~ msgstr "배송 방법"
-
-#~ msgid "Cancel"
-#~ msgstr "취소"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "무게"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "무게 + 체적"
 
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "에러: UOS는 UOM과 다른 카테고리에 있어야 합니다."
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "에러: 디폴트 UOM과 구매 UOM은 같은 카테고리 속에 있어야 합니다."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index e87cf8d0b90..202e5337028 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -1,160 +1,196 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 15:22+0000\n"
-"Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -165,422 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
index 20af4520ea8..db0f7163f46 100644
--- a/addons/delivery/i18n/lv.po
+++ b/addons/delivery/i18n/lv.po
@@ -1,161 +1,196 @@
 # Latvian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-28 08:36+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,422 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
diff --git a/addons/delivery/i18n/mk.po b/addons/delivery/i18n/mk.po
index 23cee61585e..8c212809b40 100644
--- a/addons/delivery/i18n/mk.po
+++ b/addons/delivery/i18n/mk.po
@@ -1,122 +1,26 @@
 # Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-01 13:57+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Реф. на налогот"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Испорака по пошта"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " во функција на "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Одредиште"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Нето тежина"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Линија на мрежа за испорака"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Единица мерка"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Мрежи за испорака"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Волумен"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Поштенски број"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Линија на мрежа"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Партнер кој врши услуги на испорака."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Испратница"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Ниедна линија не се совпаѓа со овој производ или налог во избраната мрежа за "
-"испорака."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Требување кое треба да се фактурира"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Напредно одредување на цени"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Дава секвенциски редослед кога ја прикажува листата на мрежата за испорака."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Држави"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -150,111 +54,148 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Испратница:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr ""
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Износ"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Активно"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Додај во понуда"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Фиксно"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Напредно одредување на цени"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Метод на испорака"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Нема достапна цена!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Износ"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Движење на залиха"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Износ кој ќе се добие од бесплатната испорака, изразено во валута на "
+"компанијата"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Нето тежина"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Носач"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Линии на мрежа"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Дефиниција на мрежа"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Предупредување!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Означете го ова поле доколку сакате да управувате со цените за испорака кои "
+"зависат од одредиштето, тежината, вкупниот износ на налогот и.т.н."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Пополнете го ова поле доколку планирате да ја фактурирате испораката врз "
+"основа на требувањето."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Партнер"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Услов"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Налог за продажба"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Цена на чинење"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Испратници"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Држави"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Доколку не направите 'Додади во понуда' точната цена ќе биде пресметана кога "
-"ќе фактурирате врз основа на испратницата."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Транспортна компанија"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Стандардна цена"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Испорака"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,37 +203,61 @@ msgid "Delivery Grid"
 msgstr "Мрежа за испорака"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Фактурирано на"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Линија на мрежа за испорака"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Листа за требување"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Мрежи за испорака"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Име"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Метод на испорака"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Доколку налогот е поскап од одреден износ, купувачот може да има добие "
-"бесплатна испорака"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Методи на испорака"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Износ кој ќе се добие од бесплатната испорака, изразено во валута на "
-"компанијата"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Излезен ценовник"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Производ за испорака"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Испорака по пошта"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Мрежи за испорака"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Одредиште"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Фиксно"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -300,39 +265,42 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Бесплатно доколку вкупниот износ на налогот е повеќе од"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Мрежа"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Бесплатно доколку има повеќе од %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Доколку активното поле е подесено на Грешка, ќе можете да ја сокриете "
-"мрежата за испорака без да ја отстраните."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Стандардна цена"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Дава секвенциски редослед кога ја прикажува листата на мрежата за испорака."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Нормална цена"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Мрежа"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Датум на налогот"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Линија на мрежа"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Линии на мрежа"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -340,136 +308,85 @@ msgid "Grid Name"
 msgstr "Име на мрежа"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Број на пакети"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Дефиниција на мрежа"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Тежина"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Означете го ова поле доколку сакате да управувате со цените за испорака кои "
-"зависат од одредиштето, тежината, вкупниот износ на налогот и.т.н."
+"Доколку активното поле е подесено на Грешка, ќе можете да го сокриете "
+"носителот за испорака без да го отстраните."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Оставете празно доколку формирањето на цената зависи од авансното формирање "
-"на цена по дестинација"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Нема достапна мрежа !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Налогот не е во нацрт состојба !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Лот"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Активно"
+"Доколку активното поле е подесено на Грешка, ќе можете да ја сокриете "
+"мрежата за испорака без да ја отстраните."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Датум на испорака"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Доколку налогот е поскап од одреден износ, купувачот може да има добие "
+"бесплатна испорака"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Производ за испорака"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Доколку не направите 'Додади во понуда' точната цена ќе биде пресметана кога "
+"ќе фактурирате врз основа на испратницата."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Услов"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Цена на чинење"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Варијабла"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Оставете празно доколку формирањето на цената зависи од авансното формирање "
+"на цена по дестинација"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Кликнете за да дефинирате нов метод за испорака. \n"
-"              </p><p>\n"
-"                Секој носач (на пр. UPS) може да има неколку методи на "
-"испорака (пр.\n"
-"                UPS Express, UPS Standard) со сет од правила за одредување "
-"на цена\n"
-"                прикачени на секој метод.\n"
-"              </p><p>\n"
-"                Овие методи овозможуваат автоматска прсметка на цената на "
-"испораката\n"
-"                во согласност со вашите подесувања; на налог за продажба "
-"(засновано\n"
-"                ма понуда) или на фактура (засновано на испратници).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -477,63 +394,67 @@ msgid "Maximum Value"
 msgstr "Максимална вредност"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Количина"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Име"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr ""
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Нето тежина"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Пополнете го ова поле доколку планирате да ја фактурирате испораката врз "
-"основа на требувањето."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Нето тежина"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Бесплатно доколку има повеќе од %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Влезни пратки"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Нормална цена"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Единица мерка за тежина"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Број на пакети"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Опис"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Доколку активното поле е подесено на Грешка, ќе можете да го сокриете "
-"носителот за испорака без да го отстраните."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Излезен ценовник"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Листа за требување"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Требување кое треба да се фактурира"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -543,56 +464,74 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Ниедна мрежа не се совпаѓа со овој носач !"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Тип на цена"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Испорака"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Информации за формирање на цена"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Тежина * Волумен"
+msgid "Quantity"
+msgstr "Количина"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Продажна цена"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Налог за продажба"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Носачот %s (id> %d) нема мрежа за испорака!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Информации за формирање на цена"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Секвенца"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Носач"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Состојби"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Методи на испорака"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Движење на залиха"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Носачот %s (id> %d) нема мрежа за испорака!"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -600,30 +539,36 @@ msgstr ""
 "испорака."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Мрежи за испорака"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Партнер кој врши услуги на испорака."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Секвенца"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Продажна цена"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Печати испратница"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Транспортна компанија"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Состојби"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Единица мерка"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -632,6 +577,62 @@ msgid ""
 msgstr "Единица мерка (Единица мерка) е единица за мерење за тежина"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Тип на цена"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Единица мерка за тежина"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Варијабла"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Волумен"
+
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Предупредување!"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Тежина"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Тежина * Волумен"
+
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Поштенски број"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index c5be5dceda3..0b19a7c24bc 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.po
@@ -1,121 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* delivery
+# Mongolian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-09 08:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Захиалах дугаар."
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Шуудан хүргэлт"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Хаана"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Цэвэр жин"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Хүргэлтийн координат"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Хэмжих нэгж"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Хүргэлтийн хүснэгтүүд"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Эзлэхүүн"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Зип"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Хүснэгтийн мөр"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Хүргэлтийн үйлчилгээ хийдэг харилцагч."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Хүргэх захиалга"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Сонгосон хүргэлтийн сүлжээнд тохирох хүргэлтийн мөр болон захиалга байхгүй "
-"байна."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Нэхэмжлэгдсэн түүвэр"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Дэлгэрэнгүй үнэлэлт"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Хүргэлтийн хүснэгтийн харуулахад хэрэглэгдэх дарааллын эрэмбийг өгнө."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Улсууд"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -150,111 +55,146 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Хүргэлтийн захиалга :"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Өөрчлөгдөх хүчин зүйл"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Дүн"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Идэвхтэй"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Үнийн саналд Нэмэх"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Тогтсон"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Дэлгэрэнгүй үнэлэлт"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Хүргэх арга"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Хүргэлт бүрийн ахисан үнэлгээ"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Бэлэн бус үнэ!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Дүн"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Барааны хөдөлгөөн"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "Үнэгүй хүргэх захиалгын үнд нь компанийн валютаар илэрхийлэгдэнэ."
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Хүргэгчийн Мөр хөөх Сурвалж"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Цэвэр жин"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Тээвэрлэгч"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Хүснэгтийн мөрүүд"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Хүснэгт тодорхойлох"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Хүргэгчийн Мөр хөөх Сурвалж"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Сэрэмжлүүлэг!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Захиалгын хүргэх газар, жин, дүн зэрэгээс хамааруулж хүргэлтийн үнийг "
+"удирдахаар бол энэ сонголтыг сонгоно."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Хэрэв бэлтгэлт дээр суурилан нэхэмжлэхээр төлөвлөж байгаа бол энэ талбарыг "
+"бөглөнө."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Харилцагч"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Нөхцөл"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Борлуулалтын дараалал"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Өртөг үнэ"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Хүргэх захиалгууд"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Улсууд"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Хэрэв 'Үнийн саналд Нэмэх' гээгүй бол, нарийвчилсан үнэ нь хүргэлтийн "
-"захиалгаас нэхэмжлэх үүсэхэд тооцоологдоно."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Тээврийн Компани"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Үндсэн үнэ"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Хүргэлт"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,35 +202,61 @@ msgid "Delivery Grid"
 msgstr "Хүргэлтийн хүснэгт"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Нэхэмжлэх"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Хүргэлтийн координат"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Түүврийн жагсаалт"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Хүргэлтийн Хүснэгтүүд"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Нэр"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Хүргэх арга"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Хэрэв захиалга нь тодорхой үнийн дүнгээс өндөр байвал захиалагч үнэгүй "
-"хүргэлт авч болно."
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Хүргэлтийн арга"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr "Үнэгүй хүргэх захиалгын үнд нь компанийн валютаар илэрхийлэгдэнэ."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Хүргэлтийн үнэ"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Хүргэх бараа"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Шуудан хүргэлт"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Хүргэлтийн хүснэгтүүд"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Хаана"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Тогтсон"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -298,38 +264,42 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Хэрэв дүнгээс захиалга нь өндөр дүнтэй бол үнэгүй"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Хүснэгт"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Хэрэв %.2f-с их бол үнэгүй"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Хэрэв идэвхтэй талбар нь Худал бол хүргэлтийн сүлжээг устгалгүйгээр нууна."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Зиплэх"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Үндсэн үнэ"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Хүргэлтийн хүснэгтийн харуулахад хэрэглэгдэх дарааллын эрэмбийг өгнө."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Хэвийн үнэ"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Хүснэгт"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Огноо"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Хүснэгтийн мөр"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Хүснэгтийн мөрүүд"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -337,286 +307,263 @@ msgid "Grid Name"
 msgstr "Хүснэгтийн нэр"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Савлагааны дугаар"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Хүснэгт тодорхойлох"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Жин"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Захиалгын хүргэх газар, жин, дүн зэрэгээс хамааруулж хүргэлтийн үнийг "
-"удирдахаар бол энэ сонголтыг сонгоно."
+"Хэрэв идэвхтэй талбар Худал бол хүргэгч компанийг устгалгүйгээр хасна."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Хэрэв үнэ нь хүргэх газараас хамаарсан ахисан үнэлгээнээс хамаардаг бол "
-"хоосон үлдээ."
+"Хэрэв идэвхтэй талбар нь Худал бол хүргэлтийн сүлжээг устгалгүйгээр нууна."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Сүлжээ алга !"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Хэрэв захиалга нь тодорхой үнийн дүнгээс өндөр байвал захиалагч үнэгүй "
+"хүргэлт авч болно."
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Хэрэв 'Үнийн саналд Нэмэх' гээгүй бол, нарийвчилсан үнэ нь хүргэлтийн "
+"захиалгаас нэхэмжлэх үүсэхэд тооцоологдоно."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Ноорог захиалга байхгүй !"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Серийн дугаар"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Идэвхтэй"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Хэрэв үнэ нь хүргэх газараас хамаарсан ахисан үнэлгээнээс хамаардаг бол "
+"хоосон үлдээ."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Тээвэрлэх огноо"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Хүргэх бараа"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Нөхцөл"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Дээд утга"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Өртөг үнэ"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Нэр"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Хувьсах"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Цэвэр жин"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Бэлтгэлээс нэхэмжлэх тохиолдолд энэ хүргэх арга хэрэглэгдэнэ."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Цэвэр жин"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Шинэ хүргэх арга тодорхойлохдоо дарна уу. \n"
-"              </p><p>\n"
-"                Хүргэлтийн компани бүр нь хэд хэдэн хүргэх аргатай байж "
-"болох бөгөөд\n"
-"                арга бүр нь ялгаатай үнийн хүснэгтүүдтэй байж болно.\n"
-"              </p><p>\n"
-"                Эдгээр хүргэлтийн аргууд нь таны тохиргооноос хамааруулан "
-"хүргэх үнийг\n"
-"                автоматаар тооцоолох боломжийг олгоно; борлуулалтын захиалга "
-"дээр \n"
-"                (үнийн санал дээр суурилж) эсвэл нэхэмжлэл дээр (хүргэлтийн "
-"захиалга дээр суурилж).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Дээд утга"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Тоо хэмжээ"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Хэвийн үнэ"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Эхлэх Zip"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Савлагааны дугаар"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Хэрэв бэлтгэлт дээр суурилан нэхэмжлэхээр төлөвлөж байгаа бол энэ талбарыг "
-"бөглөнө."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Хэрэв %.2f-с их бол үнэгүй"
+msgid "Order not in Draft State!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Ирж буй хүргэлтүүд"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Харилцагч"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Түүврийн жагсаалт"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Нэг бүрийн жин"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Нэхэмжлэгдсэн түүвэр"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Тайлбар"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Үнэ"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Хэрэв идэвхтэй талбар Худал бол хүргэгч компанийг устгалгүйгээр хасна."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Үнийн төрөл"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Хүргэлтийн үнэ"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Үнийн мэдээлэл"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Үнэ"
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Энэ хүргэлтийн компанид тохирох сүлжээ алга !"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Зарах үнэ"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Хүргэлт"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын дараалал"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Жин * Эзлэхүүн"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Хүргэлтийн компани %s (id: %d)-д хүргэлтийн сүлжээ алга!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Үнийн мэдээлэл"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Дугаарлалт"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Хүргэлт бүрийн ахисан үнэлгээ"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Эхлэх Zip"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Тээвэрлэгч"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Төлвүүд"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Хүргэлтийн арга"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Барааны хөдөлгөөн"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Хүргэлтийн компани %s (id: %d)-д хүргэлтийн сүлжээ алга!"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Хүргэлтийн мөр нэмэхийн тулд захиалгын төлөв ноорог байх ёстой."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Хүргэлтийн Хүснэгтүүд"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Хүргэлтийн үйлчилгээ хийдэг харилцагч."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Дугаарлалт"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Бэлтгэлээс нэхэмжлэх тохиолдолд энэ хүргэх арга хэрэглэгдэнэ."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Зарах үнэ"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Зиплэх"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Хүргэлтийн захиалга хэвлэх"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Тээврийн Компани"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Төлвүүд"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Хэмжих нэгж"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -625,91 +572,62 @@ msgid ""
 msgstr "Хэмжих нэгж нь жинг хэмжих нэгж юм"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Үнийн төрөл"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Борлуулалт & Худалдан авалт"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Хүлээн авалтаас ноорог нэхэмжлэл үүсгэх"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Тээвэрлэгч ба хүргэлтийн хүснэгт"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Алдаа: Зарах нэгж хэмжих нэгжээс ялгаатай ангилалтай байх ёстой."
-
-#~ msgid "Notes"
-#~ msgstr "Тэмдэглэл"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Хүргэх өртөг нэмэх"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Тээвэрлэгч"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Тээвэрлэгч ба хүргэлт"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Алдаа: Буруу зураасан код"
-
-#~ msgid "Delivery method"
-#~ msgstr "Хүргэх арга"
-
-#~ msgid "Cancel"
-#~ msgstr "Цуцлах"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "НӨАТ буруу байж магадгүй."
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Нэг бүрийн жин"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Хувьсах"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Хүргэлтийн төлөв"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Өөрчлөгдөх хүчин зүйл"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Хүргэлтийн үнэ"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Эзлэхүүн"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Үнэгүй боломж !"
+msgid "Warning!"
+msgstr "Сэрэмжлүүлэг!"
 
-#~ msgid "_Cancel"
-#~ msgstr "_Cancel"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Жин"
 
-#~ msgid "Make Delievery"
-#~ msgstr "Хүргэх"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Жин * Эзлэхүүн"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Анхааруулга"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Weights"
-#~ msgstr "Жин"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Зип"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Хүргэлт үүсгэх"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
index bb98606c081..09109192caa 100644
--- a/addons/delivery/i18n/nb.po
+++ b/addons/delivery/i18n/nb.po
@@ -1,162 +1,202 @@
 # Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# Rolv Råen <rora@adego.no>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-04-05 22:53+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ordre ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Levering pr. post"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destinasjon"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Nettovekt"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Levering Rutenettlinje"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr ""
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Avansert prising"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Avansert priser pr. destinasjon"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Mengde"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Beløp"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
+"Mengden av ordrene for å dra nytte av en gratis frakt, uttrykt i selskapet "
+"valuta"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linjebredde i rutenett"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Parteneren som utfører leveransen."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportør"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Leveringsordre"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Transportørs sporingsref."
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
+"Kryss av her hvis du ønsker å administrere levering priser som avhenger av "
+"destinasjonen, vekten, summen av ordren, etc."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Plukking klar for fakturering"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Fullfør dette feltet hvis du har tenkt å fakturere frakt basert på plukking."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Avansert prising"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Betingelse"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Gir sekvensen ordre når du viser en liste over levering rutenett."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Land"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Lveringsordre :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Variabel faktor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Standardpris"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Beløp"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Leveranse"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Levering Rutenett"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fast"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Levering Rutenettlinje"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Leveringsmåte"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,125 +206,113 @@ msgid "Delivery Method"
 msgstr "Leveringsmåte"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Ingen pris tilgjengelig!"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Lagerflytting"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Transportørs sporingsref."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Leveringsprisliste"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Nettovekt"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Vareleveranse"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Aktiver linjer i rutenett"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Levering pr. post"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Avgiftsdefinisjon"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Delivery grids"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destinasjon"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operatør"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Salgsordre"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis vis det er mer enn %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportør"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Gir sekvensen ordre når du viser en liste over levering rutenett."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Levering Rutenett"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Aktiver linjer i rutenett"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "fakturert til"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linjebredde i rutenett"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Plukkliste"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Aktiver linjer i rutenett"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Navn"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Tilgjengelig navn"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Hvis bestillingen er dyrere enn et bestemt beløp, kan kunden dra nytte av en "
-"gratis frakt."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Avgiftsdefinisjon"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Mengden av ordrene for å dra nytte av en gratis frakt, uttrykt i selskapet "
-"valuta"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Aktiver linjer i rutenett"
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"levering transportør uten å fjerne den."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -296,58 +324,30 @@ msgstr ""
 "levering rutenettet uten å fjerne den."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Til postnummer"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Standardpris"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normal pris"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Ordredato"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Tilgjengelig navn"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Hvis bestillingen er dyrere enn et bestemt beløp, kan kunden dra nytte av en "
+"gratis frakt."
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Antall kolli"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Vekt"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
-"Kryss av her hvis du ønsker å administrere levering priser som avhenger av "
-"destinasjonen, vekten, summen av ordren, etc."
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -357,171 +357,154 @@ msgstr ""
 "Hold tom hvis prisingen er avhengig av avansert prising per destinasjon."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Ingen rutenett tilgjengelig !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Ordren har ikke utkast-status!"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimumsverdi"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot/batch"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Navn"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiv"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Nettovekt"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Forsendelsesdato"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Nettovekt"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Vareleveranse"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Betingelse"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kostpris"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normal pris"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabel"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Antall kolli"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Denne leveringsmetoden vil bli brukt ved fakturering fra plukking."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatør"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maksimumsverdi"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Antall"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Start postnummer"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Plukking klar for fakturering"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Fullfør dette feltet hvis du har tenkt å fakturere frakt basert på plukking."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis vis det er mer enn %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Pristype"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Prisinformasjon"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Antall"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Salgspris"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Beskrivelse"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
-"levering transportør uten å fjerne den."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Leveringsprisliste"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Pris"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "No grid matching for this carrier !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Start postnummer"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Leveranse"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Bekreftelser"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Vekt * Volum"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerflytting"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -530,63 +513,43 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Transportøren %s (ID %d) har ingen leveringsnett!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Prisinformasjon"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Avansert priser pr. destinasjon"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportør"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 "Ordrestatusen må være \"utkast\" for å kunne legge til leveringslinjer."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Leveringsmåte"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Parteneren som utfører leveransen."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sekvens"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Denne leveringsmetoden vil bli brukt ved fakturering fra plukking."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Salgspris"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Til postnummer"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportør"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Bekreftelser"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -595,158 +558,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Pristype"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Ingen pris tilgjengelig !"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Ordre referanse må være unik !"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabel"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Deliveries Properties"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabel faktor"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "Ingen linjer på aktuell ordre passer valgt spedisjonsnettverk!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Mengde"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Avbryt"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Transportør"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Salg & Innkjøp"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Finn og e_rstatt"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektnavnet må begynne med x_ og kan ikke inneholde spesialtegn !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ugyldig XML for visningsarkitektur"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen."
-
-#~ msgid "Notes"
-#~ msgstr "Notater"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "leveringstid"
-
-#~ msgid "Delivery method"
-#~ msgstr "Leveringsmåte"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Leveringsordre"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Foreta levering"
-
-#~ msgid "Weights"
-#~ msgstr "Vekt"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definer leveringsmåter"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Sett opp regler for plukking"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Regler for plukking"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referanse må være unik pr firma!"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Du forsøker å angi en lot som ikke tilhører samme produkt"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Ordrereferanse må være unik pr. firma!"
-
-#~ msgid "Cancel"
-#~ msgstr "Kanseller"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Du må velge en produksjonslot/batch for dette produktet"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Lag leveringer"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Leveringskostnader"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Utlever alle produkter på en gang"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Lever hvert produkt produkt når tilgjengelig"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Vekt"
 
-#~ msgid "Apply"
-#~ msgstr "Bruk"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Vekt * Volum"
 
-#~ msgid "_Apply"
-#~ msgstr "_Bruk"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Leveransen prisliste kan du beregne kostnadene og salgsprisen for levering i "
-#~ "henhold til vekten av produkter og andre kriterier. Du kan definere flere "
-#~ "prislister for en leveringsmetode, per land eller en sone i et bestemt land "
-#~ "definert av et postnummer rekkevidde."
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Ingen linje matchet dette produktet eller orden i valgt levering rutenettet."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Definer dine leveringsmetoder og deres priser. Levering kan legges på salg "
-#~ "bestillingsskjemaet eller i fakturaen, basert på utkjøring."
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratis vis det er mer enn."
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Definer leveringsmetoder du bruker, og sine priser i ordre til å re- "
-#~ "fakturere levering kostnader når du gjør fakturering basert på utkjøring"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Velg standard Plukke politikk"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 1cee8bb114b..73ad56c23ae 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -1,121 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Dutch translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 19:10+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-17 08:31+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
-"Language-Team: \n"
+"Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-18 07:24+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Order Ref."
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Aflevering per post"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " in de functie van "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Afleveradres"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Netto gewicht"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Afleverplanningsregel"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Maateenheid"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Afleverplanningen"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Postcode"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Planningsregel"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "De relatie die de afleveringsservice doet"
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Uitgaande levering"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Geen van de regels komt overeen met dit product of order in het gekozen "
-"afleverschema."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Verzameld om te factureren"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Geavanceerd prijsbeheer"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Geeft de volgorde aan bij afbeelden van de lijst van transportplanningen."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Landen"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -150,111 +55,161 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Uitgaande levering:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een nieuwe verzendwijze aan te maken\n"
+"              </p><p>\n"
+"                Iedere vervoerder kan verschillende verzendwijzes hebben,\n"
+"                met daaraan verschillende prijs structuren.\n"
+"              </p><p>\n"
+"                Deze afleverwijzes geven u de mogelijkheid om automatisch\n"
+"                de afleveringskosten te berekenen, volgens uw instellingen: "
+"\n"
+"                bij de verkooporder (gebaseerd op de offerte) of de factuur\n"
+"                (gebaseerd op de uitgaande leveringen).\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Variabele Factor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Bedrag"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Actief"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "In offerte toevoegen"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Vast"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Geavanceerd prijsbeheer"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Verzendwijze"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Geavanceerd prijsbeleid per bestemming"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Gen prijs aanwezig!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Bedrag"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Voorraad Verplaatsing"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Bedrag van de bestelling wat kan profiteren van een gratis verzending, "
+"uitgedrukt in het bedrijf valuta"
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr "Beschikbaar"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Vervoerder"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr "Vervoerder informatie"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "Vervoerder tracking ref."
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Netto gewicht"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Planningsregels"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Schakel dit selectievakje in als u wilt dat de levering prijzen afhankelijk "
+"zijn van de bestemming, het gewicht, het totaal van de bestelling, enz."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Planningsdefinitie"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Vul dit veld in als u transportkosten wilt factureren op basis van "
+"verzamelopdracht."
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Waarschuwing!"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Voorwaarde"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostprijs"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Landen"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Verkoop orders"
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr "Aangemaakt door"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Uitgaande leveringen"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr "Aangemaakt op"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr ""
-"Als u niet 'In offerte toevoegen' ingeeft, zal de exacte prijs berekend "
-"worden als de factuur op de verzendorder(s) is gebaseerd."
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Standaard prijs"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transport bedrijf"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Levering"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,212 +217,190 @@ msgid "Delivery Grid"
 msgstr "Leveringsplanning"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Gefactureerd aan"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Verzamellijst"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Afleverplanningsregel"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Naam"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Transportplanning"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Als de bestelling duurder is dan een bepaald bedrag kan de klant profiteren "
-"van een gratis verzending"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Verzendwijze"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Bedrag van de bestelling wat kan profiteren van een gratis verzending, "
-"uitgedrukt in het bedrijf valuta"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Verzendwijzes"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "Gratis indien het orderbedrag meer is dan"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Aflevertarieven"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Planning"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Verzendwijze product"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr ""
-"Als het actief veld uit staat, kunt u het afleverrooster verbergen zonder te "
-"verwijderen."
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Aflevering per post"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Poscode Afleverradres"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Afleverplanningen"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Standaard prijs"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Afleveradres"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Standaard prijs"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Vast"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Orderdatum"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "Gratis indien het orderbedrag meer is dan"
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Naam Planning"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratis indien meer dan %.2f"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Aantal pakketten"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr "Algemene informatie"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Gewicht"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr "Geeft de sorteer volgorde bij het berekenen van de levering volgorde"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
-"Schakel dit selectievakje in als u wilt dat de levering prijzen afhankelijk "
-"zijn van de bestemming, het gewicht, het totaal van de bestelling, enz."
+"Geeft de volgorde aan bij afbeelden van de lijst van transportplanningen."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr ""
-"Laat leeg indien de prijs is gebaseerd op de geavanceerde prijs per "
-"bestemming"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Planning"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Geen planning beschikbaar !"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Planningsregel"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Planningsregels"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Order niet in status \"Concept\"!"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Naam Planning"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Partij"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Planningsdefinitie"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Actief"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Leverdatum"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+"Als het actief veld uit staat, kunt u de expediteur verbergen zonder te "
+"verwijderen."
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Verzendwijze product"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+"Als het actief veld uit staat, kunt u het afleverrooster verbergen zonder te "
+"verwijderen."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Voorwaarde"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Als de bestelling duurder is dan een bepaald bedrag kan de klant profiteren "
+"van een gratis verzending"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kostprijs"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Als u niet 'In offerte toevoegen' ingeeft, zal de exacte prijs berekend "
+"worden als de factuur op de verzendorder(s) is gebaseerd."
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabel"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr "Is een levering"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Deze verzendwijze wordt gebruikt bij facturatie vanaf verzamelopdracht."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr "Is de mogelijke vervoerder bij de huidige order."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+#: help:delivery.carrier,normal_price:0
 msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Klik om een nieuwe verzendwijze aan te maken\n"
-"              </p><p>\n"
-"                Iedere vervoerder kan verschillende verzendwijzes hebben,\n"
-"                met daaraan verschillende prijs structuren.\n"
-"              </p><p>\n"
-"                Deze afleverwijzes geven u de mogelijkeheid om automatisch\n"
-"                de afleveringskosten te berekenen, volgens uw instellingen: "
-"\n"
-"                bij de verkooporder (gebaseerd op de offerte) of de factuur\n"
-"                (gebaseerd op de uitgaande leveringen).\n"
-"              </p>\n"
-"            "
+"Laat leeg indien de prijs is gebaseerd op de geavanceerde prijs per "
+"bestemming"
+
+#. module: delivery
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr "Laatst aangepast door"
+
+#. module: delivery
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr "Laatst aangepast op"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -475,63 +408,67 @@ msgid "Maximum Value"
 msgstr "Maximumwaarde"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Hoeveelheid"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Naam"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Postcode Afzender"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netto gewicht"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Vul dit veld in als u transportkosten wilt factureren op basis van "
-"verzamelopdracht."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Netto gewicht"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratis indien meer dan %.2f"
+msgid "No Grid Available!"
+msgstr "Geen rooster beschikbaar!"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Inkomende leveringen"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr "Geen rooster overeenkomst voor deze vervoerder!"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Standaard prijs"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Maateenheid voor gewicht"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Aantal pakketten"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Omschrijving"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
+msgstr "De order is niet in de concept fase!"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Als het actief veld uit staat, kunt u de expediteur verbergen zonder te "
-"verwijderen."
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Aflevertarieven"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Verzamellijst"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Verzameld om te factureren"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -541,334 +478,177 @@ msgid "Price"
 msgstr "Bedrag"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Geen passende leveringsmatrix gevonden voor deze vervoerder!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Soort prijs"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Levering"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Prijsbeleid informatie"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Gewicht * Volume"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!"
+msgid "Quantity"
+msgstr "Hoeveelheid"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Prijsbeleid informatie"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Verkoopprijs"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Geavanceerd prijsbeleid per bestemming"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Verkoop orders"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Vervoerder"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Verkooporderregel"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Verzendwijzes"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
-"De order moet in status \"Concept\" zijn om leveringsregels toe te voegen"
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Transportplanning"
+"Het geselecteerde product in de leveringswijze komt niet overeen met een "
+"product in het aflever rooster."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Volgorde"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Verkoopprijs"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Pakbon afdrukken"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Postcode Afzender"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Provincies"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Maateenheid voor het gewicht"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Voorraad Verplaatsing"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Soort prijs"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Geen prijs beschikbaar!"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "De vervoerder %s (id: %d) heeft geen leveringsmatrix!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Waarschuwing"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Verkopen & Inkopen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor overzicht"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Concept Facturen aanmaken bij Ontvangst"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Afleveringsregel Planning"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Transport- en afleverplanning"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Fout: UOS moet in een andere categorie staan dan de maateenheid"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: de standaard meeteenheid en de inkoopeenheid moet in de zelfde "
-#~ "categorie liggen."
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"De order moet in status \"Concept\" zijn om leveringsregels toe te voegen"
 
-#~ msgid "Notes"
-#~ msgstr "Opmerkingen"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "De relatie die de afleveringsservice doet"
 
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Fout, ongeldige EAN-code"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Deze verzendwijze wordt gebruikt bij facturatie vanaf verzamelopdracht."
 
-#~ msgid "Cancel"
-#~ msgstr "Annuleren"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Poscode Afleverradres"
 
-#~ msgid "Delivery method"
-#~ msgstr "Verzendwijze"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transport bedrijf"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "De BTW lijkt niet correct te zijn."
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr "Niet mogelijk om de aflevermethode te bepalen!"
 
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Deze leveringsmethode wordt gebruikt bij het \"Facturering op basis van "
-#~ "verzending\""
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Maateenheid"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Afleveringseigenschappen"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Maateenheid voor het gewicht"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Afleveringskosten"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Maateenheid voor gewicht"
 
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Afleveringskosten toevoegen"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabel"
 
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Te factureren verzending"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabele Factor"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Hiermee kunt u afleveringsmethoden toe voegen in verkooporders en picking. U "
-#~ "kunt uw eigen transporteur en leveringsroosters met prijzen configureren. "
-#~ "Bij het aanmaken van facturen op basis van verzending, is OpenERP in staat "
-#~ "om een verzendregel te berekenen en toe te voegen aan de factuur."
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
 
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Fout! U kunt geen recursieve geassocieerde leden aanmaken."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Gewicht"
 
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Vul dit veld in als u van plan te facturen op basis van verzending."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Gewicht * Volume"
 
-#, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Geen leveringsmatrix beschikbaar!"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr "Wordt gefactureerd aan:"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Geen bijpassende regel gevonden voor deze order in de gekozen "
-#~ "leveringsmatrix!"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Annuleren"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Maak aflevering"
-
-#~ msgid "Weights"
-#~ msgstr "Gewichten"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Vervoerder"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Maak afleveringen"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Vervoerders en leveringen"
-
-#~ msgid "_Apply"
-#~ msgstr "Toep_assen"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Laat u aflevermethoden toevoegen in verkooporders en verzamelopdrachten.\n"
-#~ "     U kunt uw eigen vervoerder en transportplanningen definiëren voor de "
-#~ "prijzen.\n"
-#~ "     Bij het factureren vanaf verzamelopdracht kan OpenERP de "
-#~ "transportkostenregel berekenen en toevoegen.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Verzendwijzes maken en beheren die u nodig heeft voor uw verkoop "
-#~ "activiteiten. Elke verzendwijze kan een prijslijst toegewezen krijgen die de "
-#~ "prijs van de levering berekent volgens de verkochte en te leveren producten."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Order referentie moet uniek zijn!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "De verzend prijslijst laat u de kosten en verkoopprijs berekenen van de "
-#~ "levering op basis van het gewicht van de producten en andere criteria. U "
-#~ "kunt verschillende prijslijsten definiëren voor een verzendwijze, per land "
-#~ "of een zone in een land op basis van een postcode gebied."
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr ""
-#~ "U probeert een partij toe te wijzen die niet van hetzelfde product is."
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "U moet een productie partij toewijzen voor dit product"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Orderreferentie moet uniek zijn per bedrijf!"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Verzamelbeleid"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referentie moet uniek zijn per bedrijf!"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Het is niet mogelijk om producten te verplaatsen naar een locatie van het "
-#~ "type 'view'."
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Kies u standaard verzamelbeleid"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratis indien meer dan"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr ""
-#~ "Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
-
-#~ msgid "Deliver each product when available"
-#~ msgstr "Lever ieder product wanneer beschikbaar"
-
-#~ msgid "Apply"
-#~ msgstr "Toepassen"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Postcode"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Er is geen regel welke overeenkomt met dit product of order in het gekozen "
-#~ "afleverschema."
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definieer verzendwijze"
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Definieer uw leveringswijze en hun prijzen. De leveringkosten kunnen worden "
-#~ "toegevoegd op de verkooporder of in de factuur, op basis van de "
-#~ "leveringsorders."
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Definieer de leveringswijze die u gebruikt en hun prijzen, om de "
-#~ "verzendkosten te her-factureren wanneer facturatie baseert op leverings "
-#~ "orders"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Stel uw wijze van orderverzamelen in"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Lever alle producten tegelijk"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Uitgaande levering"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr "in functie van"
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index ceb9f3c6e22..b444b06f2f4 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -1,160 +1,196 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-04-24 15:00+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -165,427 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index e6d1ebf54bd..64c6444ace0 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Polish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-15 19:15+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-01 18:45+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: \n"
+"Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-09-02 07:33+0000\n"
+"X-Generator: Launchpad (build 17192)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Numer zlecenia"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Dostawa pocztą"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " pełniący funkcję "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Miejsce docelowe"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Waga netto"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Pozycja tabeli opłat za dostawy"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Jednostka Miary"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Tabela opłat za dostawy"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Objętość"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Kod poczt."
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Pozycja tabeli opłat za dostawy"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner, który świadczy usługi transportowe."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Polecenie dostawy"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Żadna pozycja w tabeli opłat za dostawy nie pasuje do produktu lub "
-"zamówienia."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Pobrania do zafakturowania"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Ceny zaliczkowe"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Ustala kolejność wyświetlania w tabeli opłat za dostawy."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Kraje"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -144,111 +50,146 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Polecenie dostawy"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Współczynnik zmienny"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Kwota"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktywne"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Dodaj do oferty"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Stała"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Zaawansowane cenniki"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Metoda dostawy"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Zaawansowany cennik wg miejsc docelowych"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Brak cen!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Kwota"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Przesunięcie zapasu"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Kwota zamówienia uprawniająca do bezpłatnej dostawy wyrażona w walucie firmy."
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr "Dostępne"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Przewoźnik"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr "Informacja o przewoźniku"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "Numer przewozowy"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Waga netto"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Pozycje tabeli"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Zaznacz tę opcję, jeśli chcesz aby cena dostawy była zależna od miejsca "
+"dostawy, wagi, sumy zamówienia itp."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definicja tabeli"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Wypełnij to pole, jeśli planujesz fakturować wysyłkę na podstawie pobrania."
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Ostrzeżenie !"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Warunek"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena (koszt)"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Kontrahent"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Kraje"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Zamówienie sprzedaży"
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr "Utworzone przez"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Zlecenie dostawy"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr "Data utworzenia"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr ""
-"Jeśli nie użyjesz 'Dodaj do oferty', dokładna cena zostanie obliczona "
-"podczas fakturowania na podstawie poleceń  dostaw(y)."
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Cena domyślna"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Firma transportowa"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostawa"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -256,36 +197,61 @@ msgid "Delivery Grid"
 msgstr "Tabela opłat za dostawy"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturowane na"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Pozycja tabeli opłat za dostawy"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Pobranie"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Tabela opłat za dostawy"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nazwa"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Metoda dostawy"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Jeśli suma zamówienie przekracza pewną kwotę, to klient może mieć bezpłatną "
-"dostawę."
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Metody dostaw"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Kwota zamówienia uprawniająca do bezpłatnej dostawy wyrażona w walucie firmy."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cennik dostaw"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Dostawa jako produkt"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Dostawa pocztą"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Tabela opłat za dostawy"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Miejsce docelowe"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Stała"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -293,39 +259,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Bezpłatnie jeśli łączna wartość zamówienia jest większa niż"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Tabela"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Bezpłatnie jeśli więcej niż %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr ""
-"Jeśli pole Aktywne jest niezaznaczone, to zamiast usuwać tabelą możesz ją "
-"ukryć."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr "Informacje ogólne"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Do kodu poczt."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr "Określa kolejność obliczania tabeli opłat za dostawę"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Cena domyślna"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Ustala kolejność wyświetlania w tabeli opłat za dostawę."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Cena Normalna"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tabela"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Pozycja tabeli"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data zamówienia"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Pozycje tabeli"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -333,196 +301,152 @@ msgid "Grid Name"
 msgstr "Nazwa tabeli"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Liczba paczek"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definicja tabeli"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Waga"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Zaznacz tę opcję, jeśli chcesz aby cena dostawy była zależna od miejsca "
-"dostawy, wagi, sumy zamówienia itp."
+"Jeśli pole Aktywne jest niezaznaczone, to możesz ukryć przewoźnika bez "
+"konieczności usuwania go."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Pozostaw puste, jeśli cena zależy zaawansowanej wyceny wg miejsca docelowego."
+"Jeśli pole Aktywne jest niezaznaczone, to zamiast usuwać tabelą możesz ją "
+"ukryć."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Brak tabel !"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Jeśli suma zamówienie przekracza pewną kwotę, to klient może mieć bezpłatną "
+"dostawę."
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Jeśli nie użyjesz 'Dodaj do oferty', dokładna cena zostanie obliczona "
+"podczas fakturowania na podstawie poleceń  dostaw(y)."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Zamówieni nie jest w fazie Projektowanie!"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr "Jest opłatą za dostawę"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Numer partii"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr "To są metody dostępne dla tego zamówienia."
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktywne"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Pozostaw puste, jeśli cena zależy zaawansowanej wyceny wg miejsca docelowego."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data wysyłki"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr "Ostatnio modyfikowane przez"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Dostawa jako produkt"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr "Data ostatniej modyfikacji"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Warunek"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Wartość maksymalna"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena (koszt)"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nazwa"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Zmienna"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Waga netto"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Ta metoda dostawy będzie stosowana przy fakturowaniu z pobrania."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Waga netto"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknij by zdefiniować nową metodę dostawy. \n"
-"              </p><p>\n"
-"                Każdy spedytor (np. UPS) może mieć kilka metod dostawy (np.\n"
-"                UPS Express, UPS Standard) razem z  zasadami kalkulowania\n"
-"                ceny dla każdej metody dostawy.\n"
-"              </p><p>\n"
-"                Te metody pozwalają na automatyczne kalkulowanie ceny\n"
-"                dostawy w zależności od twoich ustawień; na zleceniu "
-"sprzedaży\n"
-"                (bazującym na ofercie) lub fakturze (bazującej na zleceniu "
-"dostawy).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr "Nie ma dostępnych tabel!"
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Wartość maksymalna"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr "Brak tabel dla tego przewoźnika!"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Ilość"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Cena Normalna"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Kod pocztowy wysyłki"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Liczba paczek"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Wypełnij to pole, jeśli planujesz fakturować wysyłkę na podstawie pobrania."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Bezpłatnie jeśli więcej niż %.2f"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Przyjęcia zewnętrzne"
+msgid "Order not in Draft State!"
+msgstr "Zamówienie nie jest w stanie Projekt!"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
-
-#. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Jednostka miary dla wagi"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Jeśli pole Aktywne jest niezaznaczone, to możesz ukryć przewoźnika bez "
-"konieczności usuwania go."
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Pobranie"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cennik dostaw"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Pobrania do zafakturowania"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -532,206 +456,175 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Brak tabeli opłat za dostawy dla tego przewoźnika !"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Typ ceny"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostawa"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informacje o cenach"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Waga * Ilość"
-
-#. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Przewoźnik %s (id: %d) nie ma tabeli opłat za dostawy!"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informacje o cenach"
+msgid "Quantity"
+msgstr "Ilość"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Zaawansowany cennik wg miejsc docelowych"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Cena sprzedaży"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Przewoźnik"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Metody dostaw"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pozycja zamówienia sprzedaży"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The order state have to be draft to add delivery lines."
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
-"Zamówienie musi być w fazie Projektowanie aby można było dodać pozycje "
-"dostaw."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Tabela opłat za dostawy"
+"Produkt wybrany w metodzie dostawy nie spełnia żadnych kryteriów z tabeli "
+"opłat za dostawy."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Cena sprzedaży"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Drukuj zamówienie dostawy"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Kod pocztowy wysyłki"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Regiony"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Jednostka miar (Unit of Measure) jest jednostką pomiaru wagi."
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Przesunięcie zapasu"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Typ ceny"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Uwagi"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Sprzedaż i zakupy"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Błąd: JS musi być innej kategorii niż JM."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Dodaj koszty dostawy"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Przewoźnicy i dostawy"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Koszty dostawy"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner - przwoźnik"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nie ma ceny !"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "VAT wygląda na niepoprawny"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Błąd: Niedozwolony kod EAN"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Przewoźnik %s (id: %d) nie ma tabeli opłat za dostawy!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Ostrzeżenie"
-
-#~ msgid "Delivery method"
-#~ msgstr "Metoda dostawy"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "Zamówienie musi być w stanie Projekt, aby dodawać pozycje dostaw"
 
-#~ msgid "Cancel"
-#~ msgstr "Anuluj"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner, który świadczy usługi transportowe."
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Właściwości dostaw"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Ta metoda dostawy będzie stosowana przy fakturowaniu z pobrania."
 
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generuj projekty faktur przy przyjęciach"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Do kodu poczt."
 
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Tabela opłat i przewoźników"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Firma transportowa"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Brak tabel !"
+msgid "Unable to fetch delivery method!"
+msgstr "Nie można pobrać metod dostaw!"
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Jednostka Miary"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Żadna pozycja nie jest zgodna z zamówieniem w wybranej tabeli opłat za "
-#~ "dostawy !"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Jednostka miar (Unit of Measure) jest jednostką pomiaru wagi."
 
-#~ msgid "Delivery line of grid"
-#~ msgstr "Pozycja tabeli opłat za dostawy"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Jednostka miary dla wagi"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Zmienna"
 
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr ""
-#~ "Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Współczynnik zmienny"
 
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Ta metoda dostawy będzie stosowana przy fakturowaniu z wydania zewnętrznego."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Objętość"
 
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Opakowanie do zafakturowania"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Ostrzeżenie !"
 
-#~ msgid "Make Delievery"
-#~ msgstr "Utwórz dostawę"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Waga"
 
-#~ msgid "_Cancel"
-#~ msgstr "_Anuluj"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Waga * Ilość"
 
-#~ msgid "Weights"
-#~ msgstr "Wagi"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr "Będzie fakturowane na:"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Utwórz dostawy"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Kod poczt."
 
-#~ msgid "_Apply"
-#~ msgstr "_Zastosuj"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr "dla funkcji"
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 0d641291df3..76df1424ce6 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -1,161 +1,202 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Portuguese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-12 16:38+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. da Ordem"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Expedição por correio"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " em Função de "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso líquido"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Ativo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Linha da grelha de entrega"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr "Adicionar ao orçamento"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unidade de medida"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Preço em Avanço"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Grelhas da Entrega"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Preço em avanço por destino"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Montante"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Código postal"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Montante da ordem de beneficiar de um transporte grátis, expresso na moeda "
+"da empresa"
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linha da grelha"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "O parceiro que está a fazer o serviço de entregas."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportadora"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Ordem de entrega"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref de Acompanhamento da transportadora"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
+"Marque esta caixa se desejar gerir preços de entrega que possam depender do "
+"destino, o peso, o total da ordem, etc"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Picking para ser faturado"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Preencher este campo se pretende enviar a fatura com base na colheita."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Preço em Avanço"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condição"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Dá a ordem da sequência ao exibir uma lista da grelha da entrega."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preço de custo"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Países"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordem de Entrega :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Fator variável"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Preço por omissão"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Montante"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Entrega"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr "Adicionar ao orçamento"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Grelha de expedição"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fixo"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Linha da grelha de entrega"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Grelhas de entrega"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,125 +206,113 @@ msgid "Delivery Method"
 msgstr "Método de Entrega"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Sem valor disponível!"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Movimento de Stock"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Métodos de entrega"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref de Acompanhamento da transportadora"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Lista de preços da Entrega"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso líquido"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Artigo para expedição"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linhas da Grelha"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Expedição por correio"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definição da grelha"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Grelhas da Entrega"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fixo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Ordem de Vendas"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Grátis se for mais que %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Ordens de entrega"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Empresa Transportadora"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Dá a ordem da sequência ao exibir uma lista da grelha da entrega."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Grelha de expedição"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Grelha"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linha da grelha"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista Picking"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linhas da Grelha"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nome"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Nome da grelha"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Se a ordem for mais cara do que uma certo montante, o cliente pode "
-"beneficiar de um transporte grátis"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definição da grelha"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Montante da ordem de beneficiar de um transporte grátis, expresso na moeda "
-"da empresa"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Grelha"
+"Se o campo ativo é definido como Falso, ele permitirá que oculte a "
+"transportadora de entrega sem a remover."
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -295,58 +324,30 @@ msgstr ""
 "grade de entrega sem a remover."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Código postal para"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Preço por omissão"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Preço normal"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data da Ordem"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Nome da grelha"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Se a ordem for mais cara do que uma certo montante, o cliente pode "
+"beneficiar de um transporte grátis"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de embalagens"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
-"Marque esta caixa se desejar gerir preços de entrega que possam depender do "
-"destino, o peso, o total da ordem, etc"
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
@@ -355,171 +356,154 @@ msgid ""
 msgstr "Mantenha vazio se o preço depende do preço avançado por destino"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Sem grade disponível!"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Ordem não se encontra no estado de rascunho !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor máximo"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Ativo"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso líquido"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data de envio"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso líquido"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Artigo para expedição"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condição"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preço de custo"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Preço normal"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variável"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de embalagens"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Este método de entrega será usado quando a faturação do picking."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor máximo"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantidade"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista Picking"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Código postal inicial"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Picking para ser faturado"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Preencher este campo se pretende enviar a fatura com base na colheita."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "Grátis se for mais que %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de Preço"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Recepções Agendadas"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informações sobre Preços"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Quantidade"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unidade de peso"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Preço de Venda"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descrição"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Ordem de Vendas"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Se o campo ativo é definido como Falso, ele permitirá que oculte a "
-"transportadora de entrega sem a remover."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Lista de preços da Entrega"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Preço"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nenhuma grelha correspondente a esta transportadora !"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Código postal inicial"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Entrega"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Estados"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * volume"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento de Stock"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -528,63 +512,43 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "A transportadora %s (id: %d) não tem grelha de entrega !"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informações sobre Preços"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Preço em avanço por destino"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportadora"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Métodos de entrega"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 "O estado da ordem tem que estar em rascunho para adicionar linhas de entrega."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Grelhas de entrega"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "O parceiro que está a fazer o serviço de entregas."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Este método de entrega será usado quando a faturação do picking."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Preço de Venda"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Código postal para"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Imprimir ordem de entrega"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Empresa Transportadora"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Estados"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidade de medida"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -593,239 +557,62 @@ msgid ""
 msgstr "\"Unidade de Medida\" é a unidade de peso"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de Preço"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Erro: Código ean inválido"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "O IVA não parece estar correcto."
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Custos da Entrega"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da acção"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Erro! Não pode criar membros associados recursivamente."
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "Complete este campo se planeia facturar com base no empacotamento."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite adicionar métodos de expedição nas ordens de venda e empacotamento. "
-#~ "Pode definir grelhas de transitários e expedição por preços. Ao criar "
-#~ "facturas por recolha, o OpenERP pode calcular a via de expedição."
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Parceiro portador"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vendas & Compras"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
-#~ "especial !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitectura da vista"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "Este método de expedição será usado se facturar por empacotamento"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Linha de expedição da grelha"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Gerar facturas rascunho pela recepção"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Grelha de transitário e expedição"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Erro: UdV deve estar numa categoria diferente da UdC"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erro: A UdM pré-defenida e a UdM de compra devem ser da mesma categoria."
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Adicionar custos de expedição"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unidade de peso"
 
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transitários e expedições"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variável"
 
-#~ msgid "Delivery method"
-#~ msgstr "Método de expedição"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Fator variável"
 
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Empacotamento a facturar."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No grid avaible !"
-#~ msgstr "Nenhuma grelha disponivel !"
+msgid "Warning!"
+msgstr "Aviso!"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Nenhuma correspondência da linha nesta ordem na grelha de entregas "
-#~ "escolhidas !"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nenhum preço disponivel !"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * volume"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Fazer entrega"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Criar entregas"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Ordem de entrega"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Tem de associar um lote de produção a este artigo"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "A ordm de referência deve ser única!"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "A lista de preços de entrega permite-lhe calcular o custo e o preço de venda "
-#~ "da entrega de acordo com o peso dos artigos e outros critérios. Pode definir "
-#~ "várias listas de preços para um método de entrega, por país ou uma zona de "
-#~ "um país específico definido por uma faixa de código postal."
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Criar e gerir os métodos de entrega que precisa para suas actividades de "
-#~ "vendas. Cada método de entrega pode ser atribuído a uma lista de preços que "
-#~ "calcula o preço da entrega de acordo com os produtos vendidos ou entregues."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite adicionar métodos de entrega em ordens de venda e picking. \n"
-#~ "      Pode definir sua própria transportadora e grades de entrega de preços. "
-#~ "\n"
-#~ "      Ao criar facturas de picking, OpenERP é capaz de adicionar e calcular "
-#~ "a linha de navegação.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Tentar atribuir um monte que não é do mesmo artigo"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Defina métodos de entrega"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Configure a Política de Recolha"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "A referência deve ser única por empresa!"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "Não pode mover os artigos de ou para um local de tipo vista."
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Escolha a sua Política de Recolha por omissão"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Nenhuma linha correspondente a este artigo ou ordem na grelha de entrega "
-#~ "escolhida."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Defina os métodos de entrega e os seus valores. Os custos da entrega podem "
-#~ "ser adicionados ao formulário da ordem de vendas ou fatura, baseados na "
-#~ "ordem de entrega."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Grátis se for maior que"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Ordem de referência deve ser única por empresa!"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Entregar todos os artigos de uma só vez"
-
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Erro! Não pode criar membros recursivos."
-
-#~ msgid "Deliver each product when available"
-#~ msgstr "Entregar cada artigo quando estiver disponível"
-
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propriedades da Entrega"
-
-#~ msgid "Picking Policy"
-#~ msgstr "Politica de Picking"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Defina os métodos de entrega que utiliza e os seus valores e na ordem de "
-#~ "refaturar os custos da entrega quando está a fazer a faturação com base nas "
-#~ "ordens de entrega"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Código postal"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 3be55024bc3..ce3c8eb0a99 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -1,121 +1,27 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-22 01:08+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-06 02:46+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@zupy.com.br>\n"
-"Language-Team: \n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-09-07 07:47+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. do Pedido"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Entrega por correio"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " em Função de "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destino"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Peso líquido"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Itens da Grade de Entrega"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unidade de Medida"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Grades de Entregas"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volume"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "CEP"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linha de Grade"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Parceiro que está efetuando o serviço de entrega."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Ordem de Entrega"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Não existem registros ou pedidos relacionados a este produto na grade de "
-"entrega escolhida."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Separação a ser faturado"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Preço Antecipado."
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Dá a ordem de seqüência ao exibir uma lista de entrega."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Países"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -150,111 +56,161 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordem de Entrega"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo método de entrega. \n"
+"              </p><p>\n"
+"                Cada transportadora (e.x. Correios) pode ter diversos "
+"métodos de entrega (e.x.\n"
+"                SEDEX, SEDEX 10) com regras de valores associados a cada "
+"método.\n"
+"              </p><p>\n"
+"                Estes métodos permitirão calcular o valor do frete de acordo "
+"com suas configurações; \n"
+"no pedido de vendas (baseado na cotação) ou na fatura (baseado nas ordens de "
+"entrega).\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Fator variável"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Quantidade"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Ativo"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Adicionar no Orçamento"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fixo"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Preço Antecipado."
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Método de Entrega"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Preço avançado, baseado no destino"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Sem preço disponível!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Quantidade"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Mov. de Estoque"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Total do pedido para se beneficiar de entrega grátis, expresso na moeda da "
+"empresa."
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr "Disponível"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportadora"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr "Informação da Transportadora"
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "Ref Rastreamento de Carga"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Peso Líquido"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linhas de grade"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Marque este checkbox se você quer gerenciar o preço de entrega que dependa "
+"do destino, do peso, do total do pedido, etc."
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definição de grade"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Complete este campo se você pretende faturar o frete baseado em separações."
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Aviso!"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Condição"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operador"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Preço de Custo"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Países"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Pedido de Venda"
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr "Criado por"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Ordens de Entrega"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr "Criado em"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr ""
-"Caso você não 'Adicionar no Orçamento', o preço exato será calculado quando "
-"estiver faturando baseado sobre as ordens de entrega."
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Preço padrão"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportadora"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Entrega"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,37 +218,61 @@ msgid "Delivery Grid"
 msgstr "Grade de entrega"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Faturado para"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Itens da Grade de Entrega"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de Separação"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Grades de Entrega"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nome"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Método de Entrega"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Se o pedido for maior que um certo valor, o cliente pode se beneficiar de "
-"uma entrega gratuíta"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Métodos de Entrega"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Total do pedido para se beneficiar de entrega grátis, expresso na moeda da "
-"empresa."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Lista de preços de entrega"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Entrega de Produto"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Entrega por correio"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Grades de Entregas"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destino"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fixo"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -300,39 +280,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Grátis se o valor total do Pedido for maior que"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Grade"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Grátis se maior que %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr ""
-"Se o campo ativo é definido como Falso, ele permitirá que você oculte a "
-"grade de entrega sem removê-la."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr "Informações Gerais"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Para o CEP"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr "Dá a ordem da seqüência para o cálculo da rede de entrega"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Preço padrão"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Dá a ordem de seqüência ao exibir uma lista de entrega."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Preço Normal"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Grade"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data do Pedido"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linha de Grade"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linhas de grade"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -340,258 +322,232 @@ msgid "Grid Name"
 msgstr "Nome da Grade"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Número de Pacotes"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definição de grade"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Marque este checkbox se você quer gerenciar o preço de entrega que dependa "
-"do destino, do peso, do total do pedido, etc."
+"Se o campo ativo é definido como Falso, ele permitirá que você oculte a "
+"transportadora sem removê-la."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Mantenha vazio se o preço depende de fatores avançados de preço por "
-"destinação da mercadoria."
+"Se o campo ativo é definido como Falso, ele permitirá que você oculte a "
+"grade de entrega sem removê-la."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Sem grade disponível!"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Se o pedido for maior que um certo valor, o cliente pode se beneficiar de "
+"uma entrega gratuíta"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Caso você não 'Adicionar no Orçamento', o preço exato será calculado quando "
+"estiver faturando baseado sobre as ordens de entrega."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "O Pedido não está como Provisório!"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr "É uma Entrega"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr "É o método de transporte possível com o pedido atual."
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Ativo"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Mantenha vazio se o preço depende de fatores avançados de preço por "
+"destinação da mercadoria."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data de Envio"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr "Última atualização por"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Entrega de Produto"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr "Última atualização em"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Condição"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valor Máximo"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Preço de Custo"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nome"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variável"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Peso Líquido"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
-"Este método de entrega será usado quando faturar a partir da separação."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Peso líquido"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para definir um novo método de entrega. \n"
-"              </p><p>\n"
-"Cada transportadora Correio (por exemplo) pode ter vários métodos de entrega "
-"(por exemplo,\n"
-"                 PAC, Sedex) com um conjunto de regras de preços ligados "
-"para cada método.\n"
-"              </p><p>\n"
-"                Estes métodos permitem calcular o valor do frete "
-"automaticamente\n"
-"                 de acordo com suas configurações, no pedido de venda (com "
-"base na\n"
-"                 cotação) ou na fatura (com base nas ordens de entrega).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr "Nenhuma rede Disponível!"
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valor Máximo"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr "Sem rede de correspondência para esta transportadora!"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantidade"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Preço Normal"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "CEP Origem"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Número de Pacotes"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Complete este campo se você pretende faturar o frete baseado em separações."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operador"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Grátis se maior que %.2f"
+msgid "Order not in Draft State!"
+msgstr "Pedido não está como Provisório!"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Recebimento de Mercadorias"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de Separação"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unidade de medida de peso"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Separação a ser faturado"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descrição"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Se o campo ativo é definido como Falso, ele permitirá que você oculte a "
-"transportadora sem removê-la."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipo de Preço"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Lista de preços de entrega"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informação do preço"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Preço"
+msgid "Quantity"
+msgstr "Quantidade"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Sem grade correspondentes para esta transportadora!"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Preço de Venda"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Entrega"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de Venda"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Peso * Volume"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha do Pedido de Vendas"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "A transportadora %s (id: %d) não possui grade de entrega!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
+"O produto selecionado no método de entrega não cumpre os requerimentos para "
+"a entrega."
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informação do preço"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Seqüência"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Preço avançado, baseado no destino"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "CEP Origem"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportadora"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Situações"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Métodos de Entrega"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Mov. de Estoque"
+
+#. module: delivery
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "A transportadora %s (id: %d) não possui grade de entrega!"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
@@ -599,30 +555,37 @@ msgstr ""
 "entrega."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Grades de Entrega"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Parceiro que está efetuando o serviço de entrega."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Seqüência"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Este método de entrega será usado quando faturar a partir da separação."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Preço de Venda"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Para o CEP"
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportadora"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Imprimir Ordem de Expedição"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr "Não foi possível obter método de entrega!"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Situações"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unidade de Medida"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -631,239 +594,62 @@ msgid ""
 msgstr "Unidade de Medida é a unidade de medida para o Peso"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipo de Preço"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vendas & Compras"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Erro: Unidade de venda precisa ser de categoria diferente da unidade de "
-#~ "medida"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erro: A unidade padrão e a unidade de compra presisam ser da mesma categoria."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "O imposto não parece estar correto."
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Adicione as despesas de entrega"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportadores e entregas"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Preencha este campo se você planeja faturar o envio com base na embalagem."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Embalagem a ser Faturada"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unidade de medida de peso"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nenhum preço disponível!"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variável"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "Delivery method"
-#~ msgstr "Método de Entrega"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Este método de entrega será utilizado quando a fatura for emitida na "
-#~ "embalagem."
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Gerar rascunho de fatura no recebimento"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Grade de entrega e transportadora"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Erro! Você não pode criar membros recursivos associados."
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Transportadora"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Erro: Código EAN inválido"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Custos de Entrega"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Linha da grade de entregas"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Permite que você adicione métodos de entrega em ordens de venda e "
-#~ "embalamento. Você pode definir suas próprias transportadoras e grades de "
-#~ "entregas para os preços. Quando criar faturas de separação, o Open ERP é "
-#~ "capaz de adicionar e computar a linha de envio."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto deve começar com x_ e não conter caracteres especiais!"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Realizar Entrega"
-
-#~ msgid "Weights"
-#~ msgstr "Pesos"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Criar Entregas"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Criar e gerenciar os métodos de entrega que você precisa para suas "
-#~ "atividades de vendas. Cada método de entrega pode ser atribuída a uma lista "
-#~ "de preços que calcula o preço da entrega de acordo com os produtos vendidos "
-#~ "ou entregues."
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Referência da Ordem deve ser única!"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Ordem de Entrega"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Permite que você adicione métodos de entrega nas ordens de vendas e picking\n"
-#~ "     Você pode definir a transportadora e grade de preços de entrega.\n"
-#~ "     Quando criar Notas Fiscais de uma Ordem de Separação, OpenERP será "
-#~ "capaz de adicionar e somar a linha de frete.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Você tentou atribuir um lote que não é do mesmo produto"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Você deve atribuir um lote de produção para este produto."
-
-#~ msgid "_Apply"
-#~ msgstr "_Aplicar"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Fator variável"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Nenhuma linha corresponde a esta ordem na grade de entrega escolhida !"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "As listas de preço de entrega permitem a você calcular o custo e o preço de "
-#~ "venda da entrega de acordo com o peso dos produtos e outros critérios. Você "
-#~ "pode definir várias listas de preço por um método de entrega, por país ou "
-#~ "zona em um país específico, definido por um intervalo de código postal."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Defina o seu método de entrega e preço. Os custos de entrega podem ser "
-#~ "adicionados no pedido de vendas ou na fatura, baseado nas ordens de entrega."
-
-#~ msgid "Picking Policy"
-#~ msgstr "Politica de Separação"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "A referência deve ser única por empresa!"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Escolha a sua política padrao de separação"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Envia todos os produtos de um vez"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Defina o método de entrega que você está usando e respectivo preço, para "
-#~ "repassar dos custos de entrega quando você estiver fazendo a fatura baseada "
-#~ "em ordens de entrega."
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Referência de ordem deve ser única por empresa!"
-
-#~ msgid "Deliver each product when available"
-#~ msgstr "Entrega cada produto quando disponível"
-
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volume"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Nenhuma linha corresponde a este produto ou ordem na grade de entrega "
-#~ "escolhida."
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propriedades de Entregas"
+msgid "Warning!"
+msgstr "Aviso!"
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Você não pode mover os produtos de/para um Local do tipo Visualização"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Peso"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Defina o Método de Entrega"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Peso * Volume"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Defina a Política de Separação"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr "Será faturado para:"
 
-#~ msgid "Free If More Than"
-#~ msgstr "Grátis se mais que"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "CEP"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Erro! Você não pode criar membros associados recursivamente."
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr "em Função de"
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index dbb057c6672..578176cabbe 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -1,121 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Romanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-19 19:06+0000\n"
-"Last-Translator: Mihai Satmarean <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Referinta Comenzii"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Livrare prin posta"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " in Functie de "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destinatie"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Greutate neta"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Linie grila de livrare"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Unitatea de Masura"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Grile de livrare"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volum"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Cod postal"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linie grila"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partenerul care efectueaza serviciul de livrare."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Comanda de livrare"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Nici o linie nu se potriveste cu acest produs sau comanda in grila de "
-"livrare aleasa."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Ridicarile care vor fi facturate"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Stabilire avansata a pretului"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Da ordinea secventei atunci cand afiseaza o lista a grilei de livrare"
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Tari"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -150,111 +55,147 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Comanda de livrare :"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Factor variabil"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Cantitate"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Activ(a)"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Adauga la Cotare"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fix"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Stabilire avansata a pretului"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Metoda de livrare"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Stabilire avansata a preturilor pe Destinatie"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Niciun pret disponibil!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Cantitate"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Miscare stoc"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Cantitatea comenzii pentru a beneficia de o livrare gratuita, exprimata in "
+"moneda companiei"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref urmarire transportator"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Greutate neta"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Transportator"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linii grila"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definitie grila"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref urmarire transportator"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Avertizare!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Bifati aceasta casuta daca doriti sa gestionati preturile de livrare care "
+"depind de destinatie, greutate, totalul comenzii, etc."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Completati acest camp daca planuiti sa facturati livrarea pe baza ridicarii."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partener"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Conditie"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Comanda de vanzare"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Pretul de cost"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Comenzi de Livrare"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Tari"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Daca nu 'Adaugati la Cotare', pretul exact va fi calculat atunci cand "
-"facturati pe baza comenzilor de livrare."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Compania de transport"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Pret predefinit"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Livrare"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -262,37 +203,61 @@ msgid "Delivery Grid"
 msgstr "Grila de livrare"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturat catre:"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Linie grila de livrare"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de ridicare"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Grile de livrare"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Nume"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Metoda de livrare"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Daca comanda este depaseste o anumita suma, clientul poate beneficia de "
-"transport gratuit"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Metode de Livrare"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Cantitatea comenzii pentru a beneficia de o livrare gratuita, exprimata in "
-"moneda companiei"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Lista de preturi de livrare"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Livrare produs"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Livrare prin posta"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Grile de livrare"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destinatie"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fix"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -300,39 +265,42 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Gratuit daca Valoarea Totala a Comenzii este mai Mare decat"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Grila"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Gratuit daca e mai mult de %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Daca campul activ este setat pe Fals, va va permite sa ascundeti grila de "
-"livrare fara a o sterge."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "De arhivat"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Pret predefinit"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+"Da ordinea secventei atunci cand afiseaza o lista a grilei de livrare"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Pret obisnuit"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Grila"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linie grila"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Data comenzii"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linii grila"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -340,288 +308,266 @@ msgid "Grid Name"
 msgstr "Nume grila"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Numar de pachete"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definitie grila"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Greutate"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Bifati aceasta casuta daca doriti sa gestionati preturile de livrare care "
-"depind de destinatie, greutate, totalul comenzii, etc."
+"Daca campul activ este setat pe Fals, va va permite sa ascundeti "
+"transportatorul fara a-l sterge."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Lasati necompletat daca stabilirea pretului depinde de stabilirea avansata a "
-"pretului pe destinatie"
+"Daca campul activ este setat pe Fals, va va permite sa ascundeti grila de "
+"livrare fara a o sterge."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nici o grila disponibila !"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Daca comanda este depaseste o anumita suma, clientul poate beneficia de "
+"transport gratuit"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Daca nu 'Adaugati la Cotare', pretul exact va fi calculat atunci cand "
+"facturati pe baza comenzilor de livrare."
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Comanda nu este in starea de ciorna !"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Activ(a)"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Lasati necompletat daca stabilirea pretului depinde de stabilirea avansata a "
+"pretului pe destinatie"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data expedierii"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Livrare produs"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Conditie"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Valoarea Maxima"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Pretul de cost"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Nume"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabil(a)"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Greutate neta"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Metoda de livrare folosita va fi folosita la facturarea la ridicare."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Greutate neta"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
-"                Faceti click pentru a defini o metoda noua de livrare. \n"
-"              </p><p>\n"
-"                Fiecare companie de transport (de exemplu UPS) poate avea "
-"mai multe metode de livrare (de exemplu\n"
-"                UPS Expres, UPS Standard) cu un set de norme de stabilire a "
-"pretului atasate\n"
-"                fiecarei metode.\n"
-"              </p><p>\n"
-"                Aceste metode permit calcularea automata a pretului de "
-"livrare\n"
-"                in functie de setarile dumneavoastra; in comanda de vanzare "
-"(bazata pe\n"
-"                cotatie) sau factura (bazata pe ordinele de livrare).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Valoarea Maxima"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantitate"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Pret obisnuit"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Incepe arhivarea"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Numar de pachete"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Completati acest camp daca planuiti sa facturati livrarea pe baza ridicarii."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:78
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Gratuit daca e mai mult de %.2f"
+msgid "Order not in Draft State!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Incarcaturi primite"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partener"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de ridicare"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Unitate de masura pentru Greutate"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Ridicarile care vor fi facturate"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Descriere"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Pret"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr ""
-"Daca campul activ este setat pe Fals, va va permite sa ascundeti "
-"transportatorul fara a-l sterge."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Tipul de pret"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Lista de preturi de livrare"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Informatii stabilire preturi"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Pret"
+msgid "Quantity"
+msgstr "Cantitate"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nici o grila nu se potriveste cu acest transportator !"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Pret de vanzare"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Livrare"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Comanda de vanzare"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Greutate * Volum"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Transportatorul %s (id: %d) nu are nici o grila de livrari!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Informatii stabilire preturi"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Secventa"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Stabilire avansata a preturilor pe Destinatie"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Incepe arhivarea"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Transportator"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stari"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Metode de Livrare"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Miscare stoc"
+
+#. module: delivery
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Transportatorul %s (id: %d) nu are nici o grila de livrari!"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 "Starea comenzii trebuie sa fie ciorna pentru a putea adauga linii de livrare."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Grile de livrare"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partenerul care efectueaza serviciul de livrare."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Secventa"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Metoda de livrare folosita va fi folosita la facturarea la ridicare."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Pret de vanzare"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "De arhivat"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Tipareste Ordinul de Livrare"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Compania de transport"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Stari"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Unitatea de Masura"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -632,200 +578,62 @@ msgstr ""
 "Greutate"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Tipul de pret"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generare de factură draft la recepţie"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Şi costuri livrare"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Transportator partener"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Eroare: cod EAN invalid"
-
-#~ msgid "Notes"
-#~ msgstr "Note"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Eroare ! Nu puteţi crea membri asociaţi recursiv."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ și să nu conțină nici un caracter "
-#~ "special !"
-
-#~ msgid "Delivery method"
-#~ msgstr "Metodă de livrare"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Codul TVA (CIF) nu pare a fi corect."
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Unitate de masura pentru Greutate"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Nici o linie nu se potriveste cu aceasta comanda in grilele de livrare alese "
-#~ "!"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Creeaza si gestioneaza metodele de livrare de care aveti nevoie in "
-#~ "activitatile dumneavoastra de vanzare. Fiecare metoda de livrare poate fi "
-#~ "altribuita unei liste de preturi care calculeaza pretul livrarii in functie "
-#~ "de produsele vandute sau livrate."
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabil(a)"
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Nu este disponibil nici un pret !"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Creare Livrari"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Transportatori si livrari"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Referinţa comenzii trebuie să fie unică!"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Va permite sa adaugati metode de vanzare in ordinele de vanzare si "
-#~ "ridicare.\n"
-#~ "     Puteti defini propriul transportator si grilele de livrare pentru "
-#~ "preturi.\n"
-#~ "     Atunci cand creati facturi la ridicare, OpenERP poate aduna si calcula "
-#~ "linia de livrare.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Delivery Order"
-#~ msgstr "Comanda de livrare"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Lista de preturi de livrare va permite sa calculati costul si pretul de "
-#~ "vanzare al livrarii in functie de greutatea produselor si alte criterii. "
-#~ "Puteti defini mai multe liste de preturi pentru o metoda de livrare, pentru "
-#~ "fiecare tara sau o zona dintr-o anumita tara definita printr-o gama de "
-#~ "coduri postale."
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Propretati livrari"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Anuleaza"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Factor variabil"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Nici o linie nu s-a potrivit cu acest produs sau comanda din grila de "
-#~ "livrare aleasa."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Defineste metodele de livrare si stabilirea pretului lor. Costurile de "
-#~ "livrare pot fi adaugate in formularul comenzii de vanzare sau in factura, pe "
-#~ "baza comenzilor de livrare."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volum"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Atentionare"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Efectueaza livrarea"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "defineste.livrarea.wizard.pasi.livrare"
-
-#~ msgid "Weights"
-#~ msgstr "Greutati"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr ""
-#~ "Nu puteti muta produse dintr-o sau intr-o locatie de tipul vizualizare."
-
-#~ msgid "Picking Policy"
-#~ msgstr "Politica de ridicare"
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Alegeti-va Politica Implicita de Ridicare"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Incercati sa atribuiti un lot care nu este din acelasi produs"
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definiti Metodele de Livrare"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Configurati Politica de Ridicare"
-
-#~ msgid "Cancel"
-#~ msgstr "Anuleaza"
-
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referinta trebuie sa fie unica per Companie!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Vanzari & Achizitii"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Gratuit daca depaseste"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Defineste metodele de livrare pe care le folositi si stabilirea pretului "
-#~ "pentru a refactura costurile de livrare atunci cand faceti facturarea pe "
-#~ "baza comenzilor de livrare"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Trebuie sa atribuiti un lot de productie pentru acest produs"
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Livreaza toate produsele odata"
+msgid "Warning!"
+msgstr "Avertizare!"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Costuri de livrare"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Greutate"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Greutate * Volum"
 
-#~ msgid "_Apply"
-#~ msgstr "_Aplica"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Livreaza fiecare produs atunci cand este disponibil"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Cod postal"
 
-#~ msgid "Apply"
-#~ msgstr "Aplica"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 31129c625a6..c1f5ce2f490 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -1,118 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Russian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 12:42+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ссылка заказа"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Доставка почтой"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr ""
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Место назначения"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Вес нетто"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Строка сетки доставки"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Единица измерения"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Сетки доставки"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Объем"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Индекс"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Строка сетки"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Партнёр оказывающий услуги доставки."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Заказ на доставку"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Счет на комплектование"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Расширенные расценки"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Возвращает последовательность вывода списка доставочной сетки."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Страны"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -146,109 +54,148 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Заказ на доставку:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Переменный фактор"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Сумма"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Активен"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Фиксированный"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Расширенные расценки"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Метод доставки"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Расширенные расценки по месту назначения"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Нет прайс листа"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Сумма"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Движение ТМЦ"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Сумма заказа, чтобы воспользоваться бесплатной доставкой, выраженная в "
+"валюте компании"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Отслеживание доставки перевозчиком"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Вес нетто"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Перевозчик"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Линии сетки"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Определение сетки"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Отслеживание доставки перевозчиком"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Внимание!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Установите этот флажок, если вы хотите управлять ценами доставки, которые "
+"зависят от места назначения, веса, суммы заказа и т.д."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Заполните это поле, если вы планируете выставить счет на отгрузку основанный "
+"на комплектовании."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Партнёр"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Условие"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Заказ продаж"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Себестоимость"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Заказы на доставку"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Страны"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Транспортная компания"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Цена по умолчанию"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Доставка"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -256,37 +203,61 @@ msgid "Delivery Grid"
 msgstr "Сетка доставки"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "счет-фактура"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Строка сетки доставки"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Комплектовочный лист"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Сетки доставки"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Название"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Метод доставки"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Если заказ дороже, чем определённая сумма, покупатель может получить выгоду "
-"из бесплатной перевозки"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Способы доставки"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Сумма заказа, чтобы воспользоваться бесплатной доставкой, выраженная в "
-"валюте компании"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Прайс-лист доставки"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Доставка товара"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Доставка почтой"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Сетки доставки"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Место назначения"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Фиксированный"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -294,39 +265,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Сетка"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Бесплатно, если больше чем %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Если поле \"Активно\" установлено в «Ложь», будет позволено спрятать "
-"доставочную сетку не удаляя её."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Почтовый индекс получателя"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Цена по умолчанию"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Возвращает последовательность вывода списка доставочной сетки."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Нормальная цена"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Сетка"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Строка сетки"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Дата заказа"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Линии сетки"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -334,137 +307,83 @@ msgid "Grid Name"
 msgstr "Название сетки"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Количество упаковок"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Определение сетки"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Вес"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "Идентификатор"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Установите этот флажок, если вы хотите управлять ценами доставки, которые "
-"зависят от места назначения, веса, суммы заказа и т.д."
+"Если поле \"Активно\" имеет значение ложь, то это позволит вам скрыть "
+"перевозчика, не удаляя его."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Оставьте пустым, если расценка зависит от расширенной расценки по месту "
-"назначения"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Доступных сеток нет !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Заказ не в состоянии \"Черновик\" !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Партия"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Активен"
+"Если поле \"Активно\" установлено в «Ложь», будет позволено спрятать "
+"доставочную сетку не удаляя её."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Дата отгрузки"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Если заказ дороже, чем определённая сумма, покупатель может получить выгоду "
+"из бесплатной перевозки"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Доставка товара"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Условие"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Себестоимость"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Переменная"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Оставьте пустым, если расценка зависит от расширенной расценки по месту "
+"назначения"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Этот способ доставки будет использоваться при выставление счета по "
-"комплектованию."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Нажмите для добавления нового способа доставки.\n"
-"              </p><p>\n"
-"                Каждая курьерская служба (например UPS) может иметь "
-"несколько способов доставки (например\n"
-"                UPS Express, UPS Standard) с установкой цен для каждого из "
-"способов.\n"
-"              </p><p>\n"
-"                Эти способы позволяют автоматически высчитать стоимость "
-"доставки\n"
-"                в зависимости от ваших настроек; по заказу на продажу "
-"(основанному на заявке)\n"
-"                или по счету (основанному на заказе на доставку).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -472,393 +391,246 @@ msgid "Maximum Value"
 msgstr "Максимальное значение"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Количество"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Название"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Почтовый индекс отправителя"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Вес нетто"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Заполните это поле, если вы планируете выставить счет на отгрузку основанный "
-"на комплектовании."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Вес нетто"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Бесплатно, если больше чем %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Входящие поставки"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Нормальная цена"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Единица измерения веса"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Количество упаковок"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Описание"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Если поле \"Активно\" имеет значение ложь, то это позволит вам скрыть "
-"перевозчика, не удаляя его."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Прайс-лист доставки"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Цена"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Партнёр"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Нет сетки, подходящей для этого перевозчика!"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Доставка"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Счет на комплектование"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Вес * объем"
+msgid "Price"
+msgstr "Цена"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Перевозчик %s (ID: %d) не имеет доставочной сетки!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Тип цены"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "Информация о цене"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Расширенные расценки по месту назначения"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Перевозчик"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Цена продажи"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Способы доставки"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Заказ продаж"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Состояние заказа должно быть \"Черновик\" для добавления позиций доставки."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Сетки доставки"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Нумерация"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Цена продажи"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Печать заказа на доставку"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Почтовый индекс отправителя"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Cостояния"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Единица измерения (единица измерения) это единица измерения веса"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Движение ТМЦ"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Тип цены"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Продажи и закупки"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Генерировать черновики счетов при получении"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Notes"
-#~ msgstr "Примечания"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Партнер по доставке"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Ошибка: Неправильный штрих-код"
-
-#~ msgid "Cancel"
-#~ msgstr "Отмена"
-
-#~ msgid "Delivery method"
-#~ msgstr "Метод доставки"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "НДС выглядит неправильно"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-#~ "категориям."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Разделяемая строка поставки"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Разделение поставки и перевозчика"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию."
-
-#~ msgid "ID"
-#~ msgstr "Идентификатор"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Добавить стоимость доставки"
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Фактурирование по упаковке"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Перевозчики и поставки"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Заполните это поле, если вы планируете счет доставки основанный на упаковке."
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Позволяет добавить методы доставки в заказы на продажу и упаковку. Вы можете "
-#~ "определить своего собственного перевозчика и выполнить разделение поставка "
-#~ "для определения стоимости. При создании счета-фактуры на основании упаковки, "
-#~ "Open ERP имеет возможность добавлять и вычислить строки доставки."
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Этот метод доставки должен использоваться при фактурировании на основании "
-#~ "данных упаковки."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Перевозчик %s (ID: %d) не имеет доставочной сетки!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Нет каталога !"
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Состояние заказа должно быть \"Черновик\" для добавления позиций доставки."
 
-#~ msgid "_Cancel"
-#~ msgstr "_Отмена"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Партнёр оказывающий услуги доставки."
 
-#~ msgid "Make Delievery"
-#~ msgstr "Сделать доставку"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Этот способ доставки будет использоваться при выставление счета по "
+"комплектованию."
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Внимание"
-
-#~ msgid "Weights"
-#~ msgstr "Вес"
-
-#~ msgid "_Apply"
-#~ msgstr "_Применить"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Создать доставки"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Заказ на доставку"
-
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Вы должны назначить партию изделий для данной ТМЦ"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Ссылка на заказ должна быть уникальной !"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Прайс лист на доставку позволяет вычислить стоимость и продажную цену "
-#~ "доставки в зависимости от веса продукции и других критериев. Вы можете "
-#~ "задать несколько прайс листов на один способ доставки, по странам или зонам "
-#~ "в конкретной стране, определяемым по диапазонам почтовых индексов ."
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Стоимость доставки"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Создание и управление способами доставки, необходимыми для вашей торговой "
-#~ "деятельности. Каждый способ доставки может быть отнесены к прайс-листу, "
-#~ "который вычисляет цену доставки в соответствии с реализованной или "
-#~ "доставленной продукцией."
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Почтовый индекс получателя"
 
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Транспортная компания"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "Ни одна строка не совпала с этим порядком в выбранных доставочных сетках!"
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Позволяет добавить методы доставки в заказы на продажу и комплектацию.\n"
-#~ "     Можно определить собственные сетки цен доставки и перевозки.\n"
-#~ "     При создании счетов по комплектации, OpenERP может добавить и вычислить "
-#~ "строку доставки.\n"
-#~ "\n"
-#~ "     "
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Единица измерения"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Определение способов доставки"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Единица измерения (единица измерения) это единица измерения веса"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Настройка политики комплектования"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Единица измерения веса"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Политика комплектования"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Переменная"
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Ссылка должна быть уникальна для каждой компании!"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Переменный фактор"
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Объем"
 
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Выберите политику комплектования по умолчанию"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Вес"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Вес * объем"
 
-#~ msgid "Apply"
-#~ msgstr "Применить"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Свойства доставок"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Индекс"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Нет строки подходящей этому товару или заказу в выбранной доставочной сетке!"
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Определите ваши способы доставки и их расценки. Стоимости доставки могут "
-#~ "быть добавлены в форме ввода заказа продажи или в счёте, основанном на "
-#~ "заказах доставки."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Вы пытаетесь назначить партию состоящую из другой продукции"
-
-#~ msgid "Free If More Than"
-#~ msgstr "Бесплатно , если больше чем"
-
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Определите способы доставки используемые вами и их расценки в порядке "
-#~ "пересчёта затрат доставки, когда вы делаете выставление счёта основанное на "
-#~ "заказах доставки"
-
-#~ msgid "Deliver each product when available"
-#~ msgstr "Доставка каждого товара по готовности."
-
-#~ msgid "Deliver all products at once"
-#~ msgstr "Доставка всех товаров за раз"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 5fa36be1cae..73a3dcb5900 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Slovenian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-10-30 11:55+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Sklic naročila"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Dostava po pošti"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " v vlogi "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Cilj"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Neto teža"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Dostavna pot"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Enota mere"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Dostavne mreže"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Prostornina"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Pošta"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "pot"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Partner, ki izvaja dostavo."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Dobavnica"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Nobena pot se ne ujema s tem proizvodom ali naročilom v izbrani dostavni "
-"mreži."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Odpreme za fakturiranje"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Napredno določanje cen"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Poda zaporedje naročila pri izpisu liste dostavne mreže."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Države"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -145,111 +51,146 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Dostavni nalog:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Spremenljivi faktor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Znesek"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivno"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Dodaj v kvoti"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Stalno"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Napredno določanje cen"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Način dostave"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Napredno določanje cen po destinacijah"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Cena ni na voljo!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Znesek"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Premik zaloge"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+"Znesek naročila za pridobitev brezplačne dostave, izražen v valuti podjetja"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Prevoznikova referenca sledenja"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Neto teža"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Nosilec"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Mrežne črte"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definiranje mreže"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Prevoznikova referenca sledenja"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Opozorilo!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Označite to polje, če želite upravljati cene dobave v odvisnosti od "
+"razdalje, teže, skupnega zneska naročila itd."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operater"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Izpolnite to polje, če načrtujete fakturiranje dobave na osnovi odpremnic."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Pogoj"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Prodajni nalog"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Lastna cena"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Dostavni nalogi"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Države"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Če ne dodate v kvoti, bo točna cena izračunana na v trenutku fakturiranja na "
-"osnovi dobavnic."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportno podjetje"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Privzeta cena"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -257,36 +198,61 @@ msgid "Delivery Grid"
 msgstr "Dostavna mreža"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Zaračunano"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Dostavna pot"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Prevzemnica"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne mreže"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Ime"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Način dostave"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Če je naročilo večje vrednosti kot določen znesek, lahko kupec pridobi z "
-"brezplačno dostavo"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Načini dostave"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
-"Znesek naročila za pridobitev brezplačne dostave, izražen v valuti podjetja"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cenik dostave"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Dostavni proizvod"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Dostava po pošti"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Cilj"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Stalno"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -294,39 +260,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Brezplačno, če skupni znesek naročila presega"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Mreža"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Brezplačno, če je več kot %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Če je aktivno polje označeno kot Napačno, bo dovoljeno skriti dostavno mrežo "
-"brez brisanja le te."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "do poštbe številke"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Privzeta cena"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Poda zaporedje naročila pri izpisu liste dostavne mreže."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normalna cena"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Mreža"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum naročila"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "pot"
+
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Mrežne črte"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -334,135 +302,85 @@ msgid "Grid Name"
 msgstr "Ime mreže"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Število paketov"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definiranje mreže"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Teža"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "Oznaka"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Označite to polje, če želite upravljati cene dobave v odvisnosti od "
-"razdalje, teže, skupnega zneska naročila itd."
+"Če je aktivno polje označeno kot Napačno, boste lahko skrili prevoznika, ne "
+"da ga izbrišete."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Pusti prazno, če je določanje cene odvisno od naprednega določanja cen po "
-"destinacijah"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nobena mreža ni na voljo!"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Naročilo ni v statusu \"Osnutek\"!"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Sklop"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivno"
+"Če je aktivno polje označeno kot Napačno, bo dovoljeno skriti dostavno mrežo "
+"brez brisanja le te."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum dostave"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Če je naročilo večje vrednosti kot določen znesek, lahko kupec pridobi z "
+"brezplačno dostavo"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Dostavni proizvod"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Če ne dodate v kvoti, bo točna cena izračunana na v trenutku fakturiranja na "
+"osnovi dobavnic."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Pogoj"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Lastna cena"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Spremenljivka"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Pusti prazno, če je določanje cene odvisno od naprednega določanja cen po "
+"destinacijah"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Ta dostavna metoda bo uporabljena pri fakturiranju na osnovi odpreme."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite za določitev nove dostavne metode. \n"
-"              </p><p>\n"
-"               Vsak prevoznik (npr. UPS) ima lahko več dostavnih metod "
-"(npr.\n"
-"                UPS Express, UPS Standard) s setom cenovnih pravil, ki "
-"veljajo\n"
-"                za izbrano metodo.\n"
-"              </p><p>\n"
-"                Te metode vam omogočajo avtomatični izračun cene dostave\n"
-"                glede na nastavitve; na prodajnih nalogih (osnovanih na\n"
-"                ponudbah) ali na računu (osnovanem na prodajnem nalogu).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -470,62 +388,67 @@ msgid "Maximum Value"
 msgstr "Največja vrednost"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Količina"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Ime"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Zažetna poštna številka"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Neto teža"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Izpolnite to polje, če načrtujete fakturiranje dobave na osnovi odpremnic."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Neto teža"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Brezplačno, če je več kot %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Prihajajoče pošiljke"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normalna cena"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Enota mere za težo"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Število paketov"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operater"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Če je aktivno polje označeno kot Napačno, boste lahko skrili prevoznika, ne "
-"da ga izbrišete."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cenik dostave"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Prevzemnica"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Odpreme za fakturiranje"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -535,85 +458,110 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Za tega prevoznika ni določena mreža!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Vrsta cene"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostava"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "Cenovna informacija"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Teža * prostornina"
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajna cena"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Prevoznik %s (id:  %d) nima dostavne mreže!"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "Cenovna informacija"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Napredno določanje cen po destinacijah"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Zažetna poštna številka"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Nosilec"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Pokrajine"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Načini dostave"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Premik zaloge"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Prevoznik %s (id:  %d) nima dostavne mreže!"
+
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "Status naročila mora biti \"Osnutek\", če želite dodati postavke."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Dostavne mreže"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Partner, ki izvaja dostavo."
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Zaporedje"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Ta dostavna metoda bo uporabljena pri fakturiranju na osnovi odpreme."
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodajna cena"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "do poštbe številke"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Izpiši dobavnico"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportno podjetje"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Pokrajine"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Enota mere"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -622,62 +570,62 @@ msgid ""
 msgstr "Enota mere je enota mere za težo."
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Vrsta cene"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodaja in nabava"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
-
-#~ msgid "Notes"
-#~ msgstr "Opombe"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Napaka: neveljavna EAN črtna koda"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Enota mere za težo"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Spremenljivka"
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Opozorilo"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Spremenljivi faktor"
 
-#~ msgid "Cancel"
-#~ msgstr "Prekliči"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Prostornina"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Ni razpoložljive cene!"
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+msgid "Warning!"
+msgstr "Opozorilo!"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Teža"
 
-#~ msgid "Delivery Costs"
-#~ msgstr "Stroški dostave"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Teža * prostornina"
 
-#~ msgid "ID"
-#~ msgstr "Oznaka"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Delivery method"
-#~ msgstr "Način dostave"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Pošta"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Napaka pri obračunu DDV"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index 1f8b1e34b3a..c41c858bff0 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.po
@@ -1,161 +1,196 @@
 # Albanian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-02 14:37+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:05+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:04+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,422 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 97f06fc55aa..0ec515d8315 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -1,162 +1,199 @@
 # Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-02 07:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref Zahteva"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Isporuka Postom"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Odredište"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Neto Tezina"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Linija Isporuke"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Dostavne mreže"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Zapremina"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linija Mreze"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Prevoznik"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Zahtev Isporuke"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref Pracenje prevoznika"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Izbor za fakturisanje"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Kompletiraj ovo polje ako planiras da fakturises prevoz baziran na izbornoj "
+"listi."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Uslov"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Daje redosled sekvenci pri prikazu linija liste isporuke"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena koštanja"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Zemlje"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Zahtev za Dostavu :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Varijabilni Faktor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Dostavna Mreža"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fiksno"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Linija Isporuke"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne Mreže"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,121 +203,111 @@ msgid "Delivery Method"
 msgstr "Načini isporuke"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Premesti skladiste"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref Pracenje prevoznika"
-
-#. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Netto Tezina"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cenovnik Dostave"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linije Mreže"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Proizvod za Isporuku"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definicija mreže"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Isporuka Postom"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Odredište"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Dostavna Mreža"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Daje redosled sekvenci pri prikazu linija liste isporuke"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturisano za"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Mreža"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Izborna Lista"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linija Mreze"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Ime"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linije Mreže"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Naziv Mreže"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definicija mreže"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Mreža"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -290,55 +317,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Na Pošt. Broj"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum Zahteva"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Naziv Mreže"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Broj Paketa"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Težina"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,170 +347,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nema dostupnih linija"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Zahtev nije u 'U pripremi' !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimalna Vrednost"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Serija"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Ime"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netto Tezina"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum prevoza"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Neto Tezina"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Proizvod za Isporuku"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Uslov"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena koštanja"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Promjenljiva"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Broj Paketa"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maksimalna Vrednost"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Kolicina"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna Lista"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Pst.Br Polaska"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Izbor za fakturisanje"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Kompletiraj ovo polje ako planiras da fakturises prevoz baziran na izbornoj "
-"listi."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Vrsta Cene"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Kolicina"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajna Cijena"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cenovnik Dostave"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Cena"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nijedna linija ne odgovara ovom prevozniku"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Pst.Br Polaska"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostava"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stanja"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Težina * Zapremina"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Premesti skladiste"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -520,63 +503,43 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
+"Stanje Zahteva treba biti na ' U Pripremi' da bi dodao linije dostave."
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Prevoznik"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na Pošt. Broj"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
-"Stanje Zahteva treba biti na ' U Pripremi' da bi dodao linije dostave."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Dostavne Mreže"
-
-#. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodajna Cijena"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Stanja"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -585,143 +548,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Vrsta Cene"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodaja & Nabavka"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Ovaj će način isporuke biti korišten kada se Račun radi kod Pakovanja."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Greška ! Ne možete da kreirate rekurivne povezane članove."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Prijemna Linija mreze"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generiraj Nacrte Računa pri prijemu"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Svojstva Dostave"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Mreža Prijevoza i Isporuka"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
-
-#~ msgid "Notes"
-#~ msgstr "Napomene"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Omogućuje Vam da dodate načine isporuke Prodajnim narudžbama i pakovanjima. "
-#~ "Možete odrediti vlastitog prijevoznika i cenovnike mreže isporuke. Kada se "
-#~ "Računi kreiraju kod preuzimanja, Open ERP može dodati i izračunati način i "
-#~ "troškove otpreme."
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Dodaj Troškove Dostave"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner Prijevoznik"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Prijevoznici i Isporuke"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Greška: Neispravan EAN kod"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Troškovi Dostave"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Popunite ovo polje ako planirate Robu koju saljete fakturirati na bazi "
-#~ "Pakovanja."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Pakovanje za koje treba izdati račun"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Delivery method"
-#~ msgstr "Način dostave"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Promjenljiva"
 
-#~ msgid "Cancel"
-#~ msgstr "Otkaži"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Varijabilni Faktor"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "PDV nije ispravan."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Zapremina"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Cena NIje dostupna !"
+msgid "Warning!"
+msgstr ""
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "ni jedna linija iz zahteva se ne poklapa sa izabranim linijama dostave"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Težina"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Težina * Zapremina"
 
-#~ msgid "Make Delievery"
-#~ msgstr "Uradi Ispodruku"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "_Cancel"
-#~ msgstr "_Otkazi"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "Upozorenje"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Omogucava ti da dodas metode dostave u prodajnim zahtevima i izboru.\n"
-#~ "     Mozes definisati svoju posebnu dostavu i linije dostave za razne cene.\n"
-#~ "     Kada keiras fakture po izbornoj listi, OPenERP moze da doda i izracuna "
-#~ "dostavnu liniju.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Weights"
-#~ msgstr "Tezine"
-
-#~ msgid "_Apply"
-#~ msgstr "_Prihvati"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Kreiraj Dostavu"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index f463312c86b..35ec3786cf9 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.po
@@ -1,162 +1,199 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Serbian Latin translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-23 16:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian Latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:07+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref Zahteva"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Isporuka Poštom"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Odredište"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Neto Tezina"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Linija Isporuke"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Dostavne mreže"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Zapremina"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Linija Mreze"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Prevoznik"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Zahtev Isporuke"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Ref Pracenje prevoznika"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Izbor za fakturisanje"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Kompletiraj ovo polje ako planiras da fakturises prevoz baziran na izbornoj "
+"listi."
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Uslov"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Daje redosled sekvenci pri prikazu linija liste isporuke"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena koštanja"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Zemlje"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Zahtev za Dostavu :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Varijabilni Faktor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr ""
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Dostavna Mreža"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fiksno"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Linija Isporuke"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne Mreže"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -166,121 +203,111 @@ msgid "Delivery Method"
 msgstr "Načini isporuke"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Premesti skladiste"
-
-#. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Ref Pracenje prevoznika"
-
-#. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Netto Tezina"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cenovnik Dostave"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Linije Mreže"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Proizvod za Isporuku"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Definicija mreže"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Isporuka Poštom"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operator"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Odredište"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fiksno"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "Dostavna Mreža"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Daje redosled sekvenci pri prikazu linija liste isporuke"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturisano za"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Mreža"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Izborna Lista"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linija Mreze"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Ime"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Linije Mreže"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Naziv Mreže"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Definicija mreže"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Mreža"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -290,55 +317,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Na Pošt. Broj"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum Zahteva"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Naziv Mreže"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Broj Paketa"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Težina"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -348,170 +347,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Nema dostupnih linija"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Zahtev nije u 'U pripremi' !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimalna Vrednost"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Serija"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Ime"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Netto Tezina"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum prevoza"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Neto Tezina"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Proizvod za Isporuku"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Uslov"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Cena koštanja"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Promjenljiva"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Broj Paketa"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Maksimalna Vrednost"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Partner"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Kolicina"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna Lista"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Pst.Br Polaska"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Izbor za fakturisanje"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Kompletiraj ovo polje ako planiras da fakturises prevoz baziran na izbornoj "
-"listi."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Vrsta Cene"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Kolicina"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr ""
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajna Cijena"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Opis"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Cenovnik Dostave"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Cena"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Nijedna linija ne odgovara ovom prevozniku"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Pst.Br Polaska"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Dostava"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stanja"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Težina * Zapremina"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Premesti skladiste"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -520,63 +503,43 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr "Prevoznik %s (id: %d) nema liniju dostave!"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
+"Stanje Zahteva treba biti na ' U Pripremi' da bi dodao linije dostave."
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Prevoznik"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Metod dostave ce se koristiti kada fakturises iz izborne liste."
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr ""
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na Pošt. Broj"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
-"Stanje Zahteva treba biti na ' U Pripremi' da bi dodao linije dostave."
-
-#. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Dostavne Mreže"
-
-#. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Prodajna Cijena"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Stanja"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -585,149 +548,62 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Vrsta Cene"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Promjenljiva"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "Svojstva Dostave"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Varijabilni Faktor"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr ""
-#~ "ni jedna linija iz zahteva se ne poklapa sa izabranim linijama dostave"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Otkazi"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Uradi Ispodruku"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Omogucava ti da dodas metode dostave u prodajnim zahtevima i izboru.\n"
-#~ "     Mozes definisati svoju posebnu dostavu i linije dostave za razne cene.\n"
-#~ "     Kada keiras fakture po izbornoj listi, OPenERP moze da doda i izracuna "
-#~ "dostavnu liniju.\n"
-#~ "\n"
-#~ "     "
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Zapremina"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Upozorenje"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Greška: JU (jedinice usluga)  i JM moraju da budu u različitim kategorijama"
-
-#~ msgid "Weights"
-#~ msgstr "Tezine"
-
-#~ msgid "Delivery method"
-#~ msgstr "Način dostave"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Greška ! Ne možete da kreirate rekurivne povezane članove."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Partner Prijevoznik"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Prodaja & Nabavka"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "Kreiraj Dostavu"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Troškovi Dostave"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "_Apply"
-#~ msgstr "_Prihvati"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Prijevoznici i Isporuke"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Greška: Neispravan EAN kod"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr ""
-#~ "Ovaj će način isporuke biti korišten kada se Račun radi kod Pakovanja."
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Prijemna Linija mreze"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Generiraj Nacrte Računa pri prijemu"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Mreža Prijevoza i Isporuka"
-
-#~ msgid "Notes"
-#~ msgstr "Napomene"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr ""
-#~ "Omogućuje Vam da dodate načine isporuke Prodajnim narudžbama i pakovanjima. "
-#~ "Možete odrediti vlastitog prijevoznika i cenovnike mreže isporuke. Kada se "
-#~ "Računi kreiraju kod preuzimanja, Open ERP može dodati i izračunati način i "
-#~ "troškove otpreme."
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Dodaj Troškove Dostave"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr ""
-#~ "Popunite ovo polje ako planirate Robu koju saljete fakturirati na bazi "
-#~ "Pakovanja."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Pakovanje za koje treba izdati račun"
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Cancel"
-#~ msgstr "Otkaži"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Težina"
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "PDV nije ispravan."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Težina * Zapremina"
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Referenca narudžbine mora biti jedinstvena !"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Delivery Order"
-#~ msgstr "Nalog za isporuku"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Cena nije dostupna !"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 037186c167e..ed4b092d19b 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -1,120 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-24 09:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Order Ref."
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Leverans per post"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " är en funktion av "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Destination"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Nettovikt"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Leveransmatrisrad"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Måttenhet"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Leveransmatriser"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Volym"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "Postnummer"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Matrisrad"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Företaget gör själva leveransservicen."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Utgående Leverans"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Ingen rad matchade denna produkt eller order inom det valda "
-"leveranskombinationen."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Plockning att fakturera"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Avancerad prissättning"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Ger ordningsföljden när leveransen listas i rutnätet."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Länder"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -148,111 +54,146 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Utgående Leverans:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Variabel faktor"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Mängd"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktiv"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Lägg till på offert"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Fast"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Avancerad prissättning"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Leveransmetod"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Avancerad prissättning per destination"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Inget pris tillgängligt"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Mängd"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Lagertransaktion"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "Beloppsgräns för fri frakt i företagets valuta"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Spårnummer"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Nettovikt"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Speditör"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Matrisrader"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Matrisdefinition"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Spårnummer"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Varning!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Kryssa denna ruta om du vill administrera leveranspriser avhängigt "
+"destinationen, vikten eller ordertotalen etc."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operatör"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Komplettera detta fält om du planerar att fakturera frakten baserad på "
+"plocken."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Företag"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Villkor"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Kundorder"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Kostpris"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Utgående Leveranser"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Länder"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Om du inte \"Lägg i offert\", kommer det exakta priset beräknas vid "
-"fakturering baserad på leveransordern."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Transportföretag"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Standardpris"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Leverans"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -260,34 +201,61 @@ msgid "Delivery Grid"
 msgstr "Leveransmatris"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturamottagare"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Leveransmatrisrad"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Plocklista"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Leveransmatris"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Namn"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Leveransmetod"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Om ordervärdet överstiger ett visst belopp, kan kunden erhålla fri frakt"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Leveransmetoder"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr "Beloppsgräns för fri frakt i företagets valuta"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Leveransprislista"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Leveransprodukt"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Leverans per post"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Leveransmatriser"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Destination"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fast"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -295,39 +263,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Fritt vid ordertotal över"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Matris"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Fritt om det överstiger %.2f"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Om det aktuella fältet är falskt, kan du gömma leveranskombinationerna utan "
-"att radera dem."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Till postnummer"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Standardpris"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Ger ordningsföljden när leveransen listas i rutnätet."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normalpris"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Matris"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Matrisrad"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Orderdatum"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Matrisrader"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -335,134 +305,82 @@ msgid "Grid Name"
 msgstr "Matrisnamn"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Antal paket"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Matrisdefinition"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Vikt"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Kryssa denna ruta om du vill administrera leveranspriser avhängigt "
-"destinationen, vikten eller ordertotalen etc."
+"Om det aktiva fältet är falskt, så kan du gömma transportör utan att radera."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Håll tomt om prissättningen beror på avancerad prissättning per destination"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Inget rutnär tillgängligt !"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Ordern inte preleminär !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Batch"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Aktiv"
+"Om det aktuella fältet är falskt, kan du gömma leveranskombinationerna utan "
+"att radera dem."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Leveransdatum"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Om ordervärdet överstiger ett visst belopp, kan kunden erhålla fri frakt"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Leveransprodukt"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Om du inte \"Lägg i offert\", kommer det exakta priset beräknas vid "
+"fakturering baserad på leveransordern."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Villkor"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Kostpris"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Variabel"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Håll tomt om prissättningen beror på avancerad prissättning per destination"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "Denna leveransmetod används då fakturering sker utifrån plockningen."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                 Klicka för att definiera en ny leveransmetod.\n"
-"               </p>\n"
-"                 Varje transportör (t.ex. UPS) kan ha flera leveransmetoder "
-"(t.ex.\n"
-"                 UPS Express, UPS Standard) med en uppsättning av "
-"prissättningsregler knuten\n"
-"                 till varje metod.\n"
-"               </p><p>\n"
-"                 Dessa metoder gör det möjligt att automatiskt beräkna "
-"leveranspriset\n"
-"                 enligt dina inställningar; på kundordern (baserat på\n"
-"                 offert) eller faktura (baserat på leveransorder).\n"
-"               </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -470,330 +388,244 @@ msgid "Maximum Value"
 msgstr "Maximalt värde"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Antal"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Namn"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Från postnr"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Nettovikt"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Komplettera detta fält om du planerar att fakturera frakten baserad på "
-"plocken."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Nettovikt"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Fritt om det överstiger %.2f"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Inkommande leveranser"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normalpris"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Viktsenhet"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Antal paket"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Beskrivning"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatör"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Om det aktiva fältet är falskt, så kan du gömma transportör utan att radera."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Leveransprislista"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Pris"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Företag"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Inget i rutnätet matchar denna transportör !"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Plocklista"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Leverans"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Plockning att fakturera"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Vikt * Volym"
+msgid "Price"
+msgstr "Pris"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Transportören %s (id: %d) saknar leveransrutnät!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Pristyp"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "Prisinformation"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Avancerad prissättning per destination"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Antal"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Speditör"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Försäljningspris"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Leveransmetoder"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Kundorder"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Orderstatus måste vara preleminär för att kunna lägga till leveransrader"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Leveransmatris"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Sekvens"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Försäljningspris"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Skriv ut leveransorder"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Från postnr"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Tillstånd"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Enhet är måttenheten för vikt"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Lagertransaktion"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Pristyp"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Notes"
-#~ msgstr "Anteckningar"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Skapa en preliminär faktura vid leverans"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Leveransuppgifter"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Lägg till leveranskostnad"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Leveranskostnad"
-
-#~ msgid "Delivery method"
-#~ msgstr "Leveransmetod"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Matrisens leveransrad"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Distributör- och leveransmatris"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "Momsen verkar vara fel"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "Pris saknas!"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Transportören %s (id: %d) saknar leveransrutnät!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Varning"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Skapa Leverans"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fel: Standardmåttenheten och inköpsmåttenheten måste vara i samma kategori."
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Försäljning och inköp"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Speditörsföretag"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Speditörer och leveranser"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Fel: felaktig EAN-kod"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Fel: Säljenhet måste tillhöra en annan kategori än standardenhet"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Utgående Leverans"
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Orderstatus måste vara preleminär för att kunna lägga till leveransrader"
 
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Med leveransprislistan kan du beräkna kostnaden och försäljningspris "
-#~ "leverans enligt vikten av produkter och andra kriterier. Du kan definiera "
-#~ "flera prislistor för ett leveranssätt per land eller ett område i ett visst "
-#~ "land som definieras av ett postnummerområde."
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Företaget gör själva leveransservicen."
 
-#~ msgid "_Cancel"
-#~ msgstr "_Avbryt"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "Denna leveransmetod används då fakturering sker utifrån plockningen."
 
-#~ msgid "Weights"
-#~ msgstr "Vikter"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Till postnummer"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Plockpolicy"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Transportföretag"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Antal rader som matchar produkt eller order i vald leveranskombination."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Ange dina leveransmetoder och deras prissättning. Leveranskostnaderna kan "
-#~ "läggas på direkt i försäljningsformuläret eller vid fakturering, baserat på "
-#~ "leveransorder."
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "Du kan inte flytta produkter från eller till en lokal av typen visa."
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Välj din standard plockpolicy"
-
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
-
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Definiera leveransmetoder"
-
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Ställ in din plockpolicy"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Orderreferensen måste vara unik per bolag!"
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referensen måste vara unik per bolag!"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Måttenhet"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Enhet är måttenheten för vikt"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Leverera alla produkter vid samma tillfälle"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Viktsenhet"
 
-#~ msgid "Free If More Than"
-#~ msgstr "Fritt om det överstiger"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Variabel"
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Du måste tilldela ett produktionsparti för denna produkt"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Variabel faktor"
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Registrera leveranser"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Volym"
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Definiera leveransmetoder du använder och prissättningen för att "
-#~ "återfakturera faktiska leveranskostnader när du fakturerar baserat på "
-#~ "leveransorder"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Varning!"
 
-#~ msgid "ID"
-#~ msgstr "ID"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Vikt"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Vikt * Volym"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Leverera varje produkt när den är tillgänglig"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Apply"
-#~ msgstr "Verkställ"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "Postnummer"
 
-#~ msgid "_Apply"
-#~ msgstr "_Verkställ"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/th.po b/addons/delivery/i18n/th.po
index 905ef9ab6a8..372ee20438a 100644
--- a/addons/delivery/i18n/th.po
+++ b/addons/delivery/i18n/th.po
@@ -1,161 +1,196 @@
 # Thai translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-17 07:15+0000\n"
-"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "อ้างอิงการสั่งซื้อ"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "จัดส่งทางไปรษณีย์"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "ปลายทาง"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "น้ำหนักสุทธิ"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "ระดับเสียง"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "ใบส่งสินค้า"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "ประเทศ"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "ใบส่งสินค้า :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,120 +201,110 @@ msgid "Delivery Method"
 msgstr "วิธีการจัดส่งสินค้า"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "ย้ายสต็อก"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "น้ำหนักสุทธิ"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "จัดส่งทางไปรษณีย์"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "ปลายทาง"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "พาร์ทเนอร์"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "ใบสั่งขาย"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "ออกใบแจ้งหนี้ไปที่"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "ใบรายการรับ/จ่ายสินค้า"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
@@ -290,308 +315,292 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr ""
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "น้ำหนักสุทธิ"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ""
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "น้ำหนักสุทธิ"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Order not in draft state !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr ""
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "พาร์ทเนอร์"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "ใบรายการรับ/จ่ายสินค้า"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
 msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "ใบสั่งขาย"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr ""
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "ย้ายสต็อก"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr ""
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "ระดับเสียง"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
-
-#~ msgid "Delivery Order"
-#~ msgstr "ใบส่งสินค้า"
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "คำเตือน"
-
-#~ msgid "Make Delievery"
-#~ msgstr "ทำการจัดส่ง"
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index f1dd0f28fb5..1d691ba7a9f 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -1,160 +1,196 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Klingon translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Klingon <tlh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -165,422 +201,406 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,active:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "No grid available !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
 msgstr ""
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 8ee1111c2b2..d077cec9089 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -1,119 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* delivery
+# Turkish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-09 21:54+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "Sipariş Ref."
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "Postayla Teslim"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " bu İşlevde "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Varış yeri"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "Net ağırlık"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "Teslimat Tablo Satırı"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "Ölçü Birimi"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Teslimat tablosu"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Hacim"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "PKodu"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Tablo Satırı"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "Teslimat hizmetini veren iş ortağı."
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "Teslim emri"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
-"Seçilen teslimat tablosunda bu ürün ya da siparişle eşleşen kalem yok."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "Faturalanacak toplama"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "Gelişmiş Fiyatlandırma"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "Bir teslimat tablsunu görüntülerken diziliş sırasını verir."
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "Ülkeler"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -147,111 +54,148 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Teslim Emri:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Değişken Faktör"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "Tutar"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Etkin"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "Teklife Ekle"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Sabit"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "Gelişmiş Fiyatlandırma"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "Teslimat Yöntemi"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "Adrese göre Peşin Fiyatlandırma"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "Hiç fiyat yok!"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "Tutar"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "Stok Hareketi"
+#: help:delivery.carrier,amount:0
+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 "
+"belirtilmiştir."
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "Nakliyeci İzleme Ref"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "Net Ağırlık"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Nakliyeci"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Tablo Satırları"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Tablo tanımı"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "Nakliyeci İzleme Ref"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "Uyarı!"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+"Teslimat fiyatlarını varış yerine, ağırlığa, sipariş toplamına, v.s. göre "
+"yönetmek istiyorsanız bu kutuyu işaretleyin."
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Operatör"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+"Sevkiyatı toplamaya göre faturalandırmayı planlıyorsanız, bu alanı "
+"tamamlayın."
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "İş Ortağı"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Koşul"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "Satış Siparişi"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Maliyet Fiyatı"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Teslimat Emirleri"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Ülkeler"
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
-"Eğer 'Teklife Ekle'me yapmazsanız, gerçek fiyat teslim emirlerine göre "
-"faturalama yaparken hesaplanacaktır."
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "Nakliye Firması"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "Varsayılan Fiyat"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Teslimat"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -259,37 +203,61 @@ msgid "Delivery Grid"
 msgstr "Teslimat Tablosu"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fatura Adresi"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "Teslimat Tablo Satırı"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "Toplama Listesi"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Teslimat Tabloları"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Adı"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "Teslimat Yöntemi"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
-"Eğer sipariş belirli bir tutarın üzerinde ise, müşteri bedelsiz teslimattan "
-"faydalanabilir"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "Teslimat Yöntemleri"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-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 "
-"belirtilmiştir."
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Teslimat Fiyat Listesi"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Teslimat Ürünü"
+
+#. module: delivery
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "Postayla Teslim"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Teslimat tablosu"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "İstikamet"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Sabit"
 
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
@@ -297,39 +265,41 @@ msgid "Free If Order Total Amount Is More Than"
 msgstr "Sipariş Toplam Tutarı Bundan Fazlaysa Bedelsizdir"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Tablo"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "Eğer %.2f den fazla ise ücretsiz"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
-"Aktif alanı Yanlış olarak ayarlaysa, teslimat tablosunu silmeden "
-"gizleyebilirsiniz."
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "Sıkıştırılacak"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "Varsayılan Fiyat"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "Bir teslimat tablsunu görüntülerken diziliş sırasını verir."
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "Normal Fiyat"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Tablo"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Tablo Satırı"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "Sipariş Tarihi"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Tablo Satırları"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -337,480 +307,331 @@ msgid "Grid Name"
 msgstr "Tablo Adı"
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "Paket Sayısı"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Tablo tanımı"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Ağırlık"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "No"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
-"Teslimat fiyatlarını varış yerine, ağırlığa, sipariş toplamına, v.s. göre "
-"yönetmek istiyorsanız bu kutuyu işaretleyin."
+"Etkin alan Yanlış olarak ayarlıysa, nakliyeciyi silmeden gizleyebilirsiniz."
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
+#: help:delivery.grid,active:0
 msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
 msgstr ""
-"Fiyatlandırmayı her varış yeri için peşin fiyatlandırmaya göre yapacaksanız "
-"boş bırakın"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "Hiçbir tablo yok!"
-
-#. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "Sipariş taslak durumunda değil !"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "Parti"
-
-#. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Etkin"
+"Aktif alanı Yanlış olarak ayarlaysa, teslimat tablosunu silmeden "
+"gizleyebilirsiniz."
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Sevkiyat Tarihi"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+"Eğer sipariş belirli bir tutarın üzerinde ise, müşteri bedelsiz teslimattan "
+"faydalanabilir"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "Teslimat Ürünü"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr ""
+"Eğer 'Teklife Ekle'me yapmazsanız, gerçek fiyat teslim emirlerine göre "
+"faturalama yaparken hesaplanacaktır."
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Koşul"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Maliyet Fiyatı"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Değişken"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+"Fiyatlandırmayı her varış yeri için peşin fiyatlandırmaya göre yapacaksanız "
+"boş bırakın"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Bu teslimat yöntemi, toplama üzerinden faturalandırma yaparken "
-"kullanılacaktır."
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Yeni bir teslimat yöntemi tanımlamak için tıklayın. \n"
-"              </p><p>\n"
-"                Her nakliyecinin (örn. UPS) her yönteme ekli fiyatlandırma "
-"kuralları ile \n"
-"                birçok teslimat yöntemi olabilir (örn.UPS Ekspres, UPS "
-"Standart).\n"
-"              </p><p>\n"
-"                Bu yöntemler ayarlamalarınıza göre kendiliğinden teslimat\n"
-"                fiyatlarını hesaplar; satış siparişlerinde (tekliflere "
-"göre)\n"
-"                ya da faturalarda (teslimat emirlerine göre).\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
-msgstr "Ençok Değer"
+msgstr "En Çok Değer"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "Miktar"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Adı"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Sıkıştırmayı Başlat"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "Net Ağırlık"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
-"Sevkiyatı toplamaya göre faturalandırmayı planlıyorsanız, bu alanı "
-"tamamlayın."
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "Net Ağırlık"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "Eğer %.2f den fazla ise ücretsiz"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "Gelen Sevkiyatlar"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "Normal Fiyat"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "Ağırlık ölçü birimi"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "Paket Sayısı"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "Açıklama"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operatör"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
-"Etkin alan Yanlış olarak ayarlıysa, nakliyeciyi silmeden gizleyebilirsiniz."
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Teslimat Fiyat Listesi"
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Fiyat"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "İş Ortağı"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "Bu nakliyeciyle eşleşen hiçbir tablo yoktur!"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Toplama Listesi"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Teslimat"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "Faturalanacak toplama"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Ağırlık * Hacim"
+msgid "Price"
+msgstr "Fiyat"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Nakliyeci %s (id: %d) teslimat tablosuna sahip değil!"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Fiyat Türü"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "Fiyat Bilgisi"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "Adrese göre Peşin Fiyatlandırma"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "Miktar"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Nakliyeci"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Satış Fiyatı"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "Teslimat Yöntemleri"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Satış Siparişi"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
-"Teslimat satırı eklemek için sipariş durumu taslak olarak ayarlanmalıdır."
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "Teslimat Tabloları"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "Sıra"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Satış Fiyatı"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "Teslimat Emri Yazdır"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Sıkıştırmayı Başlat"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "Durumu"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "Ölçü Birimi (Ölçü Birimi) Ağırlık ölçü birimidir"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "Stok Hareketi"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Fiyat Türü"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Alış & Satış Bilgileri"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Kabuldeki Tedarikçi Faturalarını Oluştur"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "Teslimat Grid Satırı"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "Teslimat Özellikleri"
-
-#~ msgid "Notes"
-#~ msgstr "Notlar"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "Teslimat Maliyeti Ekle"
-
-#~ msgid "ID"
-#~ msgstr "No"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "Nakliyeler ve Teslimatlar"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Nakliye Şirketi"
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "Faturalanacak Sevkiyat Paketi"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "Teslimat Maliyeti"
-
-#~ msgid "Cancel"
-#~ msgstr "İptal"
-
-#~ msgid "Delivery method"
-#~ msgstr "Teslimat Yöntemi"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "Sipariş referans no'su tek olmalı !"
-
-#~ msgid "Delivery Order"
-#~ msgstr "Teslim Emri"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Fiyat bulunamadı !"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "Uyarı"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr ""
-#~ "Satış aktiviteleri için gerekli teslim yöntemlerini oluştur ve yönet. Her "
-#~ "teslim yöntemi bir fiyat listesine yönlendirilir ve bu da satılan ya da "
-#~ "teslim edilen ürünün teslimat fiyatının hesaplanmasını sağlar."
-
-#~ msgid "_Cancel"
-#~ msgstr "_İptal"
-
-#~ msgid "Make Delievery"
-#~ msgstr "Teslimatı Gerçekleştir"
-
-#~ msgid "Weights"
-#~ msgstr "Ağırlığı"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "_Apply"
-#~ msgstr "_Uygula"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr ""
-#~ "Teslimat fiyat listesi, ürünün ağırlığı ve diğer kriterlere göre teslimatın "
-#~ "satış fiyatı ve maliyetini hesaplamanızı sağlar. Bir teslimat yöntemi için, "
-#~ "ülke ya da belirli bir ülkedeki posta kodu aralığıyla belirlenen bölgeye "
-#~ "göre birden fazla fiyat listesi tanımlayabilirsiniz."
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "Nakliyeci %s (id: %d) teslimat tablosuna sahip değil!"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "Seçilen teslimat gridlerinde bu siparişle eşleşen hiçbir satır yok!"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "Alım veya satış siparişlerine teslimat yöntemi eklemenizi sağlar.\n"
-#~ "     Fiyatlar için kendi nakliyeci veya teslimat gridlerinizi "
-#~ "tanımlayabilirsiniz.\n"
-#~ "     Alımdan fatura oluştururken, OpenERP sevkiyat satırı ekleyip "
-#~ "hesaplayabilir.\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "Hata! Üyelere ilişkin yineleme oluşturamazsınız."
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+"Teslimat satırı eklemek için sipariş durumu taslak olarak ayarlanmalıdır."
 
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "Aynı üründen olmayan bir lot atamaya çalışıyorsunuz"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "Teslimat hizmetini veren iş ortağı."
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "Bu ürün için bir üretim lotu oluşturmanız gerekir"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+"Bu teslimat yöntemi, toplama üzerinden faturalandırma yaparken "
+"kullanılacaktır."
 
-#~ msgid "Create Deliveries"
-#~ msgstr "Teslimat Oluştur"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Sıkıştırılacak"
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "Referans her şirket için tekil olmalı!"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "Nakliye Firması"
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "Her ürün hazır olduğunda teslim et"
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "Apply"
-#~ msgstr "Uygula"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "Ölçü Birimi"
 
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "Ölçü Birimi (Ölçü Birimi) Ağırlık ölçü birimidir"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "Teslimat Yöntemini Tanımla"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "Ağırlık ölçü birimi"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "Tüm ürünleri tek seferde teslim et"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Değişken"
 
-#~ msgid "Free If More Than"
-#~ msgstr "Ücretsiz Eğer fazlaysa"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Değişken Faktörü"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Hacim"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "Uyarı!"
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Ağırlık"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "Teslimat kurallarınızı Ayarlayın"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Ağırlık * Hacim"
 
-#~ msgid "Picking Policy"
-#~ msgstr "Teslimat Kuralları"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr ""
-#~ "Faturalandırmayı sipariş teslimatlarına dayanarak yapıyorsanız, teslimatlar "
-#~ "faturalarını yeniden faturalandırmak için kullandığınız teslimat "
-#~ "yöntemlerini ve fiyatlandırmasını tanımlayın."
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "PKodu"
 
-#, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr ""
-#~ "Seçilen teslimat çizelgesinde hiçbir kalem bu ürün ya da siparişle eşleşmedi."
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr ""
-#~ "Teslim yöntemlerini ve fiyatlandırmalarını tanımlayın. Teslim maliyetleri "
-#~ "sipariş teslimatlarına dayanılarak satış sipariş formuna ve faturaya "
-#~ "eklenebilir."
-
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "Varsayılan Toplama İlkenizi seçin"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 4767e71bda9..748856d2d5f 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Ukrainian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 12:25+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "Напрямок"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Активний"
+
+#. module: delivery
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "Сітки доставки"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "Об'єм"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "Лінія сітки"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "Перевізник"
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "Умова"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "Країни"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "Змінний фактор"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr ""
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Доставка"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "План Доставок"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "Фіксована"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,123 +201,113 @@ msgid "Delivery Method"
 msgstr "Метод доставки"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Прейскурант доставки"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "Рядки сітки"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "Визначення сітки"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "Сітки доставки"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "Напрямок"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "Оператор"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Фіксована"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "План Доставок"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Сітка"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Лінія сітки"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr ""
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "Рядки сітки"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "Назва"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Назва сітки"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr ""
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "Визначення сітки"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "Сітка"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -289,226 +315,184 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "До"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "Назва сітки"
-
-#. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "Вага"
-
-#. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
+#: help:delivery.carrier,normal_price:0
 msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Макс. значення"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr ""
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Назва"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "Активний"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "Умова"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "Змінна"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Оператор"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "Макс. значення"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "Від"
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Ціна"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Тип ціни"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
+#: code:addons/delivery/delivery.py:237
+#, python-format
 msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Прейскурант доставки"
-
-#. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Ціна"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "Послідовність"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr ""
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Від"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "Доставка"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Стани"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "Вага * Об'єм"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -517,108 +501,106 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "Перевізник"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr ""
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "До"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "Послідовність"
-
-#. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "Стани"
-
-#. module: delivery
 #: help:stock.move,weight_uom_id:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Тип ціни"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "Збут та постачання"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
 
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "Зформувати Чорнові Інвойси по Отриманнях"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Змінна"
 
-#~ msgid "Delivery line of grid"
-#~ msgstr "Рядок доставки у сітці"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Змінний фактор"
 
-#~ msgid "="
-#~ msgstr "="
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Об'єм"
 
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "Сітки перевізників і доставки"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr ""
 
-#~ msgid "Notes"
-#~ msgstr "Примітки"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "Вага"
 
-#~ msgid "Carrier Partner"
-#~ msgstr "Партнер Перевізник"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Вага * Об'єм"
 
-#~ msgid "Cancel"
-#~ msgstr "Скасувати"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Delivery method"
-#~ msgstr "Спосіб доставки"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr ""
 
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "ПДВ здається некоректним"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index d46ec12f55c..3cda92f86ca 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -1,161 +1,196 @@
 # Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:17+0000\n"
-"Last-Translator: OpenBMS JSC <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
+#: selection:delivery.grid.line,operator:0
+msgid "<="
 msgstr ""
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
 msgstr ""
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
+#: field:delivery.carrier,available:0
+msgid "Available"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Giá Vốn"
+
+#. module: delivery
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
 msgstr ""
 
 #. module: delivery
@@ -166,120 +201,110 @@ msgid "Delivery Method"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr ""
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Bảng giá Giao hàng"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "Đối tác"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
 msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
@@ -290,308 +315,292 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
+#: field:delivery.grid.line,name:0
+msgid "Name"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
+#: field:stock.move,weight_net:0
+msgid "Net weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Order not in draft state !"
+msgid "No Grid Available!"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "Giá Vốn"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "Đối tác"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
-msgstr ""
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Giá"
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Loại Giá"
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
 msgid "Quantity"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Giá Bán"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
 msgstr ""
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "Free if more than %.2f"
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
 msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
 msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: code:addons/delivery/stock.py:91
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "Bảng giá Giao hàng"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "Giá"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
 msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
+#: code:addons/delivery/delivery.py:237
 #, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
+msgid "Unable to fetch delivery method!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "Giá Bán"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr ""
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
 msgstr ""
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "Loại Giá"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Lỗi: mã EAN không hợp lệ"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "Đối tác Vận chuyển"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "Chưa có giá !"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 89d2bc143de..fc0cd691e4c 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -1,118 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-22 04:08+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "关联单号"
-
-#. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "由post送货"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
-msgstr " 在功能 "
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "目标库位"
-
-#. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "净重"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "送货网络明细"
-
-#. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "计量单位"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "送货网络"
-
-#. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "体积"
-
-#. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "邮政编码"
-
-#. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "网络明细"
-
-#. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "提供送货服务的业务伙伴"
-
-#. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "送货单"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
-msgstr "在选择运输网络里，没有一行匹配这个产品或者订单。"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "要开票的装箱单"
-
-#. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "固定价格"
-
-#. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "输入序列用于在送货网络列表上排序"
-
-#. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,country_ids:0
-msgid "Countries"
-msgstr "国家"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
@@ -140,109 +48,142 @@ msgstr ""
 "            "
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "送货单:"
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "变量系数"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "金额"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "生效"
 
 #. module: delivery
-#: view:sale.order:0
+#: view:sale.order:delivery.view_order_withcarrier_form
 msgid "Add in Quote"
 msgstr "添加引用"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "固定的"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "固定价格"
 
 #. module: delivery
-#: field:delivery.carrier,name:0
-#: field:res.partner,property_delivery_carrier:0
-#: field:sale.order,carrier_id:0
-msgid "Delivery Method"
-msgstr "送货方式"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "根据目的地定价"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "无可用价格！"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "金额"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "库存调拨"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "免费送货的订单金额，以公司本位币显示"
+
+#. module: delivery
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "承运方"
+
+#. module: delivery
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
 msgstr "承运方跟踪号"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "净重"
-
-#. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "网络明细"
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr "如果要根据目的地、重量、订单总价来管理运费，请勾选这里。"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "网络定义"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "如果你计划按装运按装箱开发票请输入此字段。"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "警告！"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "条件"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "运算符"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "成本价"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "业务伙伴"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "国家"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "销售订单"
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "送货单"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr "如果你没有“添加引用”，当基于送货单开票时，将计算精确的价格。"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "默认价格"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "物流公司"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "送货"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -250,198 +191,179 @@ msgid "Delivery Grid"
 msgstr "送货网络"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "开票到"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "送货网络明细"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "装箱单"
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "送货网络"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "名称"
+#: field:delivery.carrier,name:0
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "送货方式"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
-msgstr "如果订单金额高于某个特定金额，客户可以享受免费送货"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "运输方法"
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
-msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
-msgstr "免费送货的订单金额，以公司本位币显示"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "送货价格表"
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "当订单总额多于 时，免费"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "送货服务"
 
 #. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "网络"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "由post送货"
 
 #. module: delivery
-#: help:delivery.grid,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"grid without removing it."
-msgstr "如果生效字段为false，送货网络将隐藏而不是删除。"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "送货网络"
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "目的地邮编"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "目标库位"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "默认价格"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "固定的"
 
 #. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "默认价格"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "当订单总额多于 时，免费"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "单据日期"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "金额高于 %.2f 免费"
 
 #. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "网络名"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "包装件数"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "重量"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "输入序列用于在送货网络列表上排序"
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
-msgstr "如果要根据目的地、重量、订单总价来管理运费，请勾选这里。"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "网络"
 
 #. module: delivery
-#: help:delivery.carrier,normal_price:0
-msgid ""
-"Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr "默认的运费的价格，如果根据目的地定价，这里留空。"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "网络明细"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "没有可用的送货网络"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "网络明细"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "网络名"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "单据不在草稿状态！"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "网络定义"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "批次"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "生效"
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr "如果生效设为false，可以不必删除承运方就隐藏它。"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "装运日期"
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr "如果生效字段为false，送货网络将隐藏而不是删除。"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "送货服务"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr "如果订单金额高于某个特定金额，客户可以享受免费送货"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "条件"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr "如果你没有“添加引用”，当基于送货单开票时，将计算精确的价格。"
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "成本价"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "变量"
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
+msgstr ""
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr "这个送货方式会在基于送货单开发票的时候使用。"
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr "默认的运费的价格，如果根据目的地定价，这里留空。"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                单击以定义一个新的运输方法. \n"
-"              </p><p>\n"
-"                每个承运人 (例如 UPS)可以有几种带有不同定价方案的运输方法\n"
-"             （例如UPS Express, UPS Standard).\n"
-"              </p><p>\n"
-"                这些方法允许你根据你的设置自动计算运输价格：在订单上（基\n"
-"                于报价单）或者在发票上（基于发运单）.\n"
-"              </p>\n"
-"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -449,359 +371,243 @@ msgid "Maximum Value"
 msgstr "最大值"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "数量"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "名称"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "开始邮编"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "净重"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr "如果你计划按装运按装箱开发票请输入此字段。"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "净重"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
+#: code:addons/delivery/sale.py:75
 #, python-format
-msgid "Free if more than %.2f"
-msgstr "金额高于 %.2f 免费"
-
-#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "入库"
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "重量的计量单位"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "默认价格"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "说明"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "包装件数"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
-msgstr "如果生效设为false，可以不必删除承运方就隐藏它。"
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "运算符"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "送货价格表"
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "价格"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr "没有送货网络适用于此承运方"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "装箱单"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "送货"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "要开票的装箱单"
 
 #. module: delivery
+#: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "重量* 体积"
+msgid "Price"
+msgstr "价格"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:91
-#, python-format
-msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "承运方 %s (id: %d) 没有送货网络！"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "价格类型"
 
 #. module: delivery
-#: view:delivery.carrier:0
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
 msgid "Pricing Information"
 msgstr "价格信息"
 
 #. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "根据目的地定价"
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "数量"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "承运方"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "销售价格"
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "运输方法"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "The order state have to be draft to add delivery lines."
-msgstr "只能对草稿状态的订单增加送货明细"
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "送货网络"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
 msgid "Sequence"
 msgstr "序列"
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "销售价格"
-
-#. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "打印送货单"
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "开始邮编"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,state_ids:0
 msgid "States"
 msgstr "状态"
 
 #. module: delivery
-#: help:stock.move,weight_uom_id:0
-msgid ""
-"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr "计量单位 是测量重量的单位"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "库存调拨"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "价格类型"
-
+#: code:addons/delivery/stock.py:91
 #, python-format
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "承运业务伙伴"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
-#~ msgid "Deliveries Properties"
-#~ msgstr "送货属性"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "送货成本"
-
-#~ msgid "Notes"
-#~ msgstr "备注"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#~ msgid "Sales & Purchases"
-#~ msgstr "销售&采购"
-
-#~ msgid "Generate Draft Invoices On Receptions"
-#~ msgstr "在接收产生发票草稿"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "错误:销售单位必须和计量单位在不同的分类."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
-
-#~ msgid "Packing to be invoiced"
-#~ msgstr "包装要开发票"
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "错误:无效EAN编码"
-
-#~ msgid "The VAT doesn't seem to be correct."
-#~ msgstr "这增值税似乎不正确"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在动作定义中使用了无效的模快名。"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效的视图结构xml文件!"
-
-#~ msgid "Delivery line of grid"
-#~ msgstr "交货表格行"
-
-#~ msgid "Carrier and delivery grids"
-#~ msgstr "货运公司和交货表格"
-
-#~ msgid "ID"
-#~ msgstr "ID"
-
-#~ msgid "Add Delivery Costs"
-#~ msgstr "增加交货成本"
-
-#~ msgid ""
-#~ "Complete this field if you plan to invoice the shipping based on packing."
-#~ msgstr "如果你计划根据运输这包装开发票请完整填写这字段"
-
-#~ msgid "Delivery method"
-#~ msgstr "交货方式"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sales orders and packing. You can "
-#~ "define your own carrier and delivery grids for prices. When creating "
-#~ "invoices from picking, Open ERP is able to add and compute the shipping line."
-#~ msgstr "允许你在销售单和包装中增加交货方式. 你能定义自己的运输公司和交货表格的价格. 当创建包装发票时, 系统可以增加和计算运输明细"
-
-#~ msgid "This delivery method will be used when invoicing from packing."
-#~ msgstr "这交货方式将用在包装的发票上"
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "承运方 %s (id: %d) 没有送货网络！"
 
+#. module: delivery
+#: code:addons/delivery/sale.py:78
 #, python-format
-#~ msgid "No price available !"
-#~ msgstr "无价格表可用！"
-
-#~ msgid "_Cancel"
-#~ msgstr "取消(_C)"
-
-#~ msgid "Delivery Order"
-#~ msgstr "送货单"
-
-#~ msgid "Weights"
-#~ msgstr "重量"
-
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "单号必须唯一！"
-
-#~ msgid ""
-#~ "The delivery price list allows you to compute the cost and sales price of "
-#~ "the delivery according to the weight of the products and other criteria. You "
-#~ "can define several price lists for one delivery method, per country or a "
-#~ "zone in a specific country defined by a postal code range."
-#~ msgstr "送货价格表允许您通过重量或其它条件计算成本和售价。您可以为一个送货方式定义多个价格表。按国家或地区（以邮政编码区分）"
-
-#~ msgid "Make Delievery"
-#~ msgstr "发运"
+msgid "The order state have to be draft to add delivery lines."
+msgstr "只能对草稿状态的订单增加送货明细"
 
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "你尝试分配一个来自其它产品的批次"
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "提供送货服务的业务伙伴"
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "必须为此产品赋予一个生产批次"
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "这个送货方式会在基于送货单开发票的时候使用。"
 
-#~ msgid "_Apply"
-#~ msgstr "应用(_A)"
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "目的地邮编"
 
-#, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "在所选的送货网络中没有明细匹配这个订单"
-
-#~ msgid ""
-#~ "Create and manage the delivery methods you need for your sales activities. "
-#~ "Each delivery method can be assigned to a price list which computes the "
-#~ "price of the delivery according to the products sold or delivered."
-#~ msgstr "创建和管理你在销售过程中的送货方式。每种送货方式可以指定一个价格表这样可以根据销售和发运的产品计算运费。"
-
-#~ msgid ""
-#~ "Allows you to add delivery methods in sale orders and picking.\n"
-#~ "     You can define your own carrier and delivery grids for prices.\n"
-#~ "     When creating invoices from picking, OpenERP is able to add and compute "
-#~ "the shipping line.\n"
-#~ "\n"
-#~ "     "
-#~ msgstr ""
-#~ "允许你在销售订单或出库单上增加送货方式。\n"
-#~ "你可以定义你自己的承运方和送货网络价格。\n"
-#~ "当基于送货单创建发票时，OpenERP可以增加和自动计算这装运明细。\n"
-#~ "\n"
-#~ "     "
-
-#~ msgid "Error ! You can not create recursive associated members."
-#~ msgstr "错误！您不能创建递归的商会会员。"
-
-#~ msgid "Create Deliveries"
-#~ msgstr "创建送货单"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "承运方和送货"
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "物流公司"
 
+#. module: delivery
+#: code:addons/delivery/delivery.py:237
 #, python-format
-#~ msgid "No line matched this product or order in the choosed delivery grid."
-#~ msgstr "在选择的运输网格包含的明细中没有匹配的产品或订单。"
-
-#~ msgid "delivery.define.delivery.steps.wizard"
-#~ msgstr "delivery.define.delivery.steps.wizard"
-
-#~ msgid ""
-#~ "Define your delivery methods and their pricing. The delivery costs can be "
-#~ "added on the sale order form or in the invoice, based on the delivery orders."
-#~ msgstr "定义你的送货方式和价格。运费可以被加到销售订单或发票，基于送货单。"
-
-#~ msgid "Picking Policy"
-#~ msgstr "分拣方式"
+msgid "Unable to fetch delivery method!"
+msgstr ""
 
-#~ msgid "You can not move products from or to a location of the type view."
-#~ msgstr "您不能将产品移动到视图类型的库位。"
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "计量单位"
 
-#~ msgid "Choose Your Default Picking Policy"
-#~ msgstr "选择你的默认分拣方式"
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid ""
+"Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr "计量单位 是测量重量的单位"
 
-#~ msgid "Deliver all products at once"
-#~ msgstr "一次性交货"
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "重量的计量单位"
 
-#~ msgid "Define Delivery Methods"
-#~ msgstr "设置发货方式"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "变量"
 
-#~ msgid "Setup Your Picking Policy"
-#~ msgstr "设置你的分拣方式"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "变量系数"
 
-#~ msgid "Free If More Than"
-#~ msgstr "免费起始金额"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "体积"
 
-#~ msgid ""
-#~ "Define the delivery methods you are using and their pricing in order to "
-#~ "reinvoice the delivery costs when you are doing invoicing based on delivery "
-#~ "orders"
-#~ msgstr "定义送货方式以及价格，以便你基于送货单开发票"
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
 
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "订单号必须在一个公司范围内唯一"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "重量"
 
-#~ msgid "Reference must be unique per Company!"
-#~ msgstr "编号必须在公司内唯一！"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "重量* 体积"
 
-#~ msgid "Error ! You cannot create recursive associated members."
-#~ msgstr "错误，您不能创建循环引用的会员用户"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Deliver each product when available"
-#~ msgstr "分批交货"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "邮政编码"
 
-#~ msgid "Apply"
-#~ msgstr "接受"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index bacd277f003..0fa3491de46 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -1,161 +1,197 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* delivery
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-09-27 10:27+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:06+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:05+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Order Ref."
-msgstr "訂單參考"
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
 
 #. module: delivery
-#: model:product.template,name:delivery.product_product_delivery_product_template
-msgid "Delivery by Poste"
-msgstr "郵遞交貨"
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery price list for a specific "
+"region.\n"
+"              </p><p>\n"
+"                The delivery price list allows you to compute the cost and\n"
+"                sales price of the delivery according to the weight of the\n"
+"                products and other criteria. You can define several price "
+"lists\n"
+"                for each delivery method: per country or a zone in a "
+"specific\n"
+"                country defined by a postal code range.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid " in Function of "
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new deliver method. \n"
+"              </p><p>\n"
+"                Each carrier (e.g. UPS) can have several delivery methods "
+"(e.g.\n"
+"                UPS Express, UPS Standard) with a set of pricing rules "
+"attached\n"
+"                to each method.\n"
+"              </p><p>\n"
+"                These methods allow to automatically compute the delivery "
+"price\n"
+"                according to your settings; on the sales order (based on "
+"the\n"
+"                quotation) or the invoice (based on the delivery orders).\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Destination"
-msgstr "目的地"
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
 
 #. module: delivery
-#: field:stock.move,weight_net:0
-msgid "Net weight"
-msgstr "淨重"
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "活躍"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid_line
-msgid "Delivery Grid Line"
-msgstr "交貨格線"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid "Add in Quote"
+msgstr "加至報價"
 
 #. module: delivery
-#: field:stock.move,weight_uom_id:0
-#: field:stock.picking,weight_uom_id:0
-msgid "Unit of Measure"
-msgstr "量度單位"
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "進階定價"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Delivery grids"
-msgstr "交貨格"
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "依目的地的進階定價"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: field:stock.picking,volume:0
-#: field:stock.picking.out,volume:0
-msgid "Volume"
-msgstr "體積"
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "金額"
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Zip"
-msgstr "郵遞區號"
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,line_ids:0
-msgid "Grid Line"
-msgstr "格線"
+#: field:delivery.carrier,available:0
+msgid "Available"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,partner_id:0
-msgid "The partner that is doing the delivery service."
-msgstr "相關合作夥伴正在進行貨物運送"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.carrier:delivery.view_delivery_carrier_tree
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: field:stock.picking,carrier_id:0
+#: view:website:stock.report_picking
+msgid "Carrier"
+msgstr "運輸公司"
 
 #. module: delivery
-#: model:ir.actions.report.xml,name:delivery.report_shipping
-msgid "Delivery order"
-msgstr "交貨單"
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+msgid "Carrier Information"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No line matched this product or order in the chosen delivery grid."
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "運輸公司追蹤參考"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_picking_tree4
-msgid "Picking to be invoiced"
-msgstr "要開立發票的提貨"
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,pricelist_ids:0
-msgid "Advanced Pricing"
-msgstr "進階定價"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "Condition"
+msgstr "條件"
 
 #. module: delivery
-#: help:delivery.grid,sequence:0
-msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr "提供顯示交貨格線清單的次序。"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "成本價"
 
 #. module: delivery
-#: view:delivery.grid:0
+#: view:delivery.grid:delivery.view_delivery_grid_form
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
 msgstr "國家"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a delivery price list for a specific "
-"region.\n"
-"              </p><p>\n"
-"                The delivery price list allows you to compute the cost and\n"
-"                sales price of the delivery according to the weight of the\n"
-"                products and other criteria. You can define several price "
-"lists\n"
-"                for each delivery method: per country or a zone in a "
-"specific\n"
-"                country defined by a postal code range.\n"
-"              </p>\n"
-"            "
+#: field:delivery.carrier,create_uid:0
+#: field:delivery.grid,create_uid:0
+#: field:delivery.grid.line,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "交貨單 :"
+#: field:delivery.carrier,create_date:0
+#: field:delivery.grid,create_date:0
+#: field:delivery.grid.line,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,variable_factor:0
-msgid "Variable Factor"
-msgstr "可變因子"
+#: code:addons/delivery/delivery.py:162
+#, python-format
+msgid "Default price"
+msgstr "預設價格"
 
 #. module: delivery
-#: field:delivery.carrier,amount:0
-msgid "Amount"
-msgstr "金額"
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "交貨"
 
 #. module: delivery
-#: view:sale.order:0
-msgid "Add in Quote"
-msgstr "加至報價"
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "交貨格線"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-msgid "Fixed"
-msgstr "固定"
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "交貨格線"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "交貨網格"
 
 #. module: delivery
 #: field:delivery.carrier,name:0
@@ -165,123 +201,113 @@ msgid "Delivery Method"
 msgstr "交貨方法"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:221
-#, python-format
-msgid "No price available!"
-msgstr "無可用的價格！"
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+msgid "Delivery Methods"
+msgstr "送貨方式"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_move
-msgid "Stock Move"
-msgstr "庫存調動"
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "交貨價目表"
 
 #. module: delivery
-#: field:stock.picking,carrier_tracking_ref:0
-#: field:stock.picking.out,carrier_tracking_ref:0
-msgid "Carrier Tracking Ref"
-msgstr "運輸公司追蹤參考"
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "交貨產品"
 
 #. module: delivery
-#: field:stock.picking,weight_net:0
-#: field:stock.picking.in,weight_net:0
-#: field:stock.picking.out,weight_net:0
-msgid "Net Weight"
-msgstr "淨重"
+#: model:product.template,name:delivery.product_product_delivery_product_template
+msgid "Delivery by Poste"
+msgstr "郵遞交貨"
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Grid Lines"
-msgstr "格線"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: view:delivery.grid:delivery.view_delivery_grid_tree
+msgid "Delivery grids"
+msgstr "交貨格"
 
 #. module: delivery
-#: view:delivery.carrier:0
-#: view:delivery.grid:0
-msgid "Grid definition"
-msgstr "格線定義"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Destination"
+msgstr "目的地"
 
 #. module: delivery
-#: code:addons/delivery/stock.py:90
-#, python-format
-msgid "Warning!"
-msgstr "警告!"
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "固定"
 
 #. module: delivery
-#: field:delivery.grid.line,operator:0
-msgid "Operator"
-msgstr "經手人"
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If Order Total Amount Is More Than"
+msgstr "免費，如訂單總金額大於"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_res_partner
-msgid "Partner"
-msgstr "伙伴"
+#: code:addons/delivery/delivery.py:151
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "免費，如果大於 %.2f"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sales Order"
-msgstr "銷貨單"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "General Information"
+msgstr ""
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "交貨單"
+#: help:delivery.grid.line,sequence:0
+msgid "Gives the sequence order when calculating delivery grid."
+msgstr ""
 
 #. module: delivery
-#: view:sale.order:0
-msgid ""
-"If you don't 'Add in Quote', the exact price will be computed when invoicing "
-"based on delivery order(s)."
-msgstr "如果您不打算「加至報價」，則確切的價格會在依出貨單開立發票時計算。"
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "提供顯示交貨格線清單的次序。"
 
 #. module: delivery
-#: field:delivery.carrier,partner_id:0
-msgid "Transport Company"
-msgstr "貨運公司"
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "網格"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_delivery_grid
-msgid "Delivery Grid"
-msgstr "交貨格線"
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "格線"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Invoiced to"
-msgstr "發票開立對象:"
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_tree
+msgid "Grid Lines"
+msgstr "格線"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Picking List"
-msgstr "提貨清單"
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "網格名稱"
 
 #. module: delivery
-#: field:delivery.grid.line,name:0
-msgid "Name"
-msgstr "名稱"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+#: view:delivery.grid:delivery.view_delivery_grid_form
+msgid "Grid definition"
+msgstr "格線定義"
 
 #. module: delivery
-#: help:delivery.carrier,free_if_more_than:0
-msgid ""
-"If the order is more expensive than a certain amount, the customer can "
-"benefit from a free shipping"
+#: field:delivery.carrier,id:0
+#: field:delivery.grid,id:0
+#: field:delivery.grid.line,id:0
+msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,amount:0
+#: help:delivery.carrier,active:0
 msgid ""
-"Amount of the order to benefit from a free shipping, expressed in the "
-"company currency"
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
 msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,free_if_more_than:0
-msgid "Free If Order Total Amount Is More Than"
-msgstr "免費，如訂單總金額大於"
-
-#. module: delivery
-#: field:delivery.grid.line,grid_id:0
-msgid "Grid"
-msgstr "網格"
-
-#. module: delivery
 #: help:delivery.grid,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
@@ -289,55 +315,27 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid,zip_to:0
-msgid "To Zip"
-msgstr "至郵遞區號"
-
-#. module: delivery
-#: code:addons/delivery/delivery.py:147
-#, python-format
-msgid "Default price"
-msgstr "預設價格"
-
-#. module: delivery
-#: field:delivery.carrier,normal_price:0
-msgid "Normal Price"
-msgstr "普通價格"
-
-#. module: delivery
-#: report:sale.shipping:0
-msgid "Order Date"
-msgstr "訂單日期"
-
-#. module: delivery
-#: field:delivery.grid,name:0
-msgid "Grid Name"
-msgstr "網格名稱"
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
 
 #. module: delivery
-#: field:stock.picking,number_of_packages:0
-#: field:stock.picking.out,number_of_packages:0
-msgid "Number of Packages"
-msgstr "包裝數"
+#: view:sale.order:delivery.view_order_withcarrier_form
+msgid ""
+"If you don't 'Add in Quote', the exact price will be computed when invoicing "
+"based on delivery order(s)."
+msgstr "如果您不打算「加至報價」，則確切的價格會在依出貨單開立發票時計算。"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-#: report:sale.shipping:0
-#: view:stock.move:0
-#: field:stock.move,weight:0
-#: view:stock.picking:0
-#: field:stock.picking,weight:0
-#: field:stock.picking.in,weight:0
-#: field:stock.picking.out,weight:0
-msgid "Weight"
-msgstr "重量"
+#: field:sale.order.line,is_delivery:0
+msgid "Is a Delivery"
+msgstr ""
 
 #. module: delivery
-#: help:delivery.carrier,use_detailed_pricelist:0
-msgid ""
-"Check this box if you want to manage delivery prices that depends on the "
-"destination, the weight, the total of the order, etc."
+#: help:delivery.carrier,available:0
+msgid "Is the carrier method possible with the current order."
 msgstr ""
 
 #. module: delivery
@@ -347,168 +345,154 @@ msgid ""
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid available !"
-msgstr "無可用網格 !"
+#: field:delivery.carrier,write_uid:0
+#: field:delivery.grid,write_uid:0
+#: field:delivery.grid.line,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid ">="
-msgstr ">="
+#: field:delivery.carrier,write_date:0
+#: field:delivery.grid,write_date:0
+#: field:delivery.grid.line,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/sale.py:57
-#, python-format
-msgid "Order not in draft state !"
-msgstr "訂單不在草稿階段 !"
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "最大值"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Lot"
-msgstr "批次"
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "名稱"
 
 #. module: delivery
-#: field:delivery.carrier,active:0
-#: field:delivery.grid,active:0
-msgid "Active"
-msgstr "活躍"
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "淨重"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Shipping Date"
-msgstr "貨運日期"
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "淨重"
 
 #. module: delivery
-#: field:delivery.carrier,product_id:0
-msgid "Delivery Product"
-msgstr "交貨產品"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No Grid Available!"
+msgstr ""
 
 #. module: delivery
-#: view:delivery.grid.line:0
-msgid "Condition"
-msgstr "條件"
+#: code:addons/delivery/sale.py:75
+#, python-format
+msgid "No grid matching for this carrier!"
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
-msgstr "成本價"
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "普通價格"
 
 #. module: delivery
-#: selection:delivery.grid.line,price_type:0
-#: field:delivery.grid.line,type:0
-msgid "Variable"
-msgstr "變量"
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "包裝數"
 
 #. module: delivery
-#: help:res.partner,property_delivery_carrier:0
-msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "經手人"
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to define a new deliver method. \n"
-"              </p><p>\n"
-"                Each carrier (e.g. UPS) can have several delivery methods "
-"(e.g.\n"
-"                UPS Express, UPS Standard) with a set of pricing rules "
-"attached\n"
-"                to each method.\n"
-"              </p><p>\n"
-"                These methods allows to automaticaly compute the delivery "
-"price\n"
-"                according to your settings; on the sales order (based on "
-"the\n"
-"                quotation) or the invoice (based on the delivery orders).\n"
-"              </p>\n"
-"            "
+#: code:addons/delivery/sale.py:78
+#, python-format
+msgid "Order not in Draft State!"
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,max_value:0
-msgid "Maximum Value"
-msgstr "最大值"
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "伙伴"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Quantity"
-msgstr "數量"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "提貨清單"
 
 #. module: delivery
-#: field:delivery.grid,zip_from:0
-msgid "Start Zip"
-msgstr "郵遞區號開頭"
+#: model:ir.actions.act_window,name:delivery.action_picking_tree
+msgid "Picking to be invoiced"
+msgstr "要開立發票的提貨"
 
 #. module: delivery
-#: help:sale.order,carrier_id:0
-msgid ""
-"Complete this field if you plan to invoice the shipping based on picking."
-msgstr ""
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "價格"
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:136
-#, python-format
-msgid "Free if more than %.2f"
-msgstr "免費，如果大於 %.2f"
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "價目類型"
 
 #. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr "進貨"
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Pricing Information"
+msgstr "價格資訊"
 
 #. module: delivery
-#: selection:delivery.grid.line,operator:0
-msgid "<="
-msgstr "<="
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Quantity"
+msgstr "數量"
 
 #. module: delivery
-#: help:stock.picking,weight_uom_id:0
-msgid "Unit of measurement for Weight"
-msgstr "重量的度量單位"
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "銷售價"
 
 #. module: delivery
-#: report:sale.shipping:0
-msgid "Description"
-msgstr "說明"
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "銷貨單"
 
 #. module: delivery
-#: help:delivery.carrier,active:0
-msgid ""
-"If the active field is set to False, it will allow you to hide the delivery "
-"carrier without removing it."
+#: model:ir.model,name:delivery.model_sale_order_line
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
-msgid "Delivery Pricelist"
-msgstr "交貨價目表"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid ""
+"Selected product in the delivery method doesn't fulfill any of the delivery "
+"grid(s) criteria."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.carrier,price:0
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Price"
-msgstr "價格"
+#: field:delivery.grid,sequence:0
+#: field:delivery.grid.line,sequence:0
+msgid "Sequence"
+msgstr "次序"
 
 #. module: delivery
-#: code:addons/delivery/sale.py:54
-#, python-format
-msgid "No grid matching for this carrier !"
-msgstr ""
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "郵遞區號開頭"
 
 #. module: delivery
-#: model:ir.ui.menu,name:delivery.menu_delivery
-msgid "Delivery"
-msgstr "交貨"
+#: view:delivery.grid:delivery.view_delivery_grid_form
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "狀態"
 
 #. module: delivery
-#: selection:delivery.grid.line,type:0
-#: selection:delivery.grid.line,variable_factor:0
-msgid "Weight * Volume"
-msgstr "重量 * 體積"
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "庫存調動"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:91
@@ -517,62 +501,42 @@ msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
 
 #. module: delivery
-#: view:delivery.carrier:0
-msgid "Pricing Information"
-msgstr "價格資訊"
-
-#. module: delivery
-#: field:delivery.carrier,use_detailed_pricelist:0
-msgid "Advanced Pricing per Destination"
-msgstr "依目的地的進階定價"
-
-#. module: delivery
-#: view:delivery.carrier:0
-#: field:delivery.grid,carrier_id:0
-#: model:ir.model,name:delivery.model_delivery_carrier
-#: report:sale.shipping:0
-#: field:stock.picking,carrier_id:0
-#: field:stock.picking.out,carrier_id:0
-msgid "Carrier"
-msgstr "運輸公司"
-
-#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
-#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
-msgid "Delivery Methods"
-msgstr "送貨方式"
-
-#. module: delivery
-#: code:addons/delivery/sale.py:57
+#: code:addons/delivery/sale.py:78
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr "訂單狀態要是草稿才能添加交貨明細。"
 
 #. module: delivery
-#: field:delivery.carrier,grids_id:0
-msgid "Delivery Grids"
-msgstr "交貨網格"
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "相關合作夥伴正在進行貨物運送"
 
 #. module: delivery
-#: field:delivery.grid,sequence:0
-msgid "Sequence"
-msgstr "次序"
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,list_price:0
-msgid "Sale Price"
-msgstr "銷售價"
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "至郵遞區號"
 
 #. module: delivery
-#: view:stock.picking.out:0
-msgid "Print Delivery Order"
-msgstr "列印送貨單"
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "貨運公司"
 
 #. module: delivery
-#: view:delivery.grid:0
-#: field:delivery.grid,state_ids:0
-msgid "States"
-msgstr "狀態"
+#: code:addons/delivery/delivery.py:237
+#, python-format
+msgid "Unable to fetch delivery method!"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr "量度單位"
 
 #. module: delivery
 #: help:stock.move,weight_uom_id:0
@@ -581,63 +545,62 @@ msgid ""
 msgstr "量度單位為重量衡量的單位"
 
 #. module: delivery
-#: field:delivery.grid.line,price_type:0
-msgid "Price Type"
-msgstr "價目類型"
-
-#~ msgid "Notes"
-#~ msgstr "注解"
-
-#~ msgid "Delivery Order"
-#~ msgstr "交貨單"
-
-#, python-format
-#~ msgid "No price available !"
-#~ msgstr "無價錢提供！"
-
-#, python-format
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid "_Cancel"
-#~ msgstr "取消(_C)"
-
-#~ msgid "Weights"
-#~ msgstr "重量"
-
-#~ msgid "Delivery Costs"
-#~ msgstr "交貨成本"
-
-#~ msgid "Carrier Partner"
-#~ msgstr "運輸公司伙伴"
-
-#~ msgid "Carriers and deliveries"
-#~ msgstr "運輸公司與交貨"
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr "重量的度量單位"
 
-#~ msgid "_Apply"
-#~ msgstr "套用(_A)"
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "變量"
 
-#~ msgid "Order Reference must be unique !"
-#~ msgstr "訂單參考不能重覆！"
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "可變因子"
 
-#~ msgid "Deliveries Properties"
-#~ msgstr "交貨性質"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "體積"
 
+#. module: delivery
+#: code:addons/delivery/stock.py:90
 #, python-format
-#~ msgid "No line matched this order in the choosed delivery grids !"
-#~ msgstr "選擇的交貨格無一行符合此訂單 !"
+msgid "Warning!"
+msgstr "警告!"
 
-#~ msgid "Make Delievery"
-#~ msgstr "進行交貨"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: view:stock.move:delivery.view_move_withweight_form
+#: field:stock.move,weight:0
+#: view:stock.picking:delivery.view_picking_withcarrier_out_form
+#: field:stock.picking,weight:0
+#: view:website:stock.report_picking
+msgid "Weight"
+msgstr "重量"
 
-#~ msgid "Sales & Purchases"
-#~ msgstr "銷售 及 購貨"
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "重量 * 體積"
 
-#~ msgid "You must assign a production lot for this product"
-#~ msgstr "須為此產品指定生產批次"
+#. module: delivery
+#: view:website:stock.report_picking
+msgid "Will be invoiced to:"
+msgstr ""
 
-#~ msgid "Create Deliveries"
-#~ msgstr "進行交貨"
+#. module: delivery
+#: view:delivery.carrier:delivery.view_delivery_carrier_form
+msgid "Zip"
+msgstr "郵遞區號"
 
-#~ msgid "You try to assign a lot which is not from the same product"
-#~ msgstr "指定了不同產品的批次"
+#. module: delivery
+#: view:delivery.grid.line:delivery.view_delivery_grid_line_form
+msgid "in Function of"
+msgstr ""