diff --git a/locale/bg.po b/locale/bg.po
index 88e0a74259..483397a649 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -41,6 +41,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Количествата на движение трябва да са положително число"
@@ -54,13 +58,13 @@ msgid "Source and destination location must be different"
 msgstr "Източника и целта на местонахождението трябва да са различни"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -169,10 +173,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
@@ -243,8 +246,8 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +296,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +338,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -414,8 +415,8 @@ msgid "Number"
 msgstr "Номер"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -467,8 +468,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -514,6 +515,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Създадено от"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Планирани количества"
@@ -551,8 +556,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -598,10 +603,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -690,8 +694,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -755,8 +759,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -799,8 +803,8 @@ msgid "Product"
 msgstr "Продукт"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -835,10 +839,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Количество"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -928,8 +931,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1027,8 +1030,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1127,8 +1130,8 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1237,8 +1240,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1339,8 +1342,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1407,6 +1410,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 8191a6d08b..f7bd1c9bf2 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -43,6 +43,10 @@ msgstr ""
 "No es pot canviar la ubicació \"%s\" amb moviments existents a un tipus que "
 "no suporta moviments."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "La ubicació '%(location)s' ha d'estar buida abans de ser desactivada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La quantitat de moviment intern ha de ser positiva."
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "Les ubicacions origen i destí han de ser diferents."
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "El moviment d'existències \"%s\" no té origen."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Els moviments d'existències \"%s\" no tenen origen."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "No podeu eliminar el moviment d'existències \"%s\" perquè no està en estat "
-"esborrany o cancel·lat."
+"en procès, esborrany o cancel·lat."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -183,8 +187,8 @@ msgid "Party"
 msgstr "Tercer"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -251,8 +255,8 @@ msgid "Inventory Sequence"
 msgstr "Seqüència d'inventari"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -299,8 +303,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -335,8 +339,8 @@ msgid "Inventory Sequence"
 msgstr "Seqüència d'inventari"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -403,8 +407,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -455,8 +459,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -502,6 +506,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Usuari de creació"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Fills plans"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantitat prevista"
@@ -539,8 +547,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -583,8 +591,8 @@ msgid "Lead Time"
 msgstr "Temps d'espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -667,8 +675,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -731,8 +739,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -775,8 +783,8 @@ msgid "Product"
 msgstr "Productes"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -807,8 +815,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -891,8 +899,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -987,8 +995,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1083,8 +1091,8 @@ msgid "Planned Start Date"
 msgstr "Inici data estimada"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1191,8 +1199,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1291,8 +1299,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1356,6 +1364,10 @@ msgstr ""
 "* Un valor buit és un data infinita en el futur.\n"
 "* Una data en el passat proporcionarà valors històrics."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marqueu per restringir a només un nivell de fills."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si està buit s'utilitzarà l'emmagatzemament."
diff --git a/locale/cs.po b/locale/cs.po
index c8ff49082b..d36ed11fbb 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -158,10 +162,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -227,10 +230,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -276,10 +278,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -313,10 +314,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -382,10 +382,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -435,10 +434,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -484,6 +482,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,10 +523,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -566,10 +567,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -651,10 +651,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -716,10 +715,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -761,10 +759,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -794,10 +791,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -879,10 +875,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -976,10 +971,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1073,10 +1067,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,10 +1175,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1283,10 +1275,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1334,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 9e15deb807..1e4dcd6f94 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -45,6 +45,10 @@ msgstr ""
 "Lagerort \"%s\" weist Warenbewegungen auf und kann deshalb nicht zu einem "
 "Typ geändert werden, der keine Warenbewegungen unterstützt."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Interne Anzahl von Bewegungen muss positiv sein!"
@@ -57,14 +61,16 @@ msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
 msgstr "Herkunfts- und Bestimmungsort müssen unterschiedlich sein"
 
+#, fuzzy
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr "Die Lagerbewegung \"%s\" hat keinen Ursprung."
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Lagerbewegung \"%s\" kann nicht gelöscht werden, weil sie nicht in Status "
 "\"Entwurf\" oder \"Annulliert\" ist."
@@ -195,8 +201,8 @@ msgid "Party"
 msgstr "Partei"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -263,8 +269,8 @@ msgid "Inventory Sequence"
 msgstr "Nummernkreis Inventur"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -311,8 +317,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -347,8 +353,8 @@ msgid "Inventory Sequence"
 msgstr "Nummernkreis Inventur"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -415,8 +421,8 @@ msgid "Number"
 msgstr "Nummer"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -467,8 +473,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -514,6 +520,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Voraussichtliche Anzahl"
@@ -551,8 +561,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -595,8 +605,8 @@ msgid "Lead Time"
 msgstr "Beschaffungszeit"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -679,8 +689,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -743,8 +753,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -787,8 +797,8 @@ msgid "Product"
 msgstr "Variante"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -819,8 +829,8 @@ msgid "Quantity"
 msgstr "Menge"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -903,8 +913,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -999,8 +1009,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1095,8 +1105,8 @@ msgid "Planned Start Date"
 msgstr "Geplantes Startdatum"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1203,8 +1213,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1303,8 +1313,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1364,6 +1374,10 @@ msgstr ""
 "* Ein leerer Wert bedeutet ein unendliches Datum in der Zukunft.\n"
 "* Ein Wert in der Vergangenheit berechnet historische Werte."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Bei leerem Feld wird das Lager verwendet"
