diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 100%
rename from locale/bg_BG.po
rename to locale/bg.po
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 100%
rename from locale/ca_ES.po
rename to locale/ca.po
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
rename from locale/cs_CZ.po
rename to locale/cs.po
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 100%
rename from locale/de_DE.po
rename to locale/de.po
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 100%
rename from locale/es_ES.po
rename to locale/es.po
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 679f714497..e07bee5871 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -10,9 +10,10 @@ msgctxt "field:stock.move,unit_shipment_cost:"
 msgid "Unit Shipment Cost"
 msgstr "Costo unitario de Remito"
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,carrier:"
 msgid "Carrier"
-msgstr "Transportista"
+msgstr "Transportistas"
 
 msgctxt "field:stock.shipment.in,cost:"
 msgid "Cost"
@@ -28,4 +29,4 @@ msgstr "Decimales de moneda del costo"
 
 msgctxt "selection:carrier,carrier_cost_allocation_method:"
 msgid "By Value"
-msgstr "Por valor"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/es_EC.po
index b0cbf51bca..c8e05678ae 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -28,4 +28,4 @@ msgstr "Decimales de moneda de costo"
 
 msgctxt "selection:carrier,carrier_cost_allocation_method:"
 msgid "By Value"
-msgstr "Por valor"
+msgstr ""
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 54a050f991..8d67384bc9 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:carrier,carrier_cost_allocation_method:"
 msgid "Carrier Cost Allocation Method"
-msgstr "Método de asignación del costo del transporte"
+msgstr "Método de asignación de costo de transporte"
 
 msgctxt "field:stock.move,unit_shipment_cost:"
 msgid "Unit Shipment Cost"
@@ -20,12 +20,12 @@ msgstr "Costo"
 
 msgctxt "field:stock.shipment.in,cost_currency:"
 msgid "Cost Currency"
-msgstr "Divisa del costo"
+msgstr "Divisa de costo"
 
 msgctxt "field:stock.shipment.in,cost_currency_digits:"
 msgid "Cost Currency Digits"
-msgstr "Decimales de la divisa de costo"
+msgstr "Decimales de divisa de costo"
 
 msgctxt "selection:carrier,carrier_cost_allocation_method:"
 msgid "By Value"
-msgstr "Por valor"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 100%
rename from locale/fr_FR.po
rename to locale/fr.po
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 426102fe22..00b64044f0 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -14,9 +14,10 @@ msgctxt "field:stock.shipment.in,carrier:"
 msgid "Carrier"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,cost:"
 msgid "Cost"
-msgstr ""
+msgstr "Költség"
 
 msgctxt "field:stock.shipment.in,cost_currency:"
 msgid "Cost Currency"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 426102fe22..e66639ee35 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -10,9 +10,10 @@ msgctxt "field:stock.move,unit_shipment_cost:"
 msgid "Unit Shipment Cost"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:stock.shipment.in,carrier:"
 msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
 
 msgctxt "field:stock.shipment.in,cost:"
 msgid "Cost"
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lo.po
diff --git a/locale/lt_LT.po b/locale/lt.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
rename from locale/nl_NL.po
rename to locale/nl.po
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 100%
rename from locale/ru_RU.po
rename to locale/ru.po
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po