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 87%
rename from locale/de_DE.po
rename to locale/de.po
index 7289fbd2ef..6182154c36 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -19,7 +19,3 @@ msgstr "Anzahl FIFO"
 msgctxt "selection:product.template,cost_price_method:"
 msgid "FIFO"
 msgstr "FIFO"
-
-msgctxt "selection:product.product,cost_price_method:"
-msgid "FIFO"
-msgstr "FIFO"
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_EC.po b/locale/es_EC.po
index 889e705c12..e2dc786a5d 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 
 msgctxt "field:stock.move,fifo_quantity:"
 msgid "FIFO Quantity"
-msgstr "Cantidad FIFO"
+msgstr ""
 
 msgctxt "selection:product.template,cost_price_method:"
 msgid "FIFO"
-msgstr "FIFO"
+msgstr ""
diff --git a/locale/es_MX.po b/locale/es_MX.po
index d3d0bb1267..cf66e96e57 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -4,18 +4,18 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:stock.move:"
 msgid "FIFO quantity can not be greater than quantity."
-msgstr "Cantidad PEPS (FIFO) no puede ser mayor que cantidad."
+msgstr "Cantidad FIFO no puede ser mayor que la cantidad."
 
 msgctxt "error:stock.move:"
 msgid "You can not delete move \"%s\" that is used for FIFO cost price."
 msgstr ""
-"No puede eliminar el movimiento \"%s\" que está siendo usado por el precio "
-"de costo PEPS (FIFO)."
+"No puede eliminar el movimiento \"%s\" que está siendo utilizado por el "
+"costo FIFO."
 
 msgctxt "field:stock.move,fifo_quantity:"
 msgid "FIFO Quantity"
-msgstr "Cantidad PEPS (FIFO)"
+msgstr ""
 
 msgctxt "selection:product.template,cost_price_method:"
 msgid "FIFO"
-msgstr "PEPS (FIFO)"
+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/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