diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 98%
rename from locale/bg_BG.po
rename to locale/bg.po
index 656536eb42..0925b45d30 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -32,9 +32,10 @@ msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
 msgstr "Мер. ед. за дължина"
 
+#, fuzzy
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Обем"
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -98,9 +99,10 @@ msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
 msgstr "Мер. ед. за дължина"
 
+#, fuzzy
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Обем"
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
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 e2907c4915..ae47287d89 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:product.product,height:"
 msgid "Height"
-msgstr "Altura"
+msgstr ""
 
 msgctxt "field:product.product,height_digits:"
 msgid "Height Digits"
@@ -16,7 +16,7 @@ msgstr "UdM de altura"
 
 msgctxt "field:product.product,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
 msgctxt "field:product.product,length_digits:"
 msgid "Length Digits"
@@ -28,7 +28,7 @@ msgstr "UdM de longitud"
 
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -40,7 +40,7 @@ msgstr "UdM de volumen"
 
 msgctxt "field:product.product,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.product,weight_digits:"
 msgid "Weight Digits"
@@ -52,7 +52,7 @@ msgstr "UdM de peso"
 
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
@@ -64,7 +64,7 @@ msgstr "UdM de ancho"
 
 msgctxt "field:product.template,height:"
 msgid "Height"
-msgstr "Altura"
+msgstr ""
 
 msgctxt "field:product.template,height_digits:"
 msgid "Height Digits"
@@ -76,7 +76,7 @@ msgstr "UdM de altura"
 
 msgctxt "field:product.template,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
 msgctxt "field:product.template,length_digits:"
 msgid "Length Digits"
@@ -88,7 +88,7 @@ msgstr "UdM de longitud"
 
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
@@ -100,7 +100,7 @@ msgstr "UdM de volumen"
 
 msgctxt "field:product.template,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.template,weight_digits:"
 msgid "Weight Digits"
@@ -112,7 +112,7 @@ msgstr "UdM de peso"
 
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b2decc4e21..0502af0b7d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -28,7 +28,7 @@ msgstr "UdM de Largo"
 
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -40,7 +40,7 @@ msgstr "UdM de Volumen"
 
 msgctxt "field:product.product,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.product,weight_digits:"
 msgid "Weight Digits"
@@ -52,7 +52,7 @@ msgstr "UdM de Peso"
 
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
@@ -88,7 +88,7 @@ msgstr "UdM de Largo"
 
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
@@ -100,7 +100,7 @@ msgstr "UdM de Volumen"
 
 msgctxt "field:product.template,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.template,weight_digits:"
 msgid "Weight Digits"
@@ -112,7 +112,7 @@ msgstr "UdM de Peso"
 
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"
@@ -124,4 +124,4 @@ msgstr "UdM de Ancho"
 
 msgctxt "view:product.template:"
 msgid "Measurements"
-msgstr "Medidas"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 31bc7cd31c..e96b69cff3 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -16,7 +16,7 @@ msgstr "UdM de alto"
 
 msgctxt "field:product.product,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
 msgctxt "field:product.product,length_digits:"
 msgid "Length Digits"
@@ -28,7 +28,7 @@ msgstr "UdM de longitud"
 
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -40,7 +40,7 @@ msgstr "UdM de volumen"
 
 msgctxt "field:product.product,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.product,weight_digits:"
 msgid "Weight Digits"
@@ -52,7 +52,7 @@ msgstr "UdM de peso"
 
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
@@ -76,7 +76,7 @@ msgstr "UdM de alto"
 
 msgctxt "field:product.template,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
 msgctxt "field:product.template,length_digits:"
 msgid "Length Digits"
@@ -88,7 +88,7 @@ msgstr "UdM de longitud"
 
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
@@ -100,7 +100,7 @@ msgstr "UdM de volumen"
 
 msgctxt "field:product.template,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.template,weight_digits:"
 msgid "Weight Digits"
