[MERGE] forward port of branch 9.0 up to bfbe2d6

# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po

5 files changed, 15 insertions, 13 deletions

diff --git a/addons/pos_cache/i18n/de.po b/addons/pos_cache/i18n/de.po
index 5ccf4d2f81c..89252fb85c1 100644
--- a/addons/pos_cache/i18n/de.po
+++ b/addons/pos_cache/i18n/de.po
@@ -3,14 +3,15 @@
 # * pos_cache
 # 
 # Translators:
+# Thorsten Vocks <thorsten.vocks@openbig.org>, 2016
 # Wolfgang Taferner, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-01-16 10:13+0000\n"
-"Last-Translator: Wolfgang Taferner\n"
+"PO-Revision-Date: 2016-06-09 16:13+0000\n"
+"Last-Translator: Thorsten Vocks <thorsten.vocks@openbig.org>\n"
 "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Cache"
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_compute_user_id
 msgid "Cache compute user"
-msgstr ""
+msgstr "Benutzer im Cache-Speicher halten"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_config_cache_ids
diff --git a/addons/pos_cache/i18n/es_PE.po b/addons/pos_cache/i18n/es_PE.po
index 6ce1ce6d609..844290cc1d0 100644
--- a/addons/pos_cache/i18n/es_PE.po
+++ b/addons/pos_cache/i18n/es_PE.po
@@ -3,13 +3,14 @@
 # * pos_cache
 # 
 # Translators:
+# Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 12:42+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2016-06-09 23:12+0000\n"
+"Last-Translator: Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/odoo/odoo-9/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +71,7 @@ msgstr "Última Actualización por"
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_write_date
 msgid "Last Updated on"
-msgstr "Ultima Actualización"
+msgstr "Ultima Actualización en"
 
 #. module: pos_cache
 #. openerp-web
diff --git a/addons/pos_cache/i18n/hu.po b/addons/pos_cache/i18n/hu.po
index fe6be3bcf07..1a62cad22f4 100644
--- a/addons/pos_cache/i18n/hu.po
+++ b/addons/pos_cache/i18n/hu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-04-12 10:04+0000\n"
+"PO-Revision-Date: 2016-06-06 19:55+0000\n"
 "Last-Translator: krnkris\n"
 "Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr "Utoljára frissítve, által"
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_write_date
 msgid "Last Updated on"
-msgstr "Utoljára frissítve ekkor"
+msgstr "Utoljára frissítve "
 
 #. module: pos_cache
 #. openerp-web
diff --git a/addons/pos_cache/i18n/pl.po b/addons/pos_cache/i18n/pl.po
index 708c4a6a08b..555e7e12499 100644
--- a/addons/pos_cache/i18n/pl.po
+++ b/addons/pos_cache/i18n/pl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-06-03 10:49+0000\n"
+"PO-Revision-Date: 2016-06-08 12:08+0000\n"
 "Last-Translator: Piotr Szlązak <szlazakpiotr@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -93,12 +93,12 @@ msgstr ""
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_product_fields
 msgid "Product fields"
-msgstr ""
+msgstr "Pola produktu"
 
 #. module: pos_cache
 #: model:ir.ui.view,arch_db:pos_cache.view_pos_config_form
 msgid "Recompute cache"
-msgstr ""
+msgstr "Przelicz ponownie gotówkę"
 
 #. module: pos_cache
 #: model:ir.model,name:pos_cache.model_pos_cache
diff --git a/addons/pos_cache/i18n/tr.po b/addons/pos_cache/i18n/tr.po
index 32e049518a3..f5c4bbb6339 100644
--- a/addons/pos_cache/i18n/tr.po
+++ b/addons/pos_cache/i18n/tr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-05-29 11:21+0000\n"
+"PO-Revision-Date: 2016-06-09 19:01+0000\n"
 "Last-Translator: AYHAN KIZILTAN <akiziltan76@hotmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/odoo/odoo-9/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_config_cache_ids
 msgid "Cache ids"
-msgstr ""
+msgstr "Önbellek kimlikleri"
 
 #. module: pos_cache
 #: model:ir.model.fields,field_description:pos_cache.field_pos_cache_config_id