diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 1b4d7388d3..4b362c35ef 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -18,13 +18,33 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
-msgctxt "field:product.template,expiration_state:"
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
 msgid "Expiration State"
+msgstr "Крайна дата"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Крайна дата"
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
 msgstr ""
 
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template,expiration_state:"
+msgid "Expiration State"
+msgstr "Крайна дата"
+
+#, fuzzy
 msgctxt "field:product.template,expiration_time:"
 msgid "Expiration Time"
-msgstr ""
+msgstr "Крайна дата"
 
 msgctxt "field:product.template,shelf_life_state:"
 msgid "Shelf Life Time State"
@@ -43,9 +63,10 @@ msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
 msgstr "Крайна дата"
 
+#, fuzzy
 msgctxt "field:stock.lot,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+msgstr "Крайна дата"
 
 msgctxt "field:stock.lot,shelf_life_expiration_date:"
 msgid "Shelf Life Expiration Date"
@@ -55,6 +76,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "В брой дни"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "В брой дни"
+
 #, fuzzy
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
@@ -73,6 +104,34 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Няма"
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Задължителен"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Няма"
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Задължителен"
+
 #, fuzzy
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 13bfbe72c9..0da25b379d 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -22,6 +22,26 @@ msgstr ""
 "No podeu tancar un període abans de la data de caducitat \"%(date)s\" del "
 "lot \"%(lot)s\"."
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estat caducitat"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Temps a caducar"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estat vida útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Temps vida útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estat caducitat"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estat caducitat"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En nombre de dies."
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En nombre de dies."
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En nombre de dies."
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forçar caducitats a logística"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Cap"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Obligatori"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Cap"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Obligatori"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Cap"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 0edd0c6de7..b34a597daa 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -18,6 +18,22 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr ""
@@ -54,6 +70,14 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr ""
@@ -70,6 +94,30 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 82e3d41a55..bbc60681cc 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -23,6 +23,26 @@ msgstr ""
 "Die Lagerperiode kann nicht vor dem Ablaufdatum \"%(date)s\" der Charge "
 "\"%(lot)s\" geschlossen werden"
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Ablaufstatus"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Ablaufzeit"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Lagerzeitstatus"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Lagerzeit"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Ablaufstatus"
@@ -59,6 +79,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Lagerzeit Ablaufdatum"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "In Anzahl von Tagen"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "In Anzahl von Tagen"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "In Anzahl von Tagen"
@@ -77,6 +107,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Lager Ablauferzwingung"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Keiner"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Optional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Erforderlich"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Keiner"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Optional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Erforderlich"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Keiner"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 25ae996dd0..98745e1afb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -22,6 +22,26 @@ msgstr ""
 "No puede cerrar un período antes de la fecha de vencimiento de vida útil "
 "«%(date)s» del Lote «%(lot)s»"
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estado vencimiento"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Tiempo de vencimiento"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado período de vida útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Período de vida útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estado vencimiento"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado vencimiento de vida útil"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En número de días"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En número de días"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En número de días"
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Vencimiento forzado de existencia"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requerido"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requerido"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 29ab48b75e..e0787d10a2 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -22,6 +22,26 @@ msgstr ""
 "Usted no puede cerrar un periodo antes de la Fecha de "
 "Vencimiento\"%(date)s\" del Lote \"%(lot)s\""
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estado de Vencimiento"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Fecha de Vencimiento"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado de Fecha Vencimiento"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Tiempo de Vida Útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estado de Vencimiento"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado de Vida Útil"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En número de días."
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forzar Vencimiento de Inventario"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requerido"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requerido"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 3c6e7b8b75..a0bd7df90e 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -22,6 +22,26 @@ msgstr ""
 "No puede cerrar un período anterior a la fecha de caducidad de vida útil "
 "\"%(date)s\" del lote \"%(lot)s\"."
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estado de caducidad"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Tiempo de caducidad"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado de tiempo de vida útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Tiempo de vida útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estado de caducidad"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado de caducidad de vida útil"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En número de días"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En número de días"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En número de días"
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forzar caducidad de stock"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requerido"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requerido"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 951a76e84c..f18c031256 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -22,6 +22,26 @@ msgstr ""
 "No puede cerrar un período antes de la fecha de caducidad \"%(date)s\" del "
 "lote \"%(lot)s\"."
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estado caducidad"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Tiempo a caducar"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado vida útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Tiempo vida útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estado caducidad"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado caducidad"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En número de días."
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forzar caducidades en logística"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Obligatorio"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Obligatorio"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index dfbf63704b..d142441e26 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -22,6 +22,26 @@ msgstr ""
 "No puede cerrar un período antes de la fecha de caducidad \"%(date)s\" del "
 "lote \"%(lot)s\"."
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Estado caducidad"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Tiempo a caducar"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado vida útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Tiempo vida útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Estado caducidad"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado caducidad"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En número de días."
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En número de días."
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forzar caducidades en logística"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requerido"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Ninguno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requerido"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c643a00753..680e4e83f1 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -22,6 +22,26 @@ msgstr ""
 "Vous ne pouvez pas clôturer une période avant la date limite d'utilisation "
 "optimale « %(date)s » du lot « %(lot)s »"
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "État d'expiration"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Délai d'expiration"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "État de la durée limite d'utilisation optimale"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Durée limite d'utilisation optimale"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "État d'expiration"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Date limite d'utilisation optimale"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "En nombre de jours"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "En nombre de jours"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "En nombre de jours"
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Stock forcer l'expiration"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Aucune"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Optionnelle"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requis"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Aucune"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Optionnelle"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requis"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Aucune"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 0edd0c6de7..478ab9b43d 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -7,117 +7,181 @@ msgid ""
 "You can not modify the expiration dates of lot \"%(lot)s\" because it is "
 "used on a move \"%(move)s\" in a closed period"
 msgstr ""