diff --git a/locale/es.po b/locale/es.po
index 884eb08c37..915182cffa 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -41,6 +41,11 @@ msgstr ""
 "No puede cambiar la ubicación \"%s\" con movimientos a otra ubicación que no"
 " soporte movimientos."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+"La ubicación '%location)s' tiene que esta vacía antes de ser desactivada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La cantidad del movimiento interno debe ser positiva."
@@ -54,16 +59,16 @@ msgid "Source and destination location must be different"
 msgstr "Las ubicaciones origen y destino deben ser distintas."
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "El movimiento de existencias \"%s\" no tiene ningún origen."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Los movimientos de existencias \"%s\" no tienen ningún origen."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "No puede eliminar el movimiento de existencias \"%s\" porque no está en "
-"estado borrador o cancelado."
+"estado en proceso, borrador o cancelado."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -177,8 +182,8 @@ msgid "Party"
 msgstr "Tercero"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -245,8 +250,8 @@ msgid "Inventory Sequence"
 msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,8 +298,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -329,8 +334,8 @@ msgid "Inventory Sequence"
 msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -397,8 +402,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -449,8 +454,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -496,6 +501,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Usuario de creación"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Hijos llanos"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Cantidad prevista"
@@ -533,8 +542,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -577,8 +586,8 @@ msgid "Lead Time"
 msgstr "Tiempo de espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -661,8 +670,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -725,8 +734,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -769,8 +778,8 @@ msgid "Product"
 msgstr "Producto"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -801,8 +810,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -885,8 +894,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -981,8 +990,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1077,8 +1086,8 @@ msgid "Planned Start Date"
 msgstr "Fecha inicio planeada"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1185,8 +1194,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1285,8 +1294,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1350,6 +1359,10 @@ msgstr ""
 "* Un valor vacío es una fecha infinita en el futuro.\n"
 "* Una fecha en el pasado proporcionará los valores históricos."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marcar para restringir a solo un nivel de hijos."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si está vacío se utilizará el almacenamiento."
diff --git a/locale/es_419.po b/locale/es_419.po
index c42b19640d..d5504920f9 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -37,6 +37,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -50,13 +54,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -164,7 +168,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
@@ -234,7 +238,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
@@ -283,7 +287,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
@@ -320,7 +324,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -390,7 +394,7 @@ msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory,state:"
@@ -443,7 +447,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -491,6 +495,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -528,7 +536,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location,right:"
@@ -573,7 +581,7 @@ msgid "Lead Time"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -658,7 +666,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.move,shipment:"
@@ -723,7 +731,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period,state:"
@@ -768,7 +776,7 @@ msgid "Product"
 msgstr ""
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
@@ -801,7 +809,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -885,7 +893,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
@@ -983,7 +991,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1080,7 +1088,7 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1191,7 +1199,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1294,7 +1302,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
@@ -1353,6 +1361,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si está vacío se utiliza el almacenamiento"
diff --git a/locale/fr.po b/locale/fr.po
index f1c0a5b242..7c8dc1d123 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -43,6 +43,10 @@ msgstr ""
 "L'emplacement « %s », liée à des mouvements, ne peut être changer en un type"
 " qui ne supporte pas les mouvements."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "L'emplacement « %(location)s » doit être vide pour être désactivée."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La quantité interne doit être positive"
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "Les emplacements d'origine et de destination doivent être distincts"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "Le mouvement de stock « %s » n'a pas d'origine."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Les mouvements de stock « %s » n'ont pas d'origine."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Vous ne pouvez supprimer le mouvement de stock « %s » car il n'est pas dans "
-"l'état brouillon ou annulé."
+"l'état intermédiaire, brouillon ou annulé."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -144,11 +148,11 @@ msgstr "L'expédition interne « %s » doit être annulée avant suppression."
 msgctxt "error:stock.shipment.out.return:"
 msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Le retour d'expédition client « %s » doit être annulé avant suppression."
+"Le retour d'expédition cliente « %s » doit être annulée avant suppression."
 
 msgctxt "error:stock.shipment.out:"
 msgid "Customer Shipment \"%s\" must be cancelled before deletion."
-msgstr "L'expédition cliente « %s » doit être annulées avant suppression."
+msgstr "L'expédition cliente « %s » doit être annulée avant suppression."
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
@@ -187,8 +191,8 @@ msgid "Party"
 msgstr "Tiers"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -255,8 +259,8 @@ msgid "Inventory Sequence"
 msgstr "Séquence d'inventaire"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -272,15 +276,15 @@ msgstr "Séquence d'expédition interne"
 
 msgctxt "field:stock.configuration,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr "Transit de livraison interne"
