diff --git a/locale/es_419.po b/locale/es_419.po
new file mode 100644
index 0000000000..1aab5baf06
--- /dev/null
+++ b/locale/es_419.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 "Stock Force Expiration"
+
+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/ja_JP.po b/locale/ja_JP.po
index b34a597daa..1aab5baf06 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -92,7 +92,7 @@ msgstr ""
 
 msgctxt "model:res.group,name:group_stock_force_expiration"
 msgid "Stock Force Expiration"
-msgstr ""
+msgstr "Stock Force Expiration"
 
 msgctxt "selection:product.product,expiration_state:"
 msgid "None"
diff --git a/locale/pl.po b/locale/pl.po
new file mode 100644
index 0000000000..1aab5baf06
--- /dev/null
+++ b/locale/pl.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 "Stock Force Expiration"
+
+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/zh_CN.po b/locale/zh_CN.po
index 3ffb54daf5..dcac26c7f9 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -18,13 +18,15 @@ msgid ""
 "\"%(date)s\" of Lot \"%(lot)s\""
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.product,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+msgstr "失效日期"
 
+#, fuzzy
 msgctxt "field:product.product,expiration_time:"
 msgid "Expiration Time"
-msgstr ""
+msgstr "失效日期"
 
 msgctxt "field:product.product,shelf_life_state:"
 msgid "Shelf Life Time State"
@@ -34,13 +36,15 @@ msgctxt "field:product.product,shelf_life_time:"
 msgid "Shelf Life Time"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.template,expiration_state:"
 msgid "Expiration State"
-msgstr ""
+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"
@@ -59,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"
diff --git a/setup.py b/setup.py
index af5b5d8f54..738c080ce2 100644
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,7 @@ setup(name=name,
         'Natural Language :: German',
         'Natural Language :: Hungarian',
         'Natural Language :: Italian',
+        'Natural Language :: Polish',
         'Natural Language :: Portuguese (Brazilian)',
         'Natural Language :: Russian',
         'Natural Language :: Slovenian',