@@ -112,7 +112,7 @@ msgstr "UdM de peso"
 
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"
@@ -124,4 +124,4 @@ msgstr "UdM de ancho"
 
 msgctxt "view:product.template:"
 msgid "Measurements"
-msgstr "Medidas"
+msgstr ""
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 012a669b0c..e96b69cff3 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -2,35 +2,29 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-#, fuzzy
 msgctxt "field:product.product,height:"
 msgid "Height"
-msgstr "Altura"
+msgstr "Alto"
 
-#, fuzzy
 msgctxt "field:product.product,height_digits:"
 msgid "Height Digits"
-msgstr "Decimales de la altura"
+msgstr "Decimales de alto"
 
-#, fuzzy
 msgctxt "field:product.product,height_uom:"
 msgid "Height Uom"
-msgstr "UdM de la altura"
+msgstr "UdM de alto"
 
-#, fuzzy
 msgctxt "field:product.product,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:product.product,length_digits:"
 msgid "Length Digits"
-msgstr "Decimales de la longitud"
+msgstr "Decimales de longitud"
 
-#, fuzzy
 msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
-msgstr "UdM de la longitud"
+msgstr "UdM de longitud"
 
 msgctxt "field:product.product,volume:"
 msgid "Volume"
@@ -38,65 +32,59 @@ msgstr ""
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
-msgstr ""
+msgstr "Decimales de volumen"
 
 msgctxt "field:product.product,volume_uom:"
 msgid "Volume Uom"
-msgstr ""
+msgstr "UdM de volumen"
 
-#, fuzzy
 msgctxt "field:product.product,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:product.product,weight_digits:"
 msgid "Weight Digits"
-msgstr "Decimales del peso"
+msgstr "Decimales de peso"
 
-#, fuzzy
 msgctxt "field:product.product,weight_uom:"
 msgid "Weight Uom"
-msgstr "UdM del peso"
+msgstr "UdM de peso"
 
-#, fuzzy
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
-msgstr "Decimales del ancho"
+msgstr "Decimales de ancho"
 
-#, fuzzy
 msgctxt "field:product.product,width_uom:"
 msgid "Width Uom"
-msgstr "UdM del ancho"
+msgstr "UdM de ancho"
 
 msgctxt "field:product.template,height:"
 msgid "Height"
-msgstr "Altura"
+msgstr "Alto"
 
 msgctxt "field:product.template,height_digits:"
 msgid "Height Digits"
-msgstr "Decimales de la altura"
+msgstr "Decimales de alto"
 
 msgctxt "field:product.template,height_uom:"
 msgid "Height Uom"
-msgstr "UdM de la altura"
+msgstr "UdM de alto"
 
 msgctxt "field:product.template,length:"
 msgid "Length"
-msgstr "Longitud"
+msgstr ""
 
 msgctxt "field:product.template,length_digits:"
 msgid "Length Digits"
-msgstr "Decimales de la longitud"
+msgstr "Decimales de longitud"
 
 msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
-msgstr "UdM de la longitud"
+msgstr "UdM de longitud"
 
 msgctxt "field:product.template,volume:"
 msgid "Volume"
@@ -104,35 +92,35 @@ msgstr ""
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
-msgstr ""
+msgstr "Decimales de volumen"
 
 msgctxt "field:product.template,volume_uom:"
 msgid "Volume Uom"
-msgstr ""
+msgstr "UdM de volumen"
 
 msgctxt "field:product.template,weight:"
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 msgctxt "field:product.template,weight_digits:"
 msgid "Weight Digits"
-msgstr "Decimales del peso"
+msgstr "Decimales de peso"
 
 msgctxt "field:product.template,weight_uom:"
 msgid "Weight Uom"
-msgstr "UdM del peso"
+msgstr "UdM de peso"
 
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr "Ancho"
+msgstr ""
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"
-msgstr "Decimales del ancho"
+msgstr "Decimales de ancho"
 
 msgctxt "field:product.template,width_uom:"
 msgid "Width Uom"
