[I18N] Update 8.0 translations with latest changes from Launchpad

1 files changed, 316 insertions, 307 deletions

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 "ทำการจัดส่ง"