+"A Charge \"%(lot)s\" lejárati dátuma nem módosítható, egy zárt raktár "
+"időszakban raktármozgás \"%(move)s\"  van."
 
 msgctxt "error:stock.move:"
 msgid "The lot \"%(lot)s\" on move \"%(move)s\" is expired"
-msgstr ""
+msgstr "A raktármozgás \"%(move)s\" Charge \"%(lot)s\"-ja lejárt."
 
 msgctxt "error:stock.period:"
 msgid ""
 "You can not close a period before the Shelf Live Expiration Date "
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
+"A raktár időszakot nem lehet a Charge \"%(lot)s\" lejárati dátuma "
+"\"%(date)s\" előtt bezárni."
+
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Lejárat dátuma"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Lejárat időpontja"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Raktáridő állapota"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Raktáridő"
 
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+msgstr "Lejárat dátuma"
 
 msgctxt "field:product.template,expiration_time:"
 msgid "Expiration Time"
-msgstr ""
+msgstr "Lejárat időpontja"
 
 msgctxt "field:product.template,shelf_life_state:"
 msgid "Shelf Life Time State"
-msgstr ""
+msgstr "Raktáridő állapota"
 
 msgctxt "field:product.template,shelf_life_time:"
 msgid "Shelf Life Time"
-msgstr ""
+msgstr "Raktáridő"
 
 msgctxt "field:stock.configuration,shelf_life_delay:"
 msgid "Shelf Life Delay"
-msgstr ""
+msgstr "Raktáridő várakozás időtartama"
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr ""
+msgstr "Lejárati dátuma"
 
 msgctxt "field:stock.lot,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+msgstr "Lejárati állapot"
 
 msgctxt "field:stock.lot,shelf_life_expiration_date:"
 msgid "Shelf Life Expiration Date"
-msgstr ""
+msgstr "Raktáridő lejárati dátum"
 
 msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
-msgstr ""
+msgstr "Raktáridő lejárati dátum"
+
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "Napok száma"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "Napok száma"
 
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
-msgstr ""
+msgstr "Napok száma"
 
 msgctxt "help:product.template,shelf_life_time:"
 msgid "In number of days"
-msgstr ""
+msgstr "Napok száma"
 
 msgctxt "help:stock.configuration,shelf_life_delay:"
 msgid "The delay in number of days before removal from the forecast"
-msgstr ""
+msgstr "Az előrelátható várakozási idő napokban az elérhetőségig."
 
 msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
-msgstr ""
+msgstr "Raktár időbeni lefutása"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Nincs"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcionális"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Szükséges"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Nincs"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcionális"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Szükséges"
 
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
 msgctxt "selection:product.template,expiration_state:"
 msgid "Optional"
-msgstr ""
+msgstr "Opcionális"
 
 msgctxt "selection:product.template,expiration_state:"
 msgid "Required"
-msgstr ""
+msgstr "Szükséges"
 
 msgctxt "selection:product.template,shelf_life_state:"
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
 msgctxt "selection:product.template,shelf_life_state:"
 msgid "Optional"