-msgstr "UdM del ancho"
+msgstr "UdM de ancho"
 
 msgctxt "view:product.template:"
 msgid "Measurements"
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 8696f8af48..caa11b5c8d 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -32,9 +32,10 @@ msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
 msgstr "Hossz mértékegysége"
 
+#, fuzzy
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Térfogat"
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -98,9 +99,10 @@ msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
 msgstr "Hossz mértékegysége"
 
+#, fuzzy
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Térfogat"
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 65bb21e7a3..a87b5d6531 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -50,9 +50,10 @@ msgctxt "field:product.product,weight_uom:"
 msgid "Weight Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr ""
+msgstr "Larghezza"
 
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
@@ -110,9 +111,10 @@ msgctxt "field:product.template,weight_uom:"
 msgid "Weight Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr ""
+msgstr "Larghezza"
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"
diff --git a/locale/lt_LT.po b/locale/lo.po
similarity index 90%
rename from locale/lt_LT.po
rename to locale/lo.po
index 65bb21e7a3..cf8545c066 100644
--- a/locale/lt_LT.po
+++ b/locale/lo.po
@@ -14,9 +14,10 @@ msgctxt "field:product.product,height_uom:"
 msgid "Height Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,length:"
 msgid "Length"
-msgstr ""
+msgstr "ຄວາມຍາວ"
 
 msgctxt "field:product.product,length_digits:"
 msgid "Length Digits"
@@ -26,9 +27,10 @@ msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "ບໍລິມາດ"
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -38,9 +40,10 @@ msgctxt "field:product.product,volume_uom:"
 msgid "Volume Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,weight:"
 msgid "Weight"
-msgstr ""
+msgstr "ນໍ້າໜັກ"
 
 msgctxt "field:product.product,weight_digits:"
 msgid "Weight Digits"
@@ -74,9 +77,10 @@ msgctxt "field:product.template,height_uom:"
 msgid "Height Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,length:"
 msgid "Length"
-msgstr ""
+msgstr "ຄວາມຍາວ"
 
 msgctxt "field:product.template,length_digits:"
 msgid "Length Digits"
@@ -86,9 +90,10 @@ msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "ບໍລິມາດ"
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
@@ -98,9 +103,10 @@ msgctxt "field:product.template,volume_uom:"
 msgid "Volume Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,weight:"
 msgid "Weight"
-msgstr ""
+msgstr "ນໍ້າໜັກ"
 
 msgctxt "field:product.template,weight_digits:"
 msgid "Weight Digits"
diff --git a/locale/lo_LA.po b/locale/lt.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 97%
rename from locale/nl_NL.po
rename to locale/nl.po
index 8d1f758973..eea67ce66d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl.po
@@ -28,9 +28,10 @@ msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -92,9 +93,10 @@ msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 97%
rename from locale/ru_RU.po
rename to locale/ru.po
index 7db4723843..19bf722724 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -28,9 +28,10 @@ msgctxt "field:product.product,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Объем"
 
 msgctxt "field:product.product,volume_digits:"
 msgid "Volume Digits"
@@ -92,9 +93,10 @@ msgctxt "field:product.template,length_uom:"
 msgid "Length Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,volume:"
 msgid "Volume"
-msgstr ""
+msgstr "Объем"
 
 msgctxt "field:product.template,volume_digits:"
 msgid "Volume Digits"
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
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 65bb21e7a3..8b80881cb4 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -50,9 +50,10 @@ msgctxt "field:product.product,weight_uom:"
 msgid "Weight Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,width:"
 msgid "Width"
-msgstr ""
+msgstr "宽"
 
 msgctxt "field:product.product,width_digits:"
 msgid "Width Digits"
@@ -110,9 +111,10 @@ msgctxt "field:product.template,weight_uom:"
 msgid "Weight Uom"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,width:"
 msgid "Width"
-msgstr ""
+msgstr "宽"
 
 msgctxt "field:product.template,width_digits:"
 msgid "Width Digits"