[MERGE] forward port of branch saas-7 up to 4022493

6 files changed, 25 insertions, 26 deletions

diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 6e60b0e6393..4ac95f413c4 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -476,8 +476,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
         # handle the view:
         view_id = self.pool['ir.model.data'].xmlid_to_res_id(
-            cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form',
-            context=context
+            cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form'
         )
 
         return {
@@ -583,8 +582,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
             # handle the view:
             view_id = self.pool['ir.model.data'].xmlid_to_res_id(
-                cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form',
-                context=context
+                cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form'
             )
 
 
diff --git a/addons/anonymization/i18n/el.po b/addons/anonymization/i18n/el.po
index 1b8404f5557..eb9010617da 100644
--- a/addons/anonymization/i18n/el.po
+++ b/addons/anonymization/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-11-21 23:14+0000\n"
+"PO-Revision-Date: 2015-12-05 23:23+0000\n"
 "Last-Translator: Goutoudis Kostas <goutoudis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -112,7 +112,7 @@ msgstr ""
 #. module: anonymization
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_history_date
 msgid "Date"
-msgstr "Ημερ/νία"
+msgstr "Ημερομηνία"
 
 #. module: anonymization
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_history_direction
diff --git a/addons/anonymization/i18n/es_CO.po b/addons/anonymization/i18n/es_CO.po
index f2fc92357c1..2e41a2bae11 100644
--- a/addons/anonymization/i18n/es_CO.po
+++ b/addons/anonymization/i18n/es_CO.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-11-10 18:59+0000\n"
+"PO-Revision-Date: 2015-11-28 07:00+0000\n"
 "Last-Translator: Mateo Tibaquirá <nestormateo@gmail.com>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,36 +23,36 @@ msgstr ""
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymization_history_form
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymization_history_tree
 msgid "Anonymization History"
-msgstr ""
+msgstr "Historial de Anonimización"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymize_wizard_form
 msgid "Anonymize Database"
-msgstr ""
+msgstr "Anonimizar Base de Datos"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
 msgid "Anonymize database"
-msgstr ""
+msgstr "Anonimizar base de datos"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Anonymized"
-msgstr ""
+msgstr "Anonimizada"
 
 #. module: anonymization
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymization_form
 msgid "Anonymized Field"
-msgstr ""
+msgstr "Campo Anonimizado"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
 #: model:ir.ui.view,arch_db:anonymization.view_ir_model_fields_anonymization_tree
 msgid "Anonymized Fields"
-msgstr ""
+msgstr "Campos Anonimizados"
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:431
@@ -321,7 +321,7 @@ msgstr ""
 #: code:addons/anonymization/anonymization.py:372
 #, python-format
 msgid "The database is currently anonymized, you cannot anonymize it again."
-msgstr ""
+msgstr "La base de datos ya está anonimizada, no puede anonimizarla de nuevo."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:72
@@ -329,7 +329,7 @@ msgstr ""
 msgid ""
 "The database is currently anonymized, you cannot create, modify or delete "
 "fields."
-msgstr ""
+msgstr "La base de datos está actualmente anonimizada, no puede crear, modificar o eliminar campos."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:510
@@ -337,7 +337,7 @@ msgstr ""
 msgid ""
 "The database is not currently anonymized, you cannot reverse the "
 "anonymization."
-msgstr ""
+msgstr "La base de datos actualmente no está anonimizada, no puede revertir la anonimización."
 
 #. module: anonymization
 #: model:ir.model.fields,help:anonymization.field_ir_model_fields_anonymize_wizard_file_import
@@ -356,7 +356,7 @@ msgstr ""
 #: sql_constraint:ir.model.fields.anonymization:0
 #, python-format
 msgid "You cannot have two fields with the same name on the same object!"
-msgstr ""
+msgstr "No puede tener dos campos con el mismo nombre en el mismo objeto!"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
diff --git a/addons/anonymization/i18n/id.po b/addons/anonymization/i18n/id.po
index 6c7d2e47d6b..98b4a9fd205 100644
--- a/addons/anonymization/i18n/id.po
+++ b/addons/anonymization/i18n/id.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-11-17 12:40+0000\n"
+"PO-Revision-Date: 2015-12-02 23:35+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Indonesian (http://www.transifex.com/odoo/odoo-9/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -245,7 +245,7 @@ msgstr ""
 #. module: anonymization
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_model_id
 msgid "Object"
-msgstr ""
+msgstr "Obyek"
 
 #. module: anonymization
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_model_name
diff --git a/addons/anonymization/i18n/it.po b/addons/anonymization/i18n/it.po
index 105b33a8965..627c0650d01 100644
--- a/addons/anonymization/i18n/it.po
+++ b/addons/anonymization/i18n/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 16:11+0000\n"
+"PO-Revision-Date: 2015-11-24 12:32+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@ msgstr "Direzione"
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_migration_fix_display_name
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymize_wizard_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Visualizza Nome"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
diff --git a/addons/anonymization/i18n/pt.po b/addons/anonymization/i18n/pt.po
index 451c0166d97..e68e5475ae0 100644
--- a/addons/anonymization/i18n/pt.po
+++ b/addons/anonymization/i18n/pt.po
@@ -3,13 +3,14 @@
 # * anonymization
 # 
 # Translators:
+# Ricardo Correia <rcorreiavv@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-10-20 14:26+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2015-11-25 13:47+0000\n"
+"Last-Translator: Ricardo Correia <rcorreiavv@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +59,7 @@ msgstr "Campos Anonimizados"
 #: code:addons/anonymization/anonymization.py:431
 #, python-format
 msgid "Anonymized value can not be empty."
-msgstr ""
+msgstr "O valor anónimo não pode estar vazio."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:283
@@ -329,7 +330,7 @@ msgstr "A base de dados está atualmente anonimizada, não a pode tornar anônim
 msgid ""
 "The database is currently anonymized, you cannot create, modify or delete "
 "fields."
-msgstr ""
+msgstr "A base de dados está atualmente anónima. Não poderá criar, modificar ou apagar campos."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:510
@@ -337,7 +338,7 @@ msgstr ""
 msgid ""
 "The database is not currently anonymized, you cannot reverse the "
 "anonymization."
-msgstr ""
+msgstr "A base de dados está atualmente anónima. Não poderá revertê-la."
 
 #. module: anonymization
 #: model:ir.model.fields,help:anonymization.field_ir_model_fields_anonymize_wizard_file_import