+msgstr "Transit d'expédition interne"
 
 msgctxt "field:stock.configuration,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
-msgstr "Séquence de retour d'expédition client"
+msgstr "Séquence de retour d'expédition cliente"
 
 msgctxt "field:stock.configuration,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
-msgstr "Séquence d'expéditions client"
+msgstr "Séquence d'expédition cliente"
 
 msgctxt "field:stock.configuration,write_date:"
 msgid "Write Date"
@@ -303,12 +307,12 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr "Transit de livraison interne"
+msgstr "Transit d'expédition interne"
 
 msgctxt "field:stock.configuration.location,write_date:"
 msgid "Write Date"
@@ -339,8 +343,8 @@ msgid "Inventory Sequence"
 msgstr "Séquence d'inventaire"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -356,11 +360,11 @@ msgstr "Séquence d'expédition interne"
 
 msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
-msgstr "Séquence de retour d'expédition client"
+msgstr "Séquence de retour d'expédition cliente"
 
 msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
-msgstr "Séquence d'expédition client"
+msgstr "Séquence d'expédition cliente"
 
 msgctxt "field:stock.configuration.sequence,write_date:"
 msgid "Write Date"
@@ -407,8 +411,8 @@ msgid "Number"
 msgstr "Numéro"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -459,8 +463,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -506,6 +510,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Enfants plats"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantité prévisionnelle"
@@ -543,8 +551,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -587,8 +595,8 @@ msgid "Lead Time"
 msgstr "Délai de livraison"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -671,8 +679,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -735,8 +743,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -779,8 +787,8 @@ msgid "Product"
 msgstr "Produit"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -811,8 +819,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -895,8 +903,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -991,8 +999,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1087,8 +1095,8 @@ msgid "Planned Start Date"
 msgstr "Date de début planifiée"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1195,8 +1203,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1295,8 +1303,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1364,6 +1372,10 @@ msgstr ""
 "* Une valeur vide est une date infinie dans le futur.\n"
 "* Une date dans le passé fournira des valeurs historiques."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Cocher pour restreindre à une niveau d'enfants."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si vide le magasin est utilisé"
@@ -1424,15 +1436,15 @@ msgstr "Retours d'expédition fournisseur"
 
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Expédition interne"
+msgstr "Expéditions internes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
@@ -1480,7 +1492,7 @@ msgstr "Assigner l'expédition interne"
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Assigner l'expédition de sortie"
+msgstr "Assigner l'expédition cliente"
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
@@ -1633,11 +1645,11 @@ msgstr "Expédition interne"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr "Expédition client"
+msgstr "Expédition cliente"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Retours d'expédition client"
+msgstr "Retours d'expédition cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
@@ -1657,11 +1669,11 @@ msgstr "Expédition interne"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr "Expédition client"
+msgstr "Expédition cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Retour d'expédition client"
+msgstr "Retour d'expédition cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
@@ -1673,7 +1685,7 @@ msgstr "Inventaires"
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
-msgstr "Éditer les emplacements"
+msgstr "Emplacements"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
@@ -1709,11 +1721,11 @@ msgstr "Expéditions internes"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Retours d'expédition client"
+msgstr "Retours d'expédition cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
@@ -1749,7 +1761,7 @@ msgstr "Configuration des stocks"
 
 msgctxt "model:stock.configuration.location,name:"
 msgid "Stock Configuration Location"
-msgstr "Configuration de stock Emplacement"
+msgstr "Configuration des emplacements de stockage"
 
 msgctxt "model:stock.configuration.sequence,name:"
 msgid "Stock Configuration Sequence"
@@ -1765,7 +1777,7 @@ msgstr "Ligne d'inventaire de stock"
 
 msgctxt "model:stock.location,name:"
 msgid "Stock Location"
-msgstr "Lieu de Stockage"
+msgstr "Emplacement de Stockage"
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
@@ -1837,7 +1849,7 @@ msgstr "Retour d'expédition fournisseur"
 
 msgctxt "model:stock.shipment.in.return.assign.failed,name:"
 msgid "Assign Supplier Return Shipment"
-msgstr "Assigner les éxpéditions de retour fournisseur"
+msgstr "Assigner le retour d'expédition fournisseur"
 
 msgctxt "model:stock.shipment.internal,name:"
 msgid "Internal Shipment"
@@ -1849,15 +1861,15 @@ msgstr "Assigner l'expédition interne"
 
 msgctxt "model:stock.shipment.out,name:"
 msgid "Customer Shipment"
-msgstr "Expédition Client"
+msgstr "Expédition cliente"
 
 msgctxt "model:stock.shipment.out.assign.failed,name:"
 msgid "Assign Shipment Out"
-msgstr "Assigner l'expédition de sortie"
+msgstr "Assigner l'expédition cliente"
 
 msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