-msgstr ""
+msgstr "Opcionális"
 
 msgctxt "selection:product.template,shelf_life_state:"
 msgid "Required"
-msgstr ""
+msgstr "Szükséges"
 
 msgctxt "selection:stock.lot,expiration_state:"
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
 msgctxt "selection:stock.lot,expiration_state:"
 msgid "Optional"
-msgstr ""
+msgstr "Opcionális"
 
 msgctxt "selection:stock.lot,expiration_state:"
 msgid "Required"
-msgstr ""
+msgstr "Szükséges"
 
 msgctxt "selection:stock.lot,shelf_life_expiration_state:"
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
 msgctxt "selection:stock.lot,shelf_life_expiration_state:"
 msgid "Optional"
-msgstr ""
+msgstr "Opcionális"
 
 msgctxt "selection:stock.lot,shelf_life_expiration_state:"
 msgid "Required"
-msgstr ""
+msgstr "Szükséges"
 
 msgctxt "view:product.template:"
 msgid "Shelf Life"
-msgstr ""
+msgstr "Raktár idő"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0edd0c6de7..b34a597daa 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -18,6 +18,22 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr ""
@@ -54,6 +70,14 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr ""
@@ -70,6 +94,30 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 0edd0c6de7..b34a597daa 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -18,6 +18,22 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr ""
@@ -54,6 +70,14 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr ""
@@ -70,6 +94,30 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr ""
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000000..b34a597daa
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,171 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.lot:"
+msgid ""
+"You can not modify the expiration dates of lot \"%(lot)s\" because it is "
+"used on a move \"%(move)s\" in a closed period"
+msgstr ""
+
+msgctxt "error:stock.move:"
+msgid "The lot \"%(lot)s\" on move \"%(move)s\" is expired"
+msgstr ""
+
+msgctxt "error:stock.period:"
+msgid ""
+"You can not close a period before the Shelf Live Expiration Date "
+"\"%(date)s\" of Lot \"%(lot)s\""
+msgstr ""
+
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+msgctxt "field:product.template,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.template,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.template,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.template,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+msgctxt "field:stock.configuration,shelf_life_delay:"
+msgid "Shelf Life Delay"
+msgstr ""
+
+msgctxt "field:stock.lot,expiration_date:"
+msgid "Expiration Date"
+msgstr ""
+
+msgctxt "field:stock.lot,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:stock.lot,shelf_life_expiration_date:"
+msgid "Shelf Life Expiration Date"
+msgstr ""
+
+msgctxt "field:stock.lot,shelf_life_expiration_state:"
+msgid "Shelf Life Expiration State"
+msgstr ""
+
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.template,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.template,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:stock.configuration,shelf_life_delay:"
+msgid "The delay in number of days before removal from the forecast"
+msgstr ""
+
+msgctxt "model:res.group,name:group_stock_force_expiration"
+msgid "Stock Force Expiration"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "view:product.template:"
+msgid "Shelf Life"
+msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 0edd0c6de7..b34a597daa 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -18,6 +18,22 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr ""
@@ -54,6 +70,14 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr ""
@@ -70,6 +94,30 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index b97b25e994..705de0f969 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -18,6 +18,22 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr ""
@@ -54,6 +70,14 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr ""
@@ -70,6 +94,34 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Vereist"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Vereist"
+
 #, fuzzy
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 410aba34f8..d62c14efb8 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -22,6 +22,26 @@ msgstr ""
 "Você não pode fechar um período antes da data de expiração \"%(date)s\" do "
 "lote \"%(lot)s\""
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Data de Expiração"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Hora de Expiração"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Estado da Vida Útil"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Período de Vida Útil"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Data de Expiração"
@@ -58,6 +78,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Estado de Expiração da Vida Útil"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "Em número de dias"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "Em número de dias"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "Em número de dias"
@@ -74,6 +104,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Forçar a Expiração do Estoque"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Nenhum"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Requerido"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Nenhum"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Opcional"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Requerido"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Nenhum"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 649ecf9fa2..4b9c2c1bad 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -18,13 +18,33 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
-msgctxt "field:product.template,expiration_state:"
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
 msgid "Expiration State"
+msgstr "Дата окончания"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Дата окончания"
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
 msgstr ""
 
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template,expiration_state:"
+msgid "Expiration State"
+msgstr "Дата окончания"
+
+#, fuzzy
 msgctxt "field:product.template,expiration_time:"
 msgid "Expiration Time"
-msgstr ""
+msgstr "Дата окончания"
 
 msgctxt "field:product.template,shelf_life_state:"
 msgid "Shelf Life Time State"
