diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index d08504a3b9a..43855366f45 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -7531,7 +7531,7 @@ msgstr ""
 #: code:addons/addons/base/res/partner/partner.py:0
 #, python-format
 msgid "Warning"
-msgstr "
+msgstr ""
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index e674bfd9910..293e9220034 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -7168,7 +7168,7 @@ msgstr "Exportació"
 #: help:res.bank,bic:0
 msgid "Bank Identifier Code"
 msgstr "Codi d'identificador bancari"
--
+
 #. module: base
 #: code:addons/addons/base/ir/ir_actions.py:0
 #: code:addons/addons/base/ir/ir_model.py:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 1905e70f445..2fc2fc94f6c 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -6010,7 +6010,8 @@ msgid ""
 "Number of time the function is called,\n"
 "a negative number indicates that the function will always be called"
 msgstr ""
-e: base
+
+#. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
 msgid "Telecom sector"
 msgstr ""
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index ad0148b8cfc..98b9fe195c3 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -173,7 +173,7 @@ msgstr "Struktur des Betriebs"
 #: model:ir.model,name:base.model_ir_report_custom_fields
 msgid "ir.report.custom.fields"
 msgstr "ir.report.custom.fields"
- 
+
 #. module: base
 #: code:addons/addons/base/module/wizard/wizard_export_lang.py:0
 #, python-format
@@ -2906,6 +2906,7 @@ msgstr "Senegal"
 #. module: base
 #: model:res.country,name:base.hu
 msgid "Hungary"
+msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 8b46386cf6d..1d47c2328cd 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -317,7 +317,7 @@ msgstr "Όνομα Πεδίου"
 #: model:ir.ui.menu,name:base.menu_module_tree_uninstall
 msgid "Uninstalled modules"
 msgstr "Μη εγκατεστημένα Αρθρώματα"
-=
+
 #. module: base
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 9ea1bbb5120..f1dd5faec54 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -5052,7 +5052,6 @@ msgstr "El núcleo de OpenERP, necesario para toda instalación."
 msgid "Customers Partners"
 msgstr "Clientes"
 
--
 #. module: base
 #: code:addons/addons/base/ir/ir_actions.py:0
 #, python-format
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 2be932c5798..44bbedbfa29 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -569,8 +569,6 @@ msgid "Cambodia, Kingdom of"
 msgstr "Kambodža"
 
 #. module: base
-<<<<<<< TREE
-=======
 #: model:ir.actions.act_window,name:base.ir_sequence_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:base.menu_ir_sequence_form
@@ -789,8 +787,6 @@ msgstr ""
 "Piirakkadiagrammia ei voida piirtää!"
 
 #. module: base
-<<<<<<< TREE
-=======
 #: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid ""
@@ -7215,7 +7211,7 @@ msgstr "Toiminnot"
 #: selection:res.request,priority:0
 msgid "High"
 msgstr "Korkea"
- 
+
 #. module: base
 #: field:ir.exports.line,export_id:0
 msgid "Export"
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index d82511c6d55..36065bc9f2b 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -7909,6 +7909,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
+msgstr ""
 
 #. module: base
 #: selection:ir.actions.server,state:0