-msgstr "Retour d'expédition client"
+msgstr "Retour d'expédition cliente"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 39589e5dbe..8d04a2243e 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -39,6 +39,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -53,13 +57,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -167,10 +171,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -246,10 +249,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -300,10 +302,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -343,10 +344,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -423,10 +423,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Szám"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -485,10 +484,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -544,6 +542,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Által létrehozva "
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
@@ -585,10 +587,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -637,10 +638,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -737,10 +737,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -813,10 +812,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -868,10 +866,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Termék"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -908,10 +905,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -1004,10 +1000,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1112,10 +1107,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1221,10 +1215,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1342,10 +1335,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1455,10 +1447,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1519,6 +1510,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 6f91c64b5e..d5770295f0 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -162,10 +166,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -239,10 +242,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +295,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +337,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -415,10 +415,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Numero"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -477,10 +476,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -535,6 +533,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Utente creazione"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -576,10 +578,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location,right:"
@@ -627,10 +628,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -725,10 +725,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -800,10 +799,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -854,10 +852,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Prodotto"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -894,10 +891,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -991,10 +987,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1101,10 +1096,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1212,10 +1206,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1336,10 +1329,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1451,10 +1443,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1515,6 +1506,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 572b6ef11c..9d0d9dbe3c 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -160,7 +164,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
@@ -228,7 +232,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
@@ -276,7 +280,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
@@ -312,7 +316,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -382,7 +386,7 @@ msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory,state:"
@@ -437,7 +441,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -484,6 +488,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,7 +529,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location,right:"
@@ -566,7 +574,7 @@ msgid "Lead Time"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -653,7 +661,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.move,shipment:"
@@ -717,7 +725,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period,state:"
@@ -764,7 +772,7 @@ msgid "Product"
 msgstr "Products"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
@@ -796,7 +804,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -882,7 +890,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
@@ -981,7 +989,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1080,7 +1088,7 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1191,7 +1199,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
@@ -1294,7 +1302,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
@@ -1353,6 +1361,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index de5d4e8f1d..da0554e08d 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -162,10 +166,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -239,10 +242,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +295,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ເລດລຳດັບ"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +337,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -416,10 +416,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "ເລກທີ"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -476,10 +475,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -534,6 +532,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -574,10 +576,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -625,10 +626,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -724,10 +724,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -796,8 +795,8 @@ msgid "ID"
 msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -845,10 +844,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -884,10 +882,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -980,10 +977,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1090,10 +1086,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1201,10 +1196,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1324,10 +1318,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1438,10 +1431,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1502,6 +1494,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index c8ff49082b..d36ed11fbb 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -158,10 +162,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -227,10 +230,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -276,10 +278,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -313,10 +314,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -382,10 +382,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -435,10 +434,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -484,6 +482,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,10 +523,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -566,10 +567,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -651,10 +651,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -716,10 +715,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -761,10 +759,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -794,10 +791,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -879,10 +875,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -976,10 +971,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1073,10 +1067,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,10 +1175,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1283,10 +1275,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1334,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 6d4310f871..ca44da43f1 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -161,10 +165,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -238,10 +241,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -292,10 +294,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -335,10 +336,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -413,10 +413,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Nummer"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -475,10 +474,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -533,6 +531,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Gebruiker"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -574,10 +576,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location,right:"
@@ -626,10 +627,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -726,10 +726,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -802,10 +801,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -855,10 +853,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Producten"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -895,10 +892,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -993,10 +989,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1104,10 +1099,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1215,10 +1209,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1339,10 +1332,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1455,10 +1447,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1520,6 +1511,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 47997650e1..28ef51a6f2 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -7,11 +7,13 @@ msgid ""
 "You cannot change the default uom for a product which is associated to stock"
 " moves."
 msgstr ""
+"Brak możliwości zmiany domyślnej jednostki miary dla produktu wykazującego "
+"ruch."
 
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
-msgstr ""
+msgstr "Brak możliwości zmiany typu dla produktu wykazującego ruch."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
@@ -35,6 +37,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +54,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -126,66 +132,54 @@ msgctxt "field:party.address,delivery:"
 msgid "Delivery"
 msgstr "Dostawa"
 
-#, fuzzy
 msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Lokalizacja klienta"
 
-#, fuzzy
 msgctxt "field:party.party,locations:"
 msgid "Locations"
 msgstr "Lokalizacje"
 
-#, fuzzy
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lokalizacja dostawcy"
 
-#, fuzzy
 msgctxt "field:party.party.location,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:party.party.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:party.party.location,customer_location:"
 msgid "Customer Location"
 msgstr "Lokalizacja klienta"
 
-#, fuzzy
 msgctxt "field:party.party.location,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:party.party.location,party:"
 msgid "Party"
-msgstr ""
+msgstr "Strona"
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
-#, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lokalizacja dostawcy"
 
-#, fuzzy
 msgctxt "field:party.party.location,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:party.party.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "Na dzień"
@@ -194,14 +188,13 @@ msgctxt "field:product.by_location.context,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,stock_date_end:"
 msgid "At Date"
 msgstr "Na dzień"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "field:product.product,forecast_quantity:"
@@ -214,7 +207,7 @@ msgstr "Ilość"
 
 msgctxt "field:product.template,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "field:product.template,forecast_quantity:"