@@ -43,9 +63,10 @@ msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
 msgstr "Дата окончания"
 
+#, fuzzy
 msgctxt "field:stock.lot,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+msgstr "Дата окончания"
 
 msgctxt "field:stock.lot,shelf_life_expiration_date:"
 msgid "Shelf Life Expiration Date"
@@ -55,6 +76,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr ""
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "После указанного количества дней"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "После указанного количества дней"
+
 #, fuzzy
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
@@ -73,6 +104,34 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr ""
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Отсутствует"
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Обязательный"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Отсутствует"
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Обязательный"
+
 #, fuzzy
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index da5c256cf9..01d9aef153 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -20,6 +20,26 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr "Obdobja ni mogoče zapreti pred rokom uporabe \"%(date)s\" šarže \"%(lot)s\""
 
+#, fuzzy
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr "Uporabnost"
+
+#, fuzzy
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr "Rok"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr "Trajanje"
+
+#, fuzzy
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr "Rok"
+
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
 msgstr "Uporabnost"
@@ -56,6 +76,16 @@ msgctxt "field:stock.lot,shelf_life_expiration_state:"
 msgid "Shelf Life Expiration State"
 msgstr "Trajanje"
 
+#, fuzzy
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr "V dnevih"
+
+#, fuzzy
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr "V dnevih"
+
 msgctxt "help:product.template,expiration_time:"
 msgid "In number of days"
 msgstr "V dnevih"
@@ -72,6 +102,36 @@ msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
 msgstr "Zaloga - rok uporabe"
 
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr "Brez"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr "Neobvezno"
+
+#, fuzzy
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr "Obvezno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr "Brez"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr "Neobvezno"
+
+#, fuzzy
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr "Obvezno"
+
 msgctxt "selection:product.template,expiration_state:"
 msgid "None"
 msgstr "Brez"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000000..b34a597daa
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,171 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:stock.lot:"
+msgid ""
+"You can not modify the expiration dates of lot \"%(lot)s\" because it is "
+"used on a move \"%(move)s\" in a closed period"
+msgstr ""
+
+msgctxt "error:stock.move:"
+msgid "The lot \"%(lot)s\" on move \"%(move)s\" is expired"
+msgstr ""
+
+msgctxt "error:stock.period:"
+msgid ""
+"You can not close a period before the Shelf Live Expiration Date "
+"\"%(date)s\" of Lot \"%(lot)s\""
+msgstr ""
+
+msgctxt "field:product.product,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.product,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.product,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+msgctxt "field:product.template,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:product.template,expiration_time:"
+msgid "Expiration Time"
+msgstr ""
+
+msgctxt "field:product.template,shelf_life_state:"
+msgid "Shelf Life Time State"
+msgstr ""
+
+msgctxt "field:product.template,shelf_life_time:"
+msgid "Shelf Life Time"
+msgstr ""
+
+msgctxt "field:stock.configuration,shelf_life_delay:"
+msgid "Shelf Life Delay"
+msgstr ""
+
+msgctxt "field:stock.lot,expiration_date:"
+msgid "Expiration Date"
+msgstr ""
+
+msgctxt "field:stock.lot,expiration_state:"
+msgid "Expiration State"
+msgstr ""
+
+msgctxt "field:stock.lot,shelf_life_expiration_date:"
+msgid "Shelf Life Expiration Date"
+msgstr ""
+
+msgctxt "field:stock.lot,shelf_life_expiration_state:"
+msgid "Shelf Life Expiration State"
+msgstr ""
+
+msgctxt "help:product.product,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.product,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.template,expiration_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:product.template,shelf_life_time:"
+msgid "In number of days"
+msgstr ""
+
+msgctxt "help:stock.configuration,shelf_life_delay:"
+msgid "The delay in number of days before removal from the forecast"
+msgstr ""
+
+msgctxt "model:res.group,name:group_stock_force_expiration"
+msgid "Stock Force Expiration"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.product,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.template,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:product.template,shelf_life_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:stock.lot,expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "Optional"
+msgstr ""
+
+msgctxt "selection:stock.lot,shelf_life_expiration_state:"
+msgid "Required"
+msgstr ""
+
+msgctxt "view:product.template:"
+msgid "Shelf Life"
+msgstr ""
diff --git a/setup.py b/setup.py
index c9b49c56c4..af5b5d8f54 100644
--- a/setup.py
+++ b/setup.py
@@ -83,6 +83,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',