@@ -241,10 +234,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -252,7 +244,7 @@ msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_sequence:"
 msgid "Supplier Shipment Sequence"
-msgstr ""
+msgstr "Sekwencja wysyłki od dostawcy"
 
 msgctxt "field:stock.configuration,shipment_internal_sequence:"
 msgid "Internal Shipment Sequence"
@@ -278,56 +270,46 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,company:"
 msgid "Company"
 msgstr "Firma"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,id:"
 msgid "ID"
 msgstr "ID"
@@ -336,10 +318,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -361,12 +342,10 @@ msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
@@ -408,8 +387,8 @@ msgid "Number"
 msgstr "Numer"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -448,10 +427,9 @@ msgctxt "field:stock.inventory.line,inventory_state:"
 msgid "Inventory State"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.inventory.line,product:"
 msgid "Product"
@@ -462,16 +440,16 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
-msgstr ""
+msgstr "Cyfry jednostki"
 
 msgctxt "field:stock.inventory.line,uom:"
 msgid "UOM"
-msgstr "Jednostka miary"
+msgstr "Jm"
 
 msgctxt "field:stock.inventory.line,write_date:"
 msgid "Write Date"
@@ -491,7 +469,7 @@ msgstr "Adres"
 
 msgctxt "field:stock.location,childs:"
 msgid "Children"
-msgstr "Elementy podrzędne"
+msgstr "Lokalizacje podrzędne"
 
 msgctxt "field:stock.location,code:"
 msgid "Code"
@@ -499,7 +477,7 @@ msgstr "Kod"
 
 msgctxt "field:stock.location,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 msgctxt "field:stock.location,create_date:"
 msgid "Create Date"
@@ -509,6 +487,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Ilość przewidywana"
@@ -517,14 +499,13 @@ msgctxt "field:stock.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.location,input_location:"
 msgid "Input"
 msgstr "Wejście"
 
 msgctxt "field:stock.location,left:"
 msgid "Left"
-msgstr ""
+msgstr "W lewo"
 
 msgctxt "field:stock.location,name:"
 msgid "Name"
@@ -532,11 +513,11 @@ msgstr "Nazwa"
 
 msgctxt "field:stock.location,output_location:"
 msgid "Output"
-msgstr ""
+msgstr "Wyjście"
 
 msgctxt "field:stock.location,parent:"
 msgid "Parent"
-msgstr "Element nadrzędny"
+msgstr "Lokalizacje nadrzędne"
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
@@ -547,12 +528,12 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
-msgstr ""
+msgstr "W prawo"
 
 msgctxt "field:stock.location,storage_location:"
 msgid "Storage"
@@ -560,7 +541,7 @@ msgstr ""
 
 msgctxt "field:stock.location,type:"
 msgid "Location type"
-msgstr ""
+msgstr "Typ lokalizacji"
 
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
@@ -588,25 +569,23 @@ msgstr "ID"
 
 msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
-msgstr ""
+msgstr "Czas przesunięcia"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
-msgstr "Kolejność"
+msgstr "Sekwencja"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_from:"
 msgid "Warehouse From"
-msgstr "Warehouse"
+msgstr "Z magazynu"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_to:"
 msgid "Warehouse To"
-msgstr "Warehouse"
+msgstr "Do magazynu"
 
 msgctxt "field:stock.location.lead_time,write_date:"
 msgid "Write Date"
@@ -626,7 +605,7 @@ msgstr "Firma"
 
 msgctxt "field:stock.move,cost_price:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Cena kosztów"
 
 msgctxt "field:stock.move,create_date:"
 msgid "Create Date"
@@ -642,9 +621,8 @@ msgstr "Waluta"
 
 msgctxt "field:stock.move,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
-#, fuzzy
 msgctxt "field:stock.move,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -659,7 +637,7 @@ msgstr ""
 
 msgctxt "field:stock.move,origin:"
 msgid "Origin"
-msgstr "Pochodzenie"
+msgstr "Źródło"
 
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
@@ -671,32 +649,31 @@ msgstr "Produkt"
 
 msgctxt "field:stock.move,product_uom_category:"
 msgid "Product Uom Category"
-msgstr ""
+msgstr "Kategoria jm produktu"
 
 msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
-msgstr ""
+msgstr "Wysyłka"
 
 msgctxt "field:stock.move,state:"
 msgid "State"
 msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.move,to_location:"
 msgid "To Location"
 msgstr "Do lokalizacji"
 
 msgctxt "field:stock.move,unit_digits:"
 msgid "Unit Digits"
-msgstr ""
+msgstr "Cyfry jednostki"
 
 msgctxt "field:stock.move,unit_price:"
 msgid "Unit Price"
@@ -704,11 +681,11 @@ msgstr "Cena jednostkowa"
 
 msgctxt "field:stock.move,unit_price_required:"
 msgid "Unit Price Required"
-msgstr ""
+msgstr "Wymagana cena jednostkowa"
 
 msgctxt "field:stock.move,uom:"
 msgid "Uom"
-msgstr "Jednostka miary"
+msgstr "Jm"
 
 msgctxt "field:stock.move,write_date:"
 msgid "Write Date"
@@ -743,8 +720,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -787,8 +764,8 @@ msgid "Product"
 msgstr "Produkt"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -819,8 +796,8 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -868,11 +845,11 @@ msgstr "Utworzył"
 
 msgctxt "field:stock.shipment.in,done_by:"
 msgid "Done By"
-msgstr ""
+msgstr "Wykonano przez"
 
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
 msgctxt "field:stock.shipment.in,id:"
 msgid "ID"
@@ -886,17 +863,14 @@ msgctxt "field:stock.shipment.in,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -906,8 +880,8 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -915,7 +889,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.in,state:"
 msgid "State"
@@ -975,9 +949,8 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -986,16 +959,14 @@ msgctxt "field:stock.shipment.in.return,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -1005,12 +976,12 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
@@ -1020,7 +991,6 @@ msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Dostawca"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Do lokalizacji"
@@ -1037,10 +1007,9 @@ msgctxt "field:stock.shipment.in.return.assign.failed,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.internal,assigned_by:"
 msgid "Received By"
@@ -1064,13 +1033,12 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
 msgctxt "field:stock.shipment.internal,effective_start_date:"
 msgid "Effective Start Date"
-msgstr ""
+msgstr "Rzeczywista data rozpoczęcia"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -1083,10 +1051,9 @@ msgctxt "field:stock.shipment.internal,incoming_moves:"
 msgid "Incoming Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
@@ -1105,12 +1072,12 @@ msgid "Planned Start Date"
 msgstr "Zaplanowana data rozpoczęcia"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.internal,shipped_by:"
 msgid "Shipped By"
@@ -1140,10 +1107,9 @@ msgctxt "field:stock.shipment.internal.assign.failed,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out,assigned_by:"
 msgid "Assigned By"
@@ -1179,7 +1145,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Rzeczywista data"
 
 msgctxt "field:stock.shipment.out,id:"
 msgid "ID"
@@ -1189,10 +1155,9 @@ msgctxt "field:stock.shipment.out,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
@@ -1215,12 +1180,12 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.out,state:"
 msgid "State"
@@ -1268,11 +1233,11 @@ msgstr "Utworzył"
 
 msgctxt "field:stock.shipment.out.return,customer:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "field:stock.shipment.out.return,customer_location:"
 msgid "Customer Location"
-msgstr "Lokalizacja klienta"
+msgstr "Lokalizacja odbiorcy"
 
 msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
@@ -1284,7 +1249,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Rzeczywista data"
 
 msgctxt "field:stock.shipment.out.return,id:"
 msgid "ID"
@@ -1298,16 +1263,14 @@ msgctxt "field:stock.shipment.out.return,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -1317,8 +1280,8 @@ msgid "Planned Date"
 msgstr "Planowana data"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1326,7 +1289,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.out.return,state:"
 msgid "State"
@@ -1375,6 +1338,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
@@ -1388,7 +1355,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
-msgstr "Inventories"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
@@ -1396,11 +1363,11 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations Quantity"
-msgstr "Locations Quantity"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
@@ -1408,7 +1375,7 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
@@ -1424,43 +1391,43 @@ msgstr "Produkty"
 
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Supplier Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Internal Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Customer Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
-msgstr "Restocking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
@@ -1468,27 +1435,27 @@ msgstr "List przewozowy"
 
 msgctxt "model:ir.action,name:report_shipment_out_picking_list"
 msgid "Picking List"
-msgstr "Picking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_out_return_restocking_list"
 msgid "Restocking List"
-msgstr "Restocking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_recompute_cost_price"
 msgid "Recompute Cost Price"
-msgstr "Recompute Cost Price"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_in_return_assign"
 msgid "Assign Purchase Return Shipment"
-msgstr "Assign Purchase Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_internal_assign"
 msgid "Assign Shipment Internal"
-msgstr "Assign Shipment Internal"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Assign Shipment Out"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
@@ -1497,7 +1464,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
 msgid "All"
@@ -1511,12 +1478,12 @@ msgstr "Od dostawców"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
 msgid "From Suppliers Waiting"
-msgstr "From Suppliers Waiting"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
 msgid "To Customers"
-msgstr "Do klientów"
+msgstr "Do odbiorców"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
@@ -1526,7 +1493,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
@@ -1541,12 +1508,12 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
@@ -1561,12 +1528,12 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
@@ -1576,7 +1543,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
-msgstr "Shipped"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
@@ -1591,17 +1558,17 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
 msgid "Packed"
-msgstr "Packed"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
@@ -1616,7 +1583,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
@@ -1625,51 +1592,51 @@ msgstr "Otrzymany"
 
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
-msgstr "Inventory"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Supplier Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Supplier Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr "Customer Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Customer Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
-msgstr "Inventory"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Supplier Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Supplier Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr "Customer Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Customer Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
@@ -1677,7 +1644,7 @@ msgstr "Konfiguracja"
 
 msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
-msgstr "Inventories"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
@@ -1685,15 +1652,15 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
-msgstr "Locations"
+msgstr "Lokalizacje"
 
 msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
@@ -1701,39 +1668,39 @@ msgstr "Okresy"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
-msgstr "Reporting"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Supplier Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Internal Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Customer Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
-msgstr "Inventory & Stock"
+msgstr "Magazyn"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:party.party.location,name:"
 msgid "Party Location"
-msgstr ""
+msgstr "Lokalizacja strony"
 
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1741,20 +1708,19 @@ msgstr "Produkt wg lokalizacji"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
-msgstr "Stock"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_admin"
 msgid "Stock Administration"
-msgstr "Stock Administration"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_force_assignment"
 msgid "Stock Force Assignment"
-msgstr "Stock Force Assignment"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:stock.configuration.location,name:"
 msgid "Stock Configuration Location"
@@ -1778,11 +1744,11 @@ msgstr ""
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "model:stock.location,name:location_input"
 msgid "Input Zone"
-msgstr "Input Zone"
+msgstr "Strefa wejścia"
 
 msgctxt "model:stock.location,name:location_lost_found"
 msgid "Lost and Found"
@@ -1790,11 +1756,11 @@ msgstr "Zgubione i znalezione"
 
 msgctxt "model:stock.location,name:location_output"
 msgid "Output Zone"
-msgstr "Output Zone"
+msgstr "Strefa wyjścia"
 
 msgctxt "model:stock.location,name:location_storage"
 msgid "Storage Zone"
-msgstr "Storage Zone"
+msgstr "Strefa magazynowania"
 
 msgctxt "model:stock.location,name:location_supplier"
 msgid "Supplier"
@@ -1802,16 +1768,15 @@ msgstr "Dostawca"
 
 msgctxt "model:stock.location,name:location_transit"
 msgid "Transit"
-msgstr "Transit"
+msgstr ""
 
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
 msgstr "Magazyn"
 
-#, fuzzy
 msgctxt "model:stock.location.lead_time,name:"
 msgid "Location Lead Time"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1903,7 +1868,7 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 #, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
@@ -1912,7 +1877,7 @@ msgstr "Restocking List"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1961,11 +1926,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1981,7 +1946,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
-msgstr "Kod klienta:"
+msgstr "Kod odbiorcy:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
@@ -2001,11 +1966,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
-msgstr ""
+msgstr "Numer wysyłki:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
@@ -2017,7 +1982,7 @@ msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
-msgstr "Klient:"
+msgstr "Odbiorca:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
@@ -2042,11 +2007,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -2066,7 +2031,7 @@ msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
@@ -2090,7 +2055,7 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
@@ -2099,7 +2064,7 @@ msgstr "Restocking List"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
-msgstr ""
+msgstr "Wysyłka"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
@@ -2111,31 +2076,31 @@ msgstr "Magazyn:"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.location,type:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
@@ -2167,19 +2132,19 @@ msgstr "Magazyn"
 
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.move,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.move,state:"
 msgid "Staging"
@@ -2187,23 +2152,23 @@ msgstr ""
 
 msgctxt "selection:stock.period,state:"
 msgid "Closed"
-msgstr "Zamknięty"
+msgstr "Zamknięto"
 
 msgctxt "selection:stock.period,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Received"
@@ -2211,19 +2176,19 @@ msgstr "Odebrany"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Waiting"
@@ -2231,19 +2196,19 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Request"
@@ -2260,19 +2225,19 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
@@ -2285,15 +2250,15 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
@@ -2306,7 +2271,7 @@ msgstr "Stock"
 
 msgctxt "view:product.product:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "view:stock.configuration:"
@@ -2315,7 +2280,7 @@ msgstr "Inventory"
 
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr ""
+msgstr "Wysyłki"
 
 msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
@@ -2339,7 +2304,7 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Wykonaj"
 
 #, fuzzy
 msgctxt "view:stock.move:"
@@ -2352,7 +2317,7 @@ msgstr "Zamknij"
 
 msgctxt "view:stock.period:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to assign those products:"
@@ -2368,15 +2333,15 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
@@ -2388,7 +2353,7 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
@@ -2400,7 +2365,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.in:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
@@ -2408,7 +2373,7 @@ msgstr "Odbierz"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
-msgstr "Przywróć do szkicu"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to assign those products:"
@@ -2424,15 +2389,15 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
@@ -2452,11 +2417,11 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Incoming Moves"
@@ -2468,7 +2433,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 #, fuzzy
 msgctxt "view:stock.shipment.out.return:"
@@ -2485,11 +2450,11 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
@@ -2497,7 +2462,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9c27437186..b0add71fea 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -43,6 +43,10 @@ msgstr ""
 "A localização \"%s\" com movimentações existentes não pode ser modificada "
 "para um tipo que não suporta movimentações."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "A localização '%(location)s' deve estar vazia para ser desativada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "A quantidade na movimentação interna deve ser um valor positivo"
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "A origem e o destino devem ser diferentes"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "A movimentação de estoque \"%s\" não tem origem."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "As movimentações de estoque \"%s\" não têm origem."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Você não pode apagar a movimentação de estoque \"%s\" porque ela não está no"
-" estado \"Rascunho\" ou \"Cancelado\"."
+" estado Em processamento, Rascunho ou Cancelado."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -186,8 +190,8 @@ msgid "Party"
 msgstr "Pessoa"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -254,8 +258,8 @@ msgid "Inventory Sequence"
 msgstr "Sequência do Inventário"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -302,8 +306,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -338,8 +342,8 @@ msgid "Inventory Sequence"
 msgstr "Sequência de Inventório"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -406,8 +410,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -458,8 +462,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -505,6 +509,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Filhos planificados"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantidade Prevista"
@@ -542,8 +550,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -586,8 +594,8 @@ msgid "Lead Time"
 msgstr "Tempo de Espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -670,8 +678,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -734,8 +742,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -778,8 +786,8 @@ msgid "Product"
 msgstr "Produto"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -810,8 +818,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -894,8 +902,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -990,8 +998,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1086,8 +1094,8 @@ msgid "Planned Start Date"
 msgstr "Data Planejada de Início"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1194,8 +1202,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1294,8 +1302,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1355,6 +1363,10 @@ msgstr ""
 "* Um valor vazio é uma data infinita no futuro.\n"
 "* Uma data no passado fornecerá valores do histórico."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marque para restringir os níveis dos filhos a um nível."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Se vazio, o armazém é usado"
diff --git a/locale/ru.po b/locale/ru.po
index cbf483dd6f..4756b05b9d 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -44,6 +44,10 @@ msgstr ""
 "Местоположение \"%s\" с существующими перемещениями не может быть изменено "
 "на тип который не поддерживает перемещения."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Внутреннее перемещение должно быть положительным числом"
@@ -57,13 +61,14 @@ msgid "Source and destination location must be different"
 msgstr "Исходное и принимающее местоположения должны быть разными"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Вы не можете удалить перемещение \"%s\" так как оно не в состоянии "
 "\"Черновик\" или \"Отменено\"."
@@ -180,10 +185,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
@@ -254,8 +258,8 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -304,10 +308,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -347,10 +350,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -425,8 +427,8 @@ msgid "Number"
 msgstr "Номер"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -478,8 +480,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -525,6 +527,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Создано пользователем"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Прогноз количества"
@@ -562,8 +568,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -609,10 +615,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -700,8 +705,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -764,8 +769,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -808,8 +813,8 @@ msgid "Product"
 msgstr "Продукт"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -840,8 +845,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -929,8 +934,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1028,8 +1033,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1128,8 +1133,8 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1238,8 +1243,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1340,8 +1345,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1402,6 +1407,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index daf094a421..bd7fc8a8a5 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -39,6 +39,10 @@ msgstr ""
 "Lokacije \"%s\" z obstoječim prometom ni možno pretvoriti v lokacijo, ki ne "
 "podpira prometa."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Količina notranjega prometa mora biti večja od nič."
@@ -51,14 +55,16 @@ msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
 msgstr "Izvorna in ciljna lokacija mora biti različni."
 
+#, fuzzy
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr "Promet zaloge \"%s\" nima porekla."
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Prometa zaloge \"%s\" ni možno brisati, ker niso v stanju priprave ali "
 "preklica."
@@ -174,8 +180,8 @@ msgid "Party"
 msgstr "Partner"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -242,8 +248,8 @@ msgid "Inventory Sequence"
 msgstr "Štetje inventur"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -290,8 +296,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -326,8 +332,8 @@ msgid "Inventory Sequence"
 msgstr "Štetje inventur"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -394,8 +400,8 @@ msgid "Number"
 msgstr "Številka"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -446,8 +452,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -493,6 +499,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Predvidena količina"
@@ -530,8 +540,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -574,8 +584,8 @@ msgid "Lead Time"
 msgstr "Dobavni rok"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -658,8 +668,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -722,8 +732,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -766,8 +776,8 @@ msgid "Product"
 msgstr "Izdelek"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -798,8 +808,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -882,8 +892,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -978,8 +988,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1074,8 +1084,8 @@ msgid "Planned Start Date"
 msgstr "Načrtovan začetek"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,8 +1192,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1282,8 +1292,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1353,10 @@ msgstr ""
 "* Prazno polje pomeni neskončno v prihodnost.\n"
 "* Pretekli datum daje zgodovino zaloge."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Če je prazno, se uporabi Shramba"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 4709715d89..617294b999 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -161,10 +165,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -236,10 +239,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -290,10 +292,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -332,10 +333,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -407,10 +407,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -466,10 +465,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -522,6 +520,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "添加用户"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -561,10 +563,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -611,10 +612,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -702,10 +702,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -774,10 +773,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -825,10 +823,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -864,10 +861,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -956,10 +952,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1059,10 +1054,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1163,10 +1157,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1279,10 +1272,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1387,10 +1379,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1450,6 +1441,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""