diff --git a/account_statement_import_file/i18n/af.po b/account_statement_import_file/i18n/af.po
index a9e96d5f..56c6abd0 100644
--- a/account_statement_import_file/i18n/af.po
+++ b/account_statement_import_file/i18n/af.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Geskep deur"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Geskep op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vertoningsnaam"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laas Gewysig op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Laas Opgedateer deur"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Laas Opgedateer op"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Active"
 #~ msgstr "Aktief"
 
diff --git a/account_statement_import_file/i18n/am.po b/account_statement_import_file/i18n/am.po
index 052e26a7..b8fe7464 100644
--- a/account_statement_import_file/i18n/am.po
+++ b/account_statement_import_file/i18n/am.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "መሰረዝ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "ድርጅት"
 
diff --git a/account_statement_import_file/i18n/ar.po b/account_statement_import_file/i18n/ar.po
index 7c3a399f..55155056 100644
--- a/account_statement_import_file/i18n/ar.po
+++ b/account_statement_import_file/i18n/ar.po
@@ -34,31 +34,33 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "تم تجاهل %d معاملة سبق استيرادها بالفعل."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "تم تجاهل 1 معاملة سبق استيرادها بالفعل."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "عناصر تم استيرادها بالفعل"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -67,128 +69,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "أنشئ بواسطة"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "أنشئ في"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "الاسم المعروض"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "احصل على كشوفات حسابك بصيغة إلكترونية واخترها من هنا."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "المُعرف"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "استيراد"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "استيراد كشف حساب بنكي"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "استيراد كشف حساب بنكي"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "استيراد كشف حساب"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "دفتر اليومية"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "آخر تحديث بواسطة"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "هذا الملف لا يحتوي على أي معاملة."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "بند كشف الحساب البنكي"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "بند كشف الحساب البنكي"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "الحساب في كشف الحساب البنكي مختلف عن حساب دفتر اليومية (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -196,24 +198,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -221,23 +226,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -246,29 +253,32 @@ msgstr ""
 "لم يمكن فهم طبيعة الملف المحدد.\n"
 "هل قمت بتثبيت الموديول لدعم هذا النوع من الملفات؟"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "بند كشف الحساب البنكي"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "أو"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "عناصر تم استيرادها بالفعل"
+
+#~ msgid "or"
+#~ msgstr "أو"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/az.po b/account_statement_import_file/i18n/az.po
index 7de94fe4..4d6b5be2 100644
--- a/account_statement_import_file/i18n/az.po
+++ b/account_statement_import_file/i18n/az.po
@@ -15,31 +15,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -48,124 +50,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -173,24 +175,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -198,48 +203,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/bg.po b/account_statement_import_file/i18n/bg.po
index 16d069da..fb0a04ac 100644
--- a/account_statement_import_file/i18n/bg.po
+++ b/account_statement_import_file/i18n/bg.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Създадено от"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Създадено на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Име за показване"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последно променено на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Последно обновено от"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Последно обновено на"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Фирма"
 
diff --git a/account_statement_import_file/i18n/bs.po b/account_statement_import_file/i18n/bs.po
index 7dd656ed..f4a9ec38 100644
--- a/account_statement_import_file/i18n/bs.po
+++ b/account_statement_import_file/i18n/bs.po
@@ -21,31 +21,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -54,128 +56,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Prikazani naziv"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Uvoz"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Dnevnik knjiženja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Zadnji ažurirao"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -183,24 +185,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -208,53 +213,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Stavka izvoda banke"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ili"
+#~ msgid "or"
+#~ msgstr "ili"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "Stavka izvoda banke"
diff --git a/account_statement_import_file/i18n/ca.po b/account_statement_import_file/i18n/ca.po
index fd310fe8..d773208f 100644
--- a/account_statement_import_file/i18n/ca.po
+++ b/account_statement_import_file/i18n/ca.po
@@ -22,31 +22,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d de transaccions han estat ja importades i seran ignorades."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transacció ha estat ja importada i serà ignorada."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Elements ja importats"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -55,23 +57,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creat per"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creat el"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar Nom"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -79,107 +81,107 @@ msgstr ""
 "Obtingui els seus extractes bancaris en format electrònic del seu banc i "
 "seleccioni'ls aquí."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importa"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Import de l'extracte bancari"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importar extractes bancaris"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importar extracte"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Diari"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificació el "
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualització per"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualització el"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Aquest fitxer no conte cap transacció."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Arxiu d'extracte bancari"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Arxiu d'extracte bancari"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "El compte bancari d'aquest extracte no és la mateixa que la del diari (%s)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -187,24 +189,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -212,23 +217,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -237,30 +244,33 @@ msgstr ""
 "No es pot interpretar l'arxiu donat. ¿Ha instal·lat el mòdul que suporta "
 "aquest tipus d'arxiu?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Importar extractes bancaris"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Seleccioni un arxiu d'extracte bancari per importar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "o"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Elements ja importats"
+
+#~ msgid "or"
+#~ msgstr "o"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/cs.po b/account_statement_import_file/i18n/cs.po
index c4c540ff..2ea13b89 100644
--- a/account_statement_import_file/i18n/cs.po
+++ b/account_statement_import_file/i18n/cs.po
@@ -26,31 +26,33 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
 "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transakcí již bylo importováno a bylo ignorováno."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transakce již byla importována a byla ignorována."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Zrušit"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,128 +61,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Vytvořeno od"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Vytvořeno"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Import"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Import Výpisu z bankovního účtu"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Import Výpisu z bankovního účtu"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Deník"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Naposled změněno"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upraveno od"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Řádek bankovního výkazu"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Řádek bankovního výkazu"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -188,24 +190,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -213,23 +218,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -238,29 +245,28 @@ msgstr ""
 "To nedává smysl k danému souboru. Je nainstalován modul pro podporu tohoto "
 "typu souboru?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Řádek bankovního výkazu"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "nebo"
+#~ msgid "or"
+#~ msgstr "nebo"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/da.po b/account_statement_import_file/i18n/da.po
index 3fb5c283..1db10b76 100644
--- a/account_statement_import_file/i18n/da.po
+++ b/account_statement_import_file/i18n/da.po
@@ -26,31 +26,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%dTransaktioner var allerede blevet importeret og blev ignoreret."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaktion var allerede blevet importeret og blev ignoreret."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Allerede importerede posteringer"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annullér"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,129 +61,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Oprettet af"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Oprettet den"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vis navn"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "Få dine kontoudtog i elektronisk format fra din bank, og vælg dem her."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importer"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importer kontoudtog"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importer kontoudtog"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importer kontoudtog"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Sidst opdateret af"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Denne fil indeholder ingen transaktion."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Kontoudtogslinje"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Kontoudtogslinje"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "Kontoen for dette bank kontoudtog er ikke den samme som journalen (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -189,24 +191,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -214,23 +219,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -239,29 +246,32 @@ msgstr ""
 "Kunne ikke få den givne fil til at give mening \n"
 "Har du installeret modulet til at understøtte denne type fil?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Kontoudtogslinje"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "eller"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Allerede importerede posteringer"
+
+#~ msgid "or"
+#~ msgstr "eller"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/de.po b/account_statement_import_file/i18n/de.po
index c366d16d..7d2ae08b 100644
--- a/account_statement_import_file/i18n/de.po
+++ b/account_statement_import_file/i18n/de.po
@@ -26,31 +26,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d Buchungen wurden bereits importiert und ignoriert."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "Eine Buchung wurde bereits importiert und ignoriert."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Bereits importierte Positionen"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,23 +61,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Erstellt von"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Erstellt am"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -83,107 +85,107 @@ msgstr ""
 "Beschaffen Sie Ihre Kontoauszüge in Dateiform von Ihrer Bank und wählen "
 "diese hier aus."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Import"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Bankauszug importieren"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Bankauszug importieren"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Bankauszug importieren"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Letzte Änderung am"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert von"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Diese Datei enthält keinen Vorgang."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Kontoauszugszeile"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Kontoauszugszeile"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "Das Konto dieses Kontoauszugs ist nicht das Gleiche, wie das im Journal (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -191,24 +193,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -216,23 +221,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -241,29 +248,32 @@ msgstr ""
 "Die angegebene Datei macht keinen Sinn.\n"
 "Haben Sie das, diesem Dateityp unterstützende, Modul installiert?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Kontoauszüge hochladen"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Kontoauszüge hochladen"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "oder"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Bereits importierte Positionen"
+
+#~ msgid "or"
+#~ msgstr "oder"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/el.po b/account_statement_import_file/i18n/el.po
index d5f49013..1eb714fb 100644
--- a/account_statement_import_file/i18n/el.po
+++ b/account_statement_import_file/i18n/el.po
@@ -23,31 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,128 +58,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Δημιουργήθηκε από"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Εμφάνιση Ονόματος"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Κωδικός"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Εισαγωγή Statement Tράπεζας"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Εισαγωγή Statements Tράπεζας"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Εισαγωγή Statement"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Τελευταία τροποποίηση στις"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Τελευταία Ενημέρωση από"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Τελευταία Ενημέρωση στις"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Γραμμή Κίνησης Τραπεζικού Λογαριασμού"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Γραμμή Κίνησης Τραπεζικού Λογαριασμού"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -185,24 +187,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -210,53 +215,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Εισαγωγή Statements Tράπεζας"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Γραμμή Κίνησης Τραπεζικού Λογαριασμού"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ή"
+#~ msgid "or"
+#~ msgstr "ή"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/en_AU.po b/account_statement_import_file/i18n/en_AU.po
index 2356c8c9..7697b89a 100644
--- a/account_statement_import_file/i18n/en_AU.po
+++ b/account_statement_import_file/i18n/en_AU.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancel"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Created by"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Created on"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Import"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,48 +206,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/en_GB.po b/account_statement_import_file/i18n/en_GB.po
index de748844..bba6270b 100644
--- a/account_statement_import_file/i18n/en_GB.po
+++ b/account_statement_import_file/i18n/en_GB.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancel"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Created by"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Created on"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Display Name"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Company"
 
diff --git a/account_statement_import_file/i18n/es.po b/account_statement_import_file/i18n/es.po
index 5240b672..7826bd72 100644
--- a/account_statement_import_file/i18n/es.po
+++ b/account_statement_import_file/i18n/es.po
@@ -31,31 +31,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.1\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transacciones han sido ya importadas y serán ignoradas."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transacción ha sido ya importada y será ignorada."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Elementos ya importados"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -64,23 +66,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado el"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -88,107 +90,107 @@ msgstr ""
 "Obtenga sus extractos bancarios en formato electrónico de su banco y "
 "selecciónelos aquí."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr "Importar (OCA)"
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importar extracto bancario"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importar extracto bancario"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importar extracto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr "Importar Extracto (OCA)"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr "Importar y Ver"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Este archivo no contiene ninguna transacción."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Línea de extracto bancario"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Línea de extracto bancario"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "La cuenta bancaria de este extracto no es la misma que la del diario (%s)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -196,24 +198,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -221,23 +226,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -246,29 +253,35 @@ msgstr ""
 "No se pudo interpretar el archivo dado. ¿Ha instalado el módulo que soporta "
 "este tipo de archivo?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Línea de extracto bancario"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "o"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Elementos ya importados"
+
+#~ msgid "Import (OCA)"
+#~ msgstr "Importar (OCA)"
+
+#~ msgid "or"
+#~ msgstr "o"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr "¡Una transacción bancaria solo se puede importar una vez!"
diff --git a/account_statement_import_file/i18n/es_AR.po b/account_statement_import_file/i18n/es_AR.po
index 0d65823a..42d90754 100644
--- a/account_statement_import_file/i18n/es_AR.po
+++ b/account_statement_import_file/i18n/es_AR.po
@@ -20,31 +20,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transacciones ya han sido importadas y fueron ignoradas."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transacción ya ha sido importada y fue ignorada."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Artículos ya importados"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -53,23 +55,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -77,103 +79,103 @@ msgstr ""
 "Obtenga sus extractos bancarios en formato electrónico desde su banco y "
 "seleccionelos aqui."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr "Importar Archivo de Extracto Bancario"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr "Importar Archivos de Extractos Bancarios"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importar Extracto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Diario"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Falta el código de moneda en el archivo del extracto bancario."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Falta la referencia de pago (payment_ref) en una transacción."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Archivo de Extracto"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nombre de Archivo de Extracto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formatos soportados:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "La Cuenta de Contabilidad Bancaria no está establecida en el diario '%s'."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -181,8 +183,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -191,16 +194,18 @@ msgstr ""
 "El archivo de extracto bancario utiliza la moneda '%s' pero no existe tal "
 "moneda en Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,23 +216,25 @@ msgstr ""
 "cuenta bancaria, por lo que debe iniciar el asistente desde el diario del "
 "banco correcto en el Tablero."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr "El análisis del archivo de extractos arrojó un resultado no válido."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -236,18 +243,19 @@ msgstr ""
 "El formato del archivo de extractos bancarios no está soportado\n"
 "¿Ha instalado el módulo de Odoo correspondiente para soportar este formato?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Cargar Extractos Bancarios"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Cargar un archivo de extractos bancarios"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -256,10 +264,12 @@ msgstr ""
 "Ya ha importado este archivo, o este archivo solo contiene transacciones que "
 "ya fueron importadas."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "o"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Artículos ya importados"
+
+#~ msgid "or"
+#~ msgstr "o"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr ""
diff --git a/account_statement_import_file/i18n/es_BO.po b/account_statement_import_file/i18n/es_BO.po
index 1b05513a..20aa6f8c 100644
--- a/account_statement_import_file/i18n/es_BO.po
+++ b/account_statement_import_file/i18n/es_BO.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_CL.po b/account_statement_import_file/i18n/es_CL.po
index a3293ead..3b71d25c 100644
--- a/account_statement_import_file/i18n/es_CL.po
+++ b/account_statement_import_file/i18n/es_CL.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID (identificación)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_CO.po b/account_statement_import_file/i18n/es_CO.po
index d00e3e4f..09bf3326 100644
--- a/account_statement_import_file/i18n/es_CO.po
+++ b/account_statement_import_file/i18n/es_CO.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Actualizado"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_CR.po b/account_statement_import_file/i18n/es_CR.po
index 0780d3b5..2919380b 100644
--- a/account_statement_import_file/i18n/es_CR.po
+++ b/account_statement_import_file/i18n/es_CR.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_DO.po b/account_statement_import_file/i18n/es_DO.po
index 7abccf78..1152eac0 100644
--- a/account_statement_import_file/i18n/es_DO.po
+++ b/account_statement_import_file/i18n/es_DO.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID (identificación)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_EC.po b/account_statement_import_file/i18n/es_EC.po
index 377853e2..7a22989c 100644
--- a/account_statement_import_file/i18n/es_EC.po
+++ b/account_statement_import_file/i18n/es_EC.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por:"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Fecha de modificación"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima Actualización por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Actualizado en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_PE.po b/account_statement_import_file/i18n/es_PE.po
index f7dace9e..effa6546 100644
--- a/account_statement_import_file/i18n/es_PE.po
+++ b/account_statement_import_file/i18n/es_PE.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Actualizado última vez por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañia"
 
diff --git a/account_statement_import_file/i18n/es_PY.po b/account_statement_import_file/i18n/es_PY.po
index 516226d8..e396dc93 100644
--- a/account_statement_import_file/i18n/es_PY.po
+++ b/account_statement_import_file/i18n/es_PY.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima actualización por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/es_VE.po b/account_statement_import_file/i18n/es_VE.po
index 8610f96e..41acae33 100644
--- a/account_statement_import_file/i18n/es_VE.po
+++ b/account_statement_import_file/i18n/es_VE.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización realizada por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/et.po b/account_statement_import_file/i18n/et.po
index 9e546d32..91d2a2aa 100644
--- a/account_statement_import_file/i18n/et.po
+++ b/account_statement_import_file/i18n/et.po
@@ -26,31 +26,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d tehingud on varem imporditud ja neid ignoreeriti."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 kanne on juba imporditud ja seda ignoreeriti."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Juba imporditud read"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Tühista"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,128 +61,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Loonud"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Loomise kuupäev"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "Hankige pangaväljavõtted elektroonilises vormis ja valige need siin."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Impordi"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Impordi pangaväljavõte"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Impordi pangaväljavõtted"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Impordi väljavõte"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Andmik"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud (millal)"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Viimati uuendatud (kelle poolt)"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Viimati uuendatud (millal)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "See fail ei sisalda ühtegi kannet."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Pangaväljavõtte fail"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Pangaväljavõtte fail"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Selle pangaväljavõtte pangakonto ei ole sama, mis on andmikus (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -188,24 +190,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -213,23 +218,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -238,30 +245,33 @@ msgstr ""
 "Süsteem ei suuda tuvastada antud faili.\n"
 "Kas paigaldasid sobiva mooduli faili tuvastamiseks?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Impordi pangaväljavõtted"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Vali importimiseks pangaväljavõtte fail"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "või"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Juba imporditud read"
+
+#~ msgid "or"
+#~ msgstr "või"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/eu.po b/account_statement_import_file/i18n/eu.po
index 97e3dc78..59f3e6b3 100644
--- a/account_statement_import_file/i18n/eu.po
+++ b/account_statement_import_file/i18n/eu.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Nork sortua"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Created on"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Last Updated on"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Enpresa"
 
diff --git a/account_statement_import_file/i18n/fa.po b/account_statement_import_file/i18n/fa.po
index cf5c197d..8c3c2cf0 100644
--- a/account_statement_import_file/i18n/fa.po
+++ b/account_statement_import_file/i18n/fa.po
@@ -24,31 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d تراکنش قبلاً وارد شده و نادیده گرفته شده."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 تراکنش قبلا وارد شده و نادیده گرفته شد."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "آیتمهای قبلا وارد شده"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "لغو"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,128 +59,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "ایجاد شده توسط"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "ایجاد شده در"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "شناسه"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "درونش"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "وارد کردن بیانیه بانک"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "ورود از فایل صورتحساب بانک"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "ورود از فایل صورتحساب"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "روزنامه"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "آخرین تغییر در"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "آخرین تغییر توسط"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "این فایل دارای هیچ تراکنسی نیست."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "فایل صورتحساب بانک"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "فایل صورتحساب بانک"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,53 +216,58 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "ورود از فایل صورتحساب بانک"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "انتخاب فایل صورتحساب بانک برای ورود"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "یا"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "آیتمهای قبلا وارد شده"
+
+#~ msgid "or"
+#~ msgstr "یا"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/fi.po b/account_statement_import_file/i18n/fi.po
index 4a8b3702..ba02bb0c 100644
--- a/account_statement_import_file/i18n/fi.po
+++ b/account_statement_import_file/i18n/fi.po
@@ -24,31 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d tapatumaa on jo aiemmin tuotu, joten ne ohitettiin."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 tapahtuma on aiemmin tuotu ja ohitettiin."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Aiemmin ladatut rivit"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,129 +59,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Luonut"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Luotu"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Hae pankin tiliotteet sähköisessä muodossa pankistasi ja valitse ne täällä."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Tunniste (ID)"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Tuo"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Tuo tiliote"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Tuo tiliotteet"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Tuo tiliote"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Päiväkirja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Viimeksi päivittänyt"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Tiedostossa ei ole lainkaan tapahtumia."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Tiliotetiedosto"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Tiliotetiedosto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Tiiotteen tili ei vastaa päiväkirjaa (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -187,24 +189,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -212,23 +217,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -237,30 +244,33 @@ msgstr ""
 "Tiedoston muoto ei ollut ymmärrettävä.\n"
 "Oletko asentanut modulin, joka tulee tämän tyyppisiä tiedostoja?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Tuo tiliotteet"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Valitse sisäänluettava pankin tiliote."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "tai"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Aiemmin ladatut rivit"
+
+#~ msgid "or"
+#~ msgstr "tai"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/fo.po b/account_statement_import_file/i18n/fo.po
index 288ae05d..955fec70 100644
--- a/account_statement_import_file/i18n/fo.po
+++ b/account_statement_import_file/i18n/fo.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Strika"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Byrjað av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Byrjað tann"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vís navn"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Seinast rættað tann"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Seinast dagført av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Seinast dagført tann"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,51 +206,49 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Fyritøka"
diff --git a/account_statement_import_file/i18n/fr.po b/account_statement_import_file/i18n/fr.po
index 3fd5a1c3..5a0c2475 100644
--- a/account_statement_import_file/i18n/fr.po
+++ b/account_statement_import_file/i18n/fr.po
@@ -28,31 +28,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transactions ont déjà été importées et ont été ignorées."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaction a déjà été importée et a été ignorée."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Eléments déjà importés"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -61,23 +63,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher Nom"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -85,105 +87,105 @@ msgstr ""
 "Obtenez les relevés bancaires en version électronique depuis votre banque et "
 "sélectionnez-les ici."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importer"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Import d'un relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Import d'un relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importation d'un relevé"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Code de devise manquant dans le fichier de relevé bancaire."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Référence de paiement manquante sur la transaction."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nom du fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formats acceptés :"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "Le compte comptable de la banque n'est pas spécifié sur le journal (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -191,8 +193,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -201,16 +204,18 @@ msgstr ""
 "Le fichier de relevé bancaire utilise la devise '%s' mais il n'y a pas de "
 "telle devise dans Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -221,23 +226,25 @@ msgstr ""
 "compte bancaire, vous devez donc démarrer l'assistant à partir du journal de "
 "la banque de droite dans le tableau de bord."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr "L'analyse du fichier de relevé a renvoyé un résultat non valide."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -246,18 +253,19 @@ msgstr ""
 "Ce format de fichier de relevé n'est pas reconnu.\n"
 "Avez-vous installé le module qui supporte ce type de fichier ?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Télécharger les relevés bancaires"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Télécharger un fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -266,10 +274,12 @@ msgstr ""
 "Vous avez déjà importé ce fichier ou ce fichier ne contient que des "
 "transactions déjà importées."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ou"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Eléments déjà importés"
+
+#~ msgid "or"
+#~ msgstr "ou"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/fr_BE.po b/account_statement_import_file/i18n/fr_BE.po
index 4827be22..ff795f58 100644
--- a/account_statement_import_file/i18n/fr_BE.po
+++ b/account_statement_import_file/i18n/fr_BE.po
@@ -20,31 +20,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transactions déjà importées et ignorées"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaction a déjà été importée et a été ignorée."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Articles déjà importés"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -53,23 +55,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -77,103 +79,103 @@ msgstr ""
 "Obtenez vos relevés bancaires au format électronique auprès de votre banque "
 "et sélectionnez-les ici."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importer"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr "Importer un fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr "Importer des fichiers de relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 #, fuzzy
 msgid "Import Statement"
 msgstr "Déclaration d'importation"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Derniere fois mis à jour par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Dernière mis à jour le"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Code de devise manquant dans le fichier de relevé bancaire."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Référence de paiement manquant sur une transaction."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Fichier de déclaration"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nom de fichier de l'instruction"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formats pris en charge:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Le compte comptable bancaire n'est pas défini sur le journal '% s'."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -181,8 +183,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -191,16 +194,18 @@ msgstr ""
 "Le fichier de relevé bancaire utilise la devise '% s' mais il n'existe pas "
 "de devise dans Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,23 +216,25 @@ msgstr ""
 "compte bancaire, vous devez donc démarrer l'assistant à partir du journal de "
 "la banque de droite dans le tableau de bord."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr "L'analyse du fichier de déclaration a renvoyé un résultat non valide."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -236,18 +243,19 @@ msgstr ""
 "Ce format de fichier de relevé bancaire n'est pas pris en charge.\n"
 "Avez-vous installé le module Odoo pour prendre en charge ce format?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Télécharger les relevés bancaires"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Télécharger un fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -256,10 +264,12 @@ msgstr ""
 "Vous avez déjà importé ce fichier ou ce fichier ne contient que des "
 "transactions déjà importées."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ou"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Articles déjà importés"
+
+#~ msgid "or"
+#~ msgstr "ou"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr ""
diff --git a/account_statement_import_file/i18n/fr_CA.po b/account_statement_import_file/i18n/fr_CA.po
index 798bbe31..9974bc3e 100644
--- a/account_statement_import_file/i18n/fr_CA.po
+++ b/account_statement_import_file/i18n/fr_CA.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Identifiant"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Currency"
 #~ msgstr "Devise"
 
diff --git a/account_statement_import_file/i18n/fr_FR.po b/account_statement_import_file/i18n/fr_FR.po
index a9f8bfc9..b399d275 100644
--- a/account_statement_import_file/i18n/fr_FR.po
+++ b/account_statement_import_file/i18n/fr_FR.po
@@ -17,31 +17,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transactions ont déjà été importées et ont été ignorées."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaction a déjà été importée et a été ignorée."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Eléments déjà importés"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -50,23 +52,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Créé le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher Nom"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -74,103 +76,103 @@ msgstr ""
 "Obtenez les relevés bancaires en version électronique depuis votre banque et "
 "sélectionnez-les ici."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importer"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr "Import d'un relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr "Import de relevés bancaires"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importation d'un relevé"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Code de devise manquant dans le fichier de relevé bancaire."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Référence de paiement manquante sur la transaction."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nom du fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formats acceptés :"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "Le compte comptable de la banque n'est pas spécifié sur le journal (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -178,8 +180,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -188,16 +191,18 @@ msgstr ""
 "Le fichier de relevé bancaire utilise la devise '%s' mais il n'y a pas de "
 "telle devise dans Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -208,23 +213,25 @@ msgstr ""
 "compte bancaire, vous devez donc démarrer l'assistant à partir du journal de "
 "la banque de droite dans le tableau de bord."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr "L'analyse du fichier de relevé a renvoyé un résultat non valide."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -233,18 +240,19 @@ msgstr ""
 "Ce format de fichier de relevé n'est pas reconnu.\n"
 "Avez-vous installé le module qui supporte ce type de fichier ?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Télécharger les relevés bancaires"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Télécharger un fichier de relevé bancaire"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -253,10 +261,12 @@ msgstr ""
 "Vous avez déjà importé ce fichier ou ce fichier ne contient que des "
 "transactions déjà importées."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ou"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Eléments déjà importés"
+
+#~ msgid "or"
+#~ msgstr "ou"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr ""
diff --git a/account_statement_import_file/i18n/gl.po b/account_statement_import_file/i18n/gl.po
index df6db4c2..b19a763b 100644
--- a/account_statement_import_file/i18n/gl.po
+++ b/account_statement_import_file/i18n/gl.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creado o"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import_file/i18n/gu.po b/account_statement_import_file/i18n/gu.po
index 18ac1396..fbd7c438 100644
--- a/account_statement_import_file/i18n/gu.po
+++ b/account_statement_import_file/i18n/gu.po
@@ -23,31 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "રદ કરો"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,128 +58,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "બનાવનાર"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "પ્રદર્શન નામ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ઓળખ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "આયાત"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "રોજનામું"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -185,24 +187,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -210,53 +215,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "બેન્ક વિધાન લીટી"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "અથવા"
+#~ msgid "or"
+#~ msgstr "અથવા"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "બેન્ક વિધાન લીટી"
diff --git a/account_statement_import_file/i18n/he.po b/account_statement_import_file/i18n/he.po
index 0679ccc4..b949e2c7 100644
--- a/account_statement_import_file/i18n/he.po
+++ b/account_statement_import_file/i18n/he.po
@@ -28,31 +28,33 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
 "1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%dהתנועות יובאו בעבר ולכן התעלמו מהן"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "תנועה אחת כבר יובאה ולכן התעלמו ממנה"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "פריטים שכבר מיובאים"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "בטל"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -61,128 +63,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "נוצר על-ידי"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "נוצר ב-"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "הצג שם"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "קבלו את דפי החשבון שלכם בתבנית ממוחשבת מהבנק, ובחרו אותם כאן."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "תעודה מזהה"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "ייבוא"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "יבוא דף חשבון"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "יבוא דף חשבון"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "יבא שורה"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "יומנים"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "שינוי אחרון ב"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "עודכן לאחרונה על-ידי"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "עדכון אחרון ב"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "קובץ זה אינו מכיל עסקאות."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "שורת דף חשבון של הבנק"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "שורת דף חשבון של הבנק"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "מספר החשבון של שורת חשבון זו אינו זהה לזה שביומן (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -190,24 +192,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -215,23 +220,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -240,29 +247,32 @@ msgstr ""
 "לא מצליח להבין את תוכן הקובץ הנתון.\n"
 "האם התקנתם את המודול המתאים לתמיכה בסוג קובץ זה? "
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "שורת דף חשבון של הבנק"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "או"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "פריטים שכבר מיובאים"
+
+#~ msgid "or"
+#~ msgstr "או"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/hr.po b/account_statement_import_file/i18n/hr.po
index 601419a3..268af126 100644
--- a/account_statement_import_file/i18n/hr.po
+++ b/account_statement_import_file/i18n/hr.po
@@ -32,31 +32,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transakcije koje su već uvežene i sad su preskočene."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transakcija je već uvežena i sad je preskočena."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Već uvežene stavke"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -65,129 +67,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Kreirano"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Naziv"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Preuzmite bankovne izvadke u elektronskom formatu i odaberite ih ovdje."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Uvoz"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Uvoz bankovnog izvoda"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Uvoz bankovnog izvoda"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Uvoz izvoda"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnja promjena"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Promijenio"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Vrijeme promjene"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Ova datoteka ne sadrži nijednu transakciju."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Redak bankovnog izvoda"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Redak bankovnog izvoda"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Žiro račun ovog izvoda banke nije jednak dnevniku (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -195,24 +197,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -220,23 +225,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -245,29 +252,32 @@ msgstr ""
 "Nemogu pročitati ovu datoteku.\n"
 "Jeste li instalirali modul koji podržava ovaj format?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Redak bankovnog izvoda"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ili"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Već uvežene stavke"
+
+#~ msgid "or"
+#~ msgstr "ili"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/hu.po b/account_statement_import_file/i18n/hu.po
index 1f114234..af4a6682 100644
--- a/account_statement_import_file/i18n/hu.po
+++ b/account_statement_import_file/i18n/hu.po
@@ -24,31 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d tranzakció importálva és mellőzve."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 tranzakció importálva és mellőzve."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Már importált tételek"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Mégse"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,23 +59,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Létrehozta"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Létrehozva"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Megjelenített név"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -81,106 +83,106 @@ msgstr ""
 "Bankjától szerezze be a kivonatokat elektronikus formátumban és azokat "
 "válassza ki itt."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Azonosító"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importálás"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Bankkivonat importálása"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Bankkivonat importálása"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Kivonat importálása"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Napló"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Legutóbb frissítve"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Frissítette"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Frissítve "
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Ez a fájl nem tartalmaz pénzügyi tranzakciót."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Bankkivonat tételsor"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Bankkivonat tételsor"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Ennek a bankkivonatnak a számlája nem egyezik a naplójéval (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -188,24 +190,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -213,23 +218,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -238,29 +245,32 @@ msgstr ""
 "A megadott állományt a rendszer nem tudja értelmezni.\n"
 "Telepítette a fájl típus támogatását szolgáló modult?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Bankkivonat tételsor"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "vagy"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Már importált tételek"
+
+#~ msgid "or"
+#~ msgstr "vagy"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/id.po b/account_statement_import_file/i18n/id.po
index 00cb802b..ff11b83c 100644
--- a/account_statement_import_file/i18n/id.po
+++ b/account_statement_import_file/i18n/id.po
@@ -29,31 +29,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transaksi sudah diimpor dan diabaikan."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaksi sudah diimpor dan diabaikan"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Barang yang sudah diimpor"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Batal"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -62,128 +64,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Dibuat oleh"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Dibuat pada"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Impor"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Memasukan Rekening Koran"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Memasukan Rekening Koran"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Jurnal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Terakhir diubah pada"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Terakhir diperbarui oleh"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Terakhir diperbarui pada"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Arsip buku bank"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Arsip buku bank"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -191,24 +193,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -216,53 +221,55 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Memasukan Rekening Koran"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Arsip buku bank"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Barang yang sudah diimpor"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "Transaksi buku bank"
diff --git a/account_statement_import_file/i18n/is.po b/account_statement_import_file/i18n/is.po
index 177c7b3a..cd52c04c 100644
--- a/account_statement_import_file/i18n/is.po
+++ b/account_statement_import_file/i18n/is.po
@@ -21,31 +21,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Hætta við"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -54,128 +56,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Búið til af"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Stofnað þann"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nafn"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Auðkenni"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Færslubók"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Síðast breytt þann"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Síðast uppfært af"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Síðast uppfært þann"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -183,24 +185,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -208,53 +213,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Bank Statement Line"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "eða"
+#~ msgid "or"
+#~ msgstr "eða"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "Bank Statement Line"
diff --git a/account_statement_import_file/i18n/it.po b/account_statement_import_file/i18n/it.po
index 7a9b2ba3..be58997e 100644
--- a/account_statement_import_file/i18n/it.po
+++ b/account_statement_import_file/i18n/it.po
@@ -35,31 +35,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.1\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d operazioni sono state ignorate perché già importate."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 operazione è stata ignorata perché già importata."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
-msgid "Already imported items"
-msgstr "Voci già importate"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -68,125 +70,125 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Creato da"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Creato il"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Selezionare gli estratti conto in formato elettronico ottenuti dalla banca."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importa"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr "Importa file estratto conto bancario"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr "Importazione file estratto conto bancario"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importa estratto conto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Registro"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultimo aggiornamento di"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Ultimo aggiornamento il"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Codice valuta mancante nel file di estratto conto."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "payment_ref mancante in una operazione."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "File estratto conto"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nome file estratto conto"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formati supportati:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Conto banca non impostato nel registro \"%s\"."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -194,8 +196,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -204,16 +207,18 @@ msgstr ""
 "Il file di estratto conto utilizza la valuta \"%s\" che non è presente in "
 "Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -224,24 +229,26 @@ msgstr ""
 "bancario, è necessario quindi far partire la procedura dal registro banca "
 "corretto nella bacheca."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 "L'analisi del file di estratto conto ha restituito un risultato non valido."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -250,18 +257,19 @@ msgstr ""
 "Formato del file di estratto conto non supportato.\n"
 "Verificare che sia stato installato il modulo Odoo che supporta il formato."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Caricamento file di estratto conto bancario"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -269,10 +277,12 @@ msgid ""
 msgstr ""
 "Il file è già stato importato oppure contiene solo operazioni già importate."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "/"
+#, fuzzy, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Voci già importate"
+
+#~ msgid "or"
+#~ msgstr "/"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr ""
diff --git a/account_statement_import_file/i18n/ja.po b/account_statement_import_file/i18n/ja.po
index e986b876..e73842f5 100644
--- a/account_statement_import_file/i18n/ja.po
+++ b/account_statement_import_file/i18n/ja.po
@@ -24,31 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "取消"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,128 +59,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "作成者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "作成日"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "表示名"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "インポート"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "銀行取引明細のインポート"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "銀行取引明細のインポート"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "取引明細書をインポート"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "仕訳帳"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "最終更新者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "最終更新日"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "銀行取引明細書内容"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "銀行取引明細書内容"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,53 +216,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "銀行取引明細のインポート"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "銀行取引明細書内容"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "または"
+#~ msgid "or"
+#~ msgstr "または"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "銀行取引明細書内容"
diff --git a/account_statement_import_file/i18n/ka.po b/account_statement_import_file/i18n/ka.po
index 3cd610ec..366bd680 100644
--- a/account_statement_import_file/i18n/ka.po
+++ b/account_statement_import_file/i18n/ka.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "შეწყვეტა"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "შემქმნელი"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "შექმნის თარიღი"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "სახელი"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "იდენტიფიკატორი"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "ბოლოს განახლებულია"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "ბოლოს განაახლა"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "ბოლოს განახლებულია"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "კომპანია"
 
diff --git a/account_statement_import_file/i18n/kab.po b/account_statement_import_file/i18n/kab.po
index 6ff7fe6e..ee218620 100644
--- a/account_statement_import_file/i18n/kab.po
+++ b/account_statement_import_file/i18n/kab.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Sefsex"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Yerna-t"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Yerna di"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Asulay"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Aleqqem aneggaru di"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Aleqqem aneggaru sɣuṛ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Aleqqem aneggaru di"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Takebbwanit"
 
diff --git a/account_statement_import_file/i18n/km.po b/account_statement_import_file/i18n/km.po
index 728679e7..6be5b3f2 100644
--- a/account_statement_import_file/i18n/km.po
+++ b/account_statement_import_file/i18n/km.po
@@ -20,31 +20,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "លុបចោល"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -53,126 +55,126 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "បង្កើតដោយ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "បង្កើតនៅ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "ឈ្មោះសំរាប់បង្ហាញ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "ទាញបញ្ជូលរបាយការណ៍ធនាគារ"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "ទាញបញ្ជូលរបាយការណ៍ធនាគារ"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "កាលបរិច្ឆេតកែប្រែចុងក្រោយ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "ផ្លាស់ប្តូរចុងក្រោយ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "ផ្លាស់ប្តូរចុងក្រោយ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -180,24 +182,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -205,53 +210,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "ទាញបញ្ជូលរបាយការណ៍ធនាគារ"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "ទាញបញ្ជូលរបាយការណ៍ធនាគារ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ឬ​"
+#~ msgid "or"
+#~ msgstr "ឬ​"
 
 #, fuzzy
 #~ msgid "Partner Bank Account"
diff --git a/account_statement_import_file/i18n/ko.po b/account_statement_import_file/i18n/ko.po
index 6e1590f1..e8eb7492 100644
--- a/account_statement_import_file/i18n/ko.po
+++ b/account_statement_import_file/i18n/ko.po
@@ -24,31 +24,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d개 거래를 가져왔고 해당 거래가 무시되었습니다."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1개 거래를 가져왔고 해당 거래가 무시되었습니다."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "이미 가져온 항목"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "취소"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,128 +59,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "작성자"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "작성일"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "이름 표시"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "은행에서 예금거래 명세서를 전자 형식으로 가져오고 여기서 선택합니다."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "가져오기"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "예금거래 명세서 가져오기"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "예금거래 명세서 가져오기"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "명세서 가져오기"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "분개장"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "최근 갱신한 사람"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "이 파일에 거래가 없습니다."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "예금거래 명세서 파일"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "예금거래 명세서 파일"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "이 명세서의 계정이 분개장(%s)과 동일하지 않습니다."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,23 +216,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -236,30 +243,33 @@ msgstr ""
 "해당 파일을 해석할 수 없습니다.\n"
 "이 유형의 파일을 지원할 모듈을 설치하셨습니까?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "예금거래 명세서 가져오기"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "가져올 예금거래 명세서 파일 선택"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "또는"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "이미 가져온 항목"
+
+#~ msgid "or"
+#~ msgstr "또는"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/lb.po b/account_statement_import_file/i18n/lb.po
index 603d2edc..f0d77337 100644
--- a/account_statement_import_file/i18n/lb.po
+++ b/account_statement_import_file/i18n/lb.po
@@ -16,31 +16,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -49,124 +51,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -174,24 +176,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -199,48 +204,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/lo.po b/account_statement_import_file/i18n/lo.po
index 4b816804..2b182323 100644
--- a/account_statement_import_file/i18n/lo.po
+++ b/account_statement_import_file/i18n/lo.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "ຍົກເລີອກ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "ບໍລິສັດ"
 
diff --git a/account_statement_import_file/i18n/lt.po b/account_statement_import_file/i18n/lt.po
index 9a80c6b8..4b07c52d 100644
--- a/account_statement_import_file/i18n/lt.po
+++ b/account_statement_import_file/i18n/lt.po
@@ -29,31 +29,33 @@ msgstr ""
 "11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? "
 "1 : n % 1 != 0 ? 2: 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d operacijos jau buvo importuotos, todėl ignoruojamos."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 operacija jau buvo importuota, todėl ignoruojama."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Jau importuoti įrašai"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -62,23 +64,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Sukūrė"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Sukurta"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Rodomas pavadinimas"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -86,106 +88,106 @@ msgstr ""
 "Gaukite banko išrašus iš savo banko elektroniniu formatu ir pasirinkite juos "
 "čia."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importuoti"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importuoti banko išrašą"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importuoti banko išrašą"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importuoti išrašą"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Žurnalas"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Paskutinį kartą atnaujino"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Šiame faile nėra jokių operacijų."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Banko išrašo eilutė"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Banko išrašo eilutė"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Šio išrašo sąskaita nėra tokia pati, kaip žurnalo (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -193,24 +195,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -218,23 +223,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -243,29 +250,32 @@ msgstr ""
 "Nepavyko apdoroti pateikto failo.\n"
 "Ar įdiegėte modulį, kuris palaikytų tokio tipo failus?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Banko išrašo eilutė"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "arba"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Jau importuoti įrašai"
+
+#~ msgid "or"
+#~ msgstr "arba"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/lv.po b/account_statement_import_file/i18n/lv.po
index b6f75fd6..a41aeff4 100644
--- a/account_statement_import_file/i18n/lv.po
+++ b/account_statement_import_file/i18n/lv.po
@@ -19,31 +19,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Atcelt"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Izveidoja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Izveidots"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Pēdējo reizi atjaunoja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Uzņēmums"
 
diff --git a/account_statement_import_file/i18n/mk.po b/account_statement_import_file/i18n/mk.po
index a88ec3b8..49bd741a 100644
--- a/account_statement_import_file/i18n/mk.po
+++ b/account_statement_import_file/i18n/mk.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Креирано од"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Креирано на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Последно ажурирање од"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Компанија"
 
diff --git a/account_statement_import_file/i18n/mn.po b/account_statement_import_file/i18n/mn.po
index 4be19a9f..c48777c2 100644
--- a/account_statement_import_file/i18n/mn.po
+++ b/account_statement_import_file/i18n/mn.po
@@ -23,31 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d гүйлгээнүүд аль хэдийнээ импорт хийгдсэн тул алгаслаа."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 гүйлгээ аль хэдийнээ импорт хийгдсэн тул алгаслаа."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Аль хэдийнээ импорт хийгдсэн мөрүүд"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,128 +58,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Үүсгэсэн этгээд"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Үүсгэсэн огноо"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Дэлгэрэнгүй нэр"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "Банкны хуулгын электрон форматыг банкнаасаа авч энд сонгоно уу."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Импортлох"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Банкны хуулга импортлох"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Банкны хуулга импортлох"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Хуулга Импортлох"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Сүүлд зассан огноо"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Сүүлд зассан этгээд"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Сүүлд зассан огноо"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Энэ файл нь ямар ч гүйлгээ агуулаагүй байна."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Касс, харилцахын хуулганы мөр"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Касс, харилцахын хуулганы мөр"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr " хуулганы данс нь (%s) журналийн данстай ижил биш байна."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -185,24 +187,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -210,23 +215,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -235,29 +242,32 @@ msgstr ""
 "Өгсөн файлын утгыг ойлгосонгүй.\n"
 "Тухайн файлд тохирох модулийг суулгасан уу?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Касс, харилцахын хуулганы мөр"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "эсвэл"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Аль хэдийнээ импорт хийгдсэн мөрүүд"
+
+#~ msgid "or"
+#~ msgstr "эсвэл"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/nb.po b/account_statement_import_file/i18n/nb.po
index 6e2b81ef..874fe9cc 100644
--- a/account_statement_import_file/i18n/nb.po
+++ b/account_statement_import_file/i18n/nb.po
@@ -22,31 +22,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transaksjoner var allerede importert og ble ignorert."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaksjon var importert fra før, og ble ignorert."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Allerede importerte oppføringer"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -55,128 +57,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Opprettet av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Opprettet"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Visningsnavn"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Import"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importer bankutskrift"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importer bankutskrift"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sist endret"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Sist oppdatert av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Filen inneholder ingen transaksjoner."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Kontoutskrift-linje"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Kontoutskrift-linje"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -184,24 +186,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -209,52 +214,57 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Kontoutskrift-linje"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "eller"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Allerede importerte oppføringer"
+
+#~ msgid "or"
+#~ msgstr "eller"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/ne.po b/account_statement_import_file/i18n/ne.po
index 32cb9eae..4774d63d 100644
--- a/account_statement_import_file/i18n/ne.po
+++ b/account_statement_import_file/i18n/ne.po
@@ -15,31 +15,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -48,124 +50,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -173,24 +175,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -198,48 +203,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/nl.po b/account_statement_import_file/i18n/nl.po
index 886448ea..27b95224 100644
--- a/account_statement_import_file/i18n/nl.po
+++ b/account_statement_import_file/i18n/nl.po
@@ -26,31 +26,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transacties werden reeds geïmporteerd en werden genegeerd."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transactie werd reeds geïmporteerd en werd genegeerd."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Al geïmporteerde items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,23 +61,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -83,104 +85,104 @@ msgstr ""
 "Verkrijg je bankafschriften in elktronische vorm van je bank en selecteer "
 "deze hier."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importeer"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Bankafschriften importeren"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Bankafschriften importeren"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Bankafschrift importeren"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Dagboek"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Valutacode ontbreekt in het bankafschriftbestand."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Er ontbreekt een betaal referentie voor deze transactie."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Bankafschrift bestand"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Bankafschrift bestandsnaam"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Ondersteunende formaten:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "De rekening van dit afschrift is niet hetzelfde als het dagboek '%s'."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -188,8 +190,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -198,16 +201,18 @@ msgstr ""
 "In het bankafschrift komt de valuta '%s' voor, maar deze is niet in de "
 "administratie ingesteld."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -218,24 +223,26 @@ msgstr ""
 "nummer, u dient de gids opnieuw te starten vanuit het dagboek in het "
 "dashboard."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 "Er is een fout opgetreden bij het verwerken van het bankafschrift bestand."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -244,18 +251,19 @@ msgstr ""
 "Het opgegeven bestand is niet of onvoldoende leesbaar.\n"
 "Is de module geïnstalleerd die dit bestandstype ondersteunt ?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Upload bankafschriften"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Upload een bankafschrift bestand"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -264,10 +272,12 @@ msgstr ""
 "U heeft dit bestand al geimporteerd, of het bestand bevat enkel reeds "
 "geimporteerde transacties."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "of"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Al geïmporteerde items"
+
+#~ msgid "or"
+#~ msgstr "of"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr "Een banktransactie kan slechts eenmaal worden geïmporteerd !"
diff --git a/account_statement_import_file/i18n/nl_BE.po b/account_statement_import_file/i18n/nl_BE.po
index 9fccac91..d33eec90 100644
--- a/account_statement_import_file/i18n/nl_BE.po
+++ b/account_statement_import_file/i18n/nl_BE.po
@@ -19,31 +19,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -52,124 +54,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Aangemaakt door"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Aangemaakt op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Laatst bijgewerkt door"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Bedrijf"
 
diff --git a/account_statement_import_file/i18n/pl.po b/account_statement_import_file/i18n/pl.po
index 68e98a74..e9dad0ca 100644
--- a/account_statement_import_file/i18n/pl.po
+++ b/account_statement_import_file/i18n/pl.po
@@ -35,31 +35,33 @@ msgstr ""
 "%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transakcji już zaimportowanych oraz zignorowanych."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transakcja została już importowana i została ignorowana."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Importowane dokumenty"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -68,23 +70,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Utworzona przez"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Data utworzenia"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nazwa wyświetlana"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -92,106 +94,106 @@ msgstr ""
 "Pobierz swój wyciąg bankowy w formacie elektronicznym ze swojego banku i "
 "wybierz go z tego miejsca."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importuj"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Pobierz Wyciąg Bankowy"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Pobierz Wyciąg Bankowy"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importuj wyciąg"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Dziennik"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Data ostatniej modyfikacji"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Ostatnio aktualizowane przez"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Data ostatniej aktualizacji"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Ten plik nie zawiera żadnych informacji o transakcji."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Pozycja wyciągu bankowego"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Pozycja wyciągu bankowego"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Konto świadczenia nie pokrywa się z dziennikiem (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -199,24 +201,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -224,23 +229,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -249,29 +256,32 @@ msgstr ""
 "Nie można przetworzyć podanego pliku.\n"
 "Czy masz zainstalowany moduł wspierający ten typ pliku ?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Pozycja wyciągu bankowego"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "lub"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Importowane dokumenty"
+
+#~ msgid "or"
+#~ msgstr "lub"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/pt.po b/account_statement_import_file/i18n/pt.po
index 5390f282..7a8e8885 100644
--- a/account_statement_import_file/i18n/pt.po
+++ b/account_statement_import_file/i18n/pt.po
@@ -17,31 +17,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transações já tinham sido importadas e foram ignoradas."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transação já tinha sido importada e foi ignorada."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Itens já importados"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -50,125 +52,125 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Criada por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Criado em"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome a Exibir"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Obtenha os seus extratos bancários em formato eletrónico e selecione-os aqui."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr "Importar Ficheiro de Extrato Bancário"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr "Importar Ficheiros de Extratos Bancários"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importar Extrato"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Diário"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação em"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Ultima Atualização por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última Atualização em"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Falta o código da moeda no ficheiro do extrato bancário."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Falta o payment_ref numa transação."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Ficheiro do Extrato"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Nome do Ficheiro do Extrato"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Formatos suportados:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "A Conta de Banco não está definida no diário '%s'."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,8 +178,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -185,16 +188,18 @@ msgid ""
 msgstr ""
 "O ficheiro de extrato bancário usa a moeda '%s', mas esta não existe em Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -205,23 +210,25 @@ msgstr ""
 "bancária, de modo que deve iniciar o assistente a partir do diário bancário "
 "correto no painel."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr "A análise do ficheiro do extrato devolveu um resultado inválido."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -230,18 +237,19 @@ msgstr ""
 "Este formato do ficheiro de extrato bancário não é suportado.\n"
 "Você instalou o módulo Odoo para suportar este formato?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Carregar de Extratos Bancários"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr "Carregar um arquivo de extrato bancário"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -249,10 +257,12 @@ msgid ""
 msgstr ""
 "Ou já importou este arquivo ou este contém apenas transações já importadas."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ou"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Itens já importados"
+
+#~ msgid "or"
+#~ msgstr "ou"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr "Uma transação de conta bancária só pode ser importada uma vez!"
diff --git a/account_statement_import_file/i18n/pt_BR.po b/account_statement_import_file/i18n/pt_BR.po
index f3b6669d..c786a8ee 100644
--- a/account_statement_import_file/i18n/pt_BR.po
+++ b/account_statement_import_file/i18n/pt_BR.po
@@ -35,31 +35,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transações já haviam sido importadas e foram ignoradas."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transação já havia sido importada e foi ignorada."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Itens já importados"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -68,23 +70,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Criado por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Criado em"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome exibido"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -92,106 +94,106 @@ msgstr ""
 "Obtenha seus extratos bancários em formato eletrônico do seu banco e "
 "selecione-os aqui."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importar Extrato Bancário"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importar Extrato Bancário"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importar Extrato"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Diário"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificação em"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Última atualização por"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Última atualização em"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Este arquivo não contém qualquer transação."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Linha de Extrato Bancário"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Linha de Extrato Bancário"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "A conta deste extrato não é a mesma que o diário (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -199,24 +201,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -224,23 +229,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -249,29 +256,32 @@ msgstr ""
 "Não foi possível entender arquivo enviado.\n"
 "Você instalou o módulo de apoio a este tipo de arquivo?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Linha de Extrato Bancário"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "ou"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Itens já importados"
+
+#~ msgid "or"
+#~ msgstr "ou"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/ro.po b/account_statement_import_file/i18n/ro.po
index 95d0e656..a7a3f3b9 100644
--- a/account_statement_import_file/i18n/ro.po
+++ b/account_statement_import_file/i18n/ro.po
@@ -16,31 +16,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -49,124 +51,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -174,24 +176,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -199,48 +204,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/ru.po b/account_statement_import_file/i18n/ru.po
index 01fccd5d..f88552da 100644
--- a/account_statement_import_file/i18n/ru.po
+++ b/account_statement_import_file/i18n/ru.po
@@ -25,31 +25,33 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d транзакций уже импортировались ранее и были проигнорированы"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 транзакция уже импортировалась ранее и была проигнорирована"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Уже импортированные позиции"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Отменить"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -58,129 +60,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Создано"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Создан"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Отображаемое Имя"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Получайте выписки из вашего банка в электронном формате и выбирайте их здесь."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "Номер"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Импорт"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Импорт банковской выписки"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Импорт банковской выписки"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "ID Выписки"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последнее изменение"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновил"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Последнее обновление"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Данный файл не содержит ни одного перевода."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Позиция банковской выписки"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Позиция банковской выписки"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Счёт этой Выписки не совпадает с Журналом (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -188,24 +190,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -213,23 +218,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -238,29 +245,32 @@ msgstr ""
 "Нет представления для данного файла.\n"
 "Хотите установить модуль для поддержки данного типа файлов?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Позиция банковской выписки"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "или"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Уже импортированные позиции"
+
+#~ msgid "or"
+#~ msgstr "или"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/sk.po b/account_statement_import_file/i18n/sk.po
index 9b06782e..b5ef3da7 100644
--- a/account_statement_import_file/i18n/sk.po
+++ b/account_statement_import_file/i18n/sk.po
@@ -22,31 +22,33 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n "
 ">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transakcie už boli importovné a boli ignorovné."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transakcia už bola importovaná a bola ignorovaná."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Už importované položky"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -55,23 +57,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Vytvoril"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Vytvorené"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný Názov"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -79,106 +81,106 @@ msgstr ""
 "Získajte svoje bankové výpisy v elektronickej podobe z vašej banky a vyberte "
 "ich tu."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Import"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Import Bank Statement"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importovať bankové výpisy"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importovať výpis"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Účtovná kniha"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Naposledy upravoval"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Naposledy upravované"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Tento súbor neobsahuje žiadnu transakciu."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Súbor bankového výpisu"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Súbor bankového výpisu"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Účet tohoto výpisu nie je rovnaký ako účtovná kniha (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,23 +216,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -236,30 +243,33 @@ msgstr ""
 "Daný súbor nedáva zmysel.\n"
 "Nainštalovali ste modul pre podporu tohto typu súboru?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Importovať bankové výpisy"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Zvoľte súbor bankového výpisu n importovanie"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "alebo"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Už importované položky"
+
+#~ msgid "or"
+#~ msgstr "alebo"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/sl.po b/account_statement_import_file/i18n/sl.po
index 693c4f71..00083cc0 100644
--- a/account_statement_import_file/i18n/sl.po
+++ b/account_statement_import_file/i18n/sl.po
@@ -16,31 +16,33 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -49,124 +51,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -174,24 +176,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -199,48 +204,46 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
diff --git a/account_statement_import_file/i18n/sq.po b/account_statement_import_file/i18n/sq.po
index f3d8408d..7cbdf33c 100644
--- a/account_statement_import_file/i18n/sq.po
+++ b/account_statement_import_file/i18n/sq.po
@@ -18,31 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Anullo"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -51,124 +53,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Krijuar nga"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Krijuar me"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Emri i paraqitur"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Modifikimi i fundit në"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Modifikuar per here te fundit nga"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Modifikuar per here te fundit me"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -176,24 +178,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -201,52 +206,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "Kompani"
 
diff --git a/account_statement_import_file/i18n/sr.po b/account_statement_import_file/i18n/sr.po
index 74ec1744..e95ffeaf 100644
--- a/account_statement_import_file/i18n/sr.po
+++ b/account_statement_import_file/i18n/sr.po
@@ -21,31 +21,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Otkaži"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -54,128 +56,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Kreiran"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Извештај"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -183,24 +185,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -208,54 +213,52 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Red bankovnog izveštaja"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Bank Statement Line"
 #~ msgstr "Red bankovnog izveštaja"
 
diff --git a/account_statement_import_file/i18n/sr@latin.po b/account_statement_import_file/i18n/sr@latin.po
index 9d1de33f..9358b3f0 100644
--- a/account_statement_import_file/i18n/sr@latin.po
+++ b/account_statement_import_file/i18n/sr@latin.po
@@ -24,31 +24,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Odustani"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -57,128 +59,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Kreirao"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Datum kreiranja"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Naziv za prikaz"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Uvoz"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Učitaj izvod iz banke"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Učitaj izvod iz banke"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Dnevnik"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnja promena"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Promenio"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Vreme promene"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Stavka izvoda"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Stavka izvoda"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,54 +216,52 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Učitaj izvod iz banke"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Stavka izvoda"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Bank Statement Line"
 #~ msgstr "Stavka izvoda"
 
diff --git a/account_statement_import_file/i18n/sv.po b/account_statement_import_file/i18n/sv.po
index 2fa10d73..c8b59872 100644
--- a/account_statement_import_file/i18n/sv.po
+++ b/account_statement_import_file/i18n/sv.po
@@ -23,31 +23,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d transaktionerna hade redan importerats och ignorerades därför."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 transaktion hade redan importerats och ignorerats därför."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Redan importerade transaktioner"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,127 +58,127 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Skapad av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Skapad den"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Visningsnamn"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Hämta dina kontoutdrag i elektroniskt format från din bank och välj dem här."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Importera"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Importera bankkontoutdrag"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importera bankkontoutdrag"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Importera kontoutdrag"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Journal"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Senast ändrad den"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Senast uppdaterad av"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Senast uppdaterad den"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr "Saknar valutakod i bankkontoutdraget."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Det saknas payment_ref på en transaktion."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr "Kontoutdragsfil"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr "Kontoutdragets filnamn"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr "Format som stöds:"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Bankbokföringskontot är inte inställt i journalen '%s'."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -184,8 +186,9 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
@@ -194,16 +197,18 @@ msgstr ""
 "Bankutdragsraden använder valutan '%s' men det finns inte någon sådan valuta "
 "i Odoo."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -213,23 +218,25 @@ msgstr ""
 "Formatet för den här kontoutdragsfilen innehåller inte bankkontonumret, så "
 "du måste starta guiden från rätt bankjournal i instrumentpanelen."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -238,20 +245,21 @@ msgstr ""
 "Detta filformat för bankutdrag stöds inte.\n"
 "Har du installerat en modul för att stödja detta format?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "Importera bankkontoutdrag"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Välj ett kontoutdrag att importera"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
@@ -260,10 +268,12 @@ msgstr ""
 "Du har redan importerat den här filen eller så innehåller den här filen "
 "endast transaktioner som redan har importerats."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "eller"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Redan importerade transaktioner"
+
+#~ msgid "or"
+#~ msgstr "eller"
 
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr "En banktransaktion kan endast importeras en gång!"
diff --git a/account_statement_import_file/i18n/ta.po b/account_statement_import_file/i18n/ta.po
index 6f3e76e6..1dac664a 100644
--- a/account_statement_import_file/i18n/ta.po
+++ b/account_statement_import_file/i18n/ta.po
@@ -17,31 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "ரத்து"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -50,126 +52,126 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "உருவாக்கியவர்"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 "உருவாக்கப்பட்ட \n"
 "தேதி"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "காட்சி பெயர்"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "இறக்குமதி"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "கடைசியாக திருத்திய"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "கடைசியாக புதுப்பிக்கப்பட்டது"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "கடைசியாக புதுப்பிக்கப்பட்டது"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -177,24 +179,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -202,52 +207,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #~ msgid "Company"
 #~ msgstr "நிறுவனம்"
 
diff --git a/account_statement_import_file/i18n/te.po b/account_statement_import_file/i18n/te.po
index e9b9b696..cfab6fc5 100644
--- a/account_statement_import_file/i18n/te.po
+++ b/account_statement_import_file/i18n/te.po
@@ -17,31 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -50,124 +52,124 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 msgid "Import Bank Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 msgid "Import Bank Statement Files"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 msgid "Statement File"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 msgid "Statement Filename"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -175,24 +177,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -200,52 +205,50 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload a bank statement file"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr ""
-
 #, fuzzy
 #~ msgid "Partner Bank Account"
 #~ msgstr "బ్యాంకు ఖాతా"
diff --git a/account_statement_import_file/i18n/th.po b/account_statement_import_file/i18n/th.po
index b7b7ca2d..7cc09337 100644
--- a/account_statement_import_file/i18n/th.po
+++ b/account_statement_import_file/i18n/th.po
@@ -23,31 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,128 +58,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "สร้างโดย"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "สร้างเมื่อ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "รหัส"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "นำเข้า"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "นำเข้ารายการเดินบัญชี"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "นำเข้ารายการเดินบัญชี"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "สมุดบัญชี"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "อัพเดทครั้งสุดท้ายโดย"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "บรรทัดรายการเดินบัญชีธนาคาร"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "บรรทัดรายการเดินบัญชีธนาคาร"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -185,24 +187,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -210,53 +215,54 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload Bank Statements"
 msgstr "นำเข้ารายการเดินบัญชี"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "บรรทัดรายการเดินบัญชีธนาคาร"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "หรือ"
+#~ msgid "or"
+#~ msgstr "หรือ"
 
 #~ msgid "Bank Statement Line"
 #~ msgstr "บรรทัดรายการเดินบัญชีธนาคาร"
diff --git a/account_statement_import_file/i18n/tr.po b/account_statement_import_file/i18n/tr.po
index 7728982d..533b435e 100644
--- a/account_statement_import_file/i18n/tr.po
+++ b/account_statement_import_file/i18n/tr.po
@@ -31,31 +31,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d işlemi zaten içe aktarılmış ve gözardı edildi."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 işlem zaten içe aktarılmış ve gözardı edildi."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Zaten İçe Aktarılmış Kalemler"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -64,129 +66,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Oluşturan"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Oluşturulma"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Görünüm Adı"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Bankanızdan elektronik formatta banka hesap özetini alın ve buradan seçin."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "İçe Aktar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Banka İçe Aktar"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Banka İçe Aktar"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Ekstre İçe Aktar"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Yevmiye"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Son Güncelleme"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Son Güncelleyen"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Son Güncelleme"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Bu dosya herhangi bir işlem içermiyor."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Banka Hesap Özeti Kalemi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Banka Hesap Özeti Kalemi"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Bu kaydın hesabı, yevmiye (%s) aynı değil."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -194,24 +196,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -219,23 +224,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -244,29 +251,32 @@ msgstr ""
 "Verilen dosyayı anlamam mümkün değil.\n"
 "Bu tür dosyaları destekleyen modülü kurdunuz mu?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Banka Hesap Özeti Kalemi"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "veya"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Zaten İçe Aktarılmış Kalemler"
+
+#~ msgid "or"
+#~ msgstr "veya"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/uk.po b/account_statement_import_file/i18n/uk.po
index b3c7f345..57f15b48 100644
--- a/account_statement_import_file/i18n/uk.po
+++ b/account_statement_import_file/i18n/uk.po
@@ -23,31 +23,33 @@ msgstr ""
 "100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
 "(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d транзакцій вже було імпортовано раніше тому вони пропущені"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 транзакцію вже було імпортовано раніше тому вона пропущена"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Вже імпортовані елементи"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,129 +58,129 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Створив"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Створено на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr ""
 "Отримайте виписку в електронному форматі з вашого банку та оберіть її тут."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Імпорт"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Імпортувати банківську виписку"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Імпортувати банківську виписку"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Імпорт виписки"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Журнал"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Останні зміни на"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Востаннє оновив"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Файл не містить транзакцій."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Рядок банківської виписки"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Рядок банківської виписки"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "Рахунок виписки не співпадає з рахунком журналу (%s) !"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -186,24 +188,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -211,23 +216,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -236,29 +243,32 @@ msgstr ""
 "Неможливо розібрати обраний файл.\n"
 "Переконайтеся, що встановлено модуль для підтримки цього формату."
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "Завантажте банківські виписки"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Завантажте банківські виписки"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "або"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Вже імпортовані елементи"
+
+#~ msgid "or"
+#~ msgstr "або"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/vi.po b/account_statement_import_file/i18n/vi.po
index 76ad3a44..0b51bcb7 100644
--- a/account_statement_import_file/i18n/vi.po
+++ b/account_statement_import_file/i18n/vi.po
@@ -26,31 +26,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d giao dịch đã được nhập rồi và đã bị bỏ qua"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1 giao dịch đã được nhập rồi và đã bị bỏ qua"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "Các hạng mục đã nhập rồi"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "Hủy"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -59,23 +61,23 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "Được tạo bởi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "Thời điểm tạo"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
@@ -83,107 +85,107 @@ msgstr ""
 "Nhận sao kê ngân hàng định dạng điện tử từ ngân hàng của bạn và chọn chúng ở "
 "đây."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "Nhập"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "Nhập Sao kê Ngân hàng"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Nhập Sao kê Ngân hàng"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "Nhập Giao dịch"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "Sổ nhật ký"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "Cập nhật gần đây bởi"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "Cập nhật gần đây vào"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "Tập tin này không chứa bất kỳ giao dịch nào."
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "Giao dịch trên sổ phụ ngân hàng"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "Giao dịch trên sổ phụ ngân hàng"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
 "Tài khoản của giao dịch này không giống với tài khoản của sổ nhật ký (%s)."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -191,24 +193,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -216,23 +221,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -241,29 +248,32 @@ msgstr ""
 "Không biết loại tập tin này là gì.\n"
 "Bạn đã cài module mà hỗ trợ loại tập tin này chưa?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "Giao dịch trên sổ phụ ngân hàng"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "hoặc"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "Các hạng mục đã nhập rồi"
+
+#~ msgid "or"
+#~ msgstr "hoặc"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/zh_CN.po b/account_statement_import_file/i18n/zh_CN.po
index 86cfeed0..918b29bb 100644
--- a/account_statement_import_file/i18n/zh_CN.po
+++ b/account_statement_import_file/i18n/zh_CN.po
@@ -35,31 +35,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d 已导入的交易将被忽略"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1个 已导入的交易将被忽略."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "已导入的项目"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "取消日期"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -68,128 +70,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "创建者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "创建时间"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "从银行拿到电子格式的银行对账单并且在这里选择他们"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "导入"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "导入银行对账单"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "导入银行对账单"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "导入对账单"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "日记账"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最后更改日"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "最后更新者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "更新时间"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "这个文件不包含任何交易"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "银行对账单明细"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "银行对账单明细"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "对账单中的科目和日记账(%s)中的不一样"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -197,24 +199,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -222,23 +227,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -247,29 +254,32 @@ msgstr ""
 "提供的文件不对.\n"
 "你安装了模块来支持这种类型的文件吗？"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr "上传银行对账单"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "上传银行对账单"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "或"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "已导入的项目"
+
+#~ msgid "or"
+#~ msgstr "或"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
diff --git a/account_statement_import_file/i18n/zh_TW.po b/account_statement_import_file/i18n/zh_TW.po
index 76e2cc93..5c0412b0 100644
--- a/account_statement_import_file/i18n/zh_TW.po
+++ b/account_statement_import_file/i18n/zh_TW.po
@@ -23,31 +23,33 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "%d transactions had already been imported and were ignored."
 msgstr "%d 已導入的交易將被忽略"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "1 transaction had already been imported and was ignored."
 msgstr "1個 已導入的交易將被忽略."
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "Already imported items"
-msgstr "已導入的專案"
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
+msgid "<span>Import (OCA)</span>"
+msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Cancel"
 msgstr "取消"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "Could not find any bank account with number '%(account_number)s' linked to "
@@ -56,128 +58,128 @@ msgid ""
 "should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_uid
 msgid "Created by"
 msgstr "創立者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__create_date
 msgid "Created on"
 msgstr "建立於"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#. module: account_statement_import
-#: model:ir.model.fields,help:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,help:account_statement_import_file.field_account_statement_import__statement_file
 msgid ""
 "Get you bank statements in electronic format from your bank and select them "
 "here."
 msgstr "從銀行拿到電子格式的銀行對帳單並且在這裡選擇他們"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/models/account_journal.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/models/account_journal.py:0
 #, python-format
 msgid "Import"
 msgstr "導入"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "Import (OCA)"
-msgstr ""
-
-#. module: account_statement_import
-#: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#. module: account_statement_import_file
+#: model:ir.actions.act_window,name:account_statement_import_file.account_statement_import_action
 #, fuzzy
 msgid "Import Bank Statement File"
 msgstr "導入銀行對帳單"
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_statement_import
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_statement_import
 #, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "導入銀行對帳單"
 
-#. module: account_statement_import
-#: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
+#. module: account_statement_import_file
+#: model:ir.ui.menu,name:account_statement_import_file.account_statement_import_menu
 msgid "Import Statement"
 msgstr "導入對帳單"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.journal_dashboard_view_inherit
 msgid "Import Statement (OCA)"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Import and View"
 msgstr ""
 
-#. module: account_statement_import
-#: model:ir.model,name:account_statement_import.model_account_journal
+#. module: account_statement_import_file
+#: model:ir.model,name:account_statement_import_file.model_account_journal
 msgid "Journal"
 msgstr "日記帳"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最後修改於"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_uid
 msgid "Last Updated by"
 msgstr "最後更新者"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_date
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__write_date
 msgid "Last Updated on"
 msgstr "最後更新於"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
 msgstr "這個文件不包含任何交易"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_file
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_file
 #, fuzzy
 msgid "Statement File"
 msgstr "銀行對帳單明細"
 
-#. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__statement_filename
+#. module: account_statement_import_file
+#: model:ir.model.fields,field_description:account_statement_import_file.field_account_statement_import__statement_filename
 #, fuzzy
 msgid "Statement Filename"
 msgstr "銀行對帳單明細"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Supported formats:"
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr "對帳單中的科目和日記帳(%s)中的不一樣"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank account with number '%(account_number)s' exists in Odoo but it is "
@@ -185,24 +187,27 @@ msgid ""
 "If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The currency of the bank statement (%(currency_name)s) is not the same as "
 "the currency of the journal '%(journal_name)s' (%(journal_currency_name)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "The format of this bank statement file doesn't contain the bank account "
@@ -210,23 +215,25 @@ msgid ""
 "dashboard."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The journal found for the file is not consistent with the selected journal. "
-"You should use the proper journal or use the generic button on the top of "
-"the Accounting Dashboard"
+"The journal found for the file (%(journal_match)s) is different from the "
+"selected journal (%(journal_selected)s)."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
 msgstr ""
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
@@ -235,29 +242,32 @@ msgstr ""
 "提供的文件不對.\n"
 "您有安裝支援這文件的模組嗎?"
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 msgid "Upload Bank Statements"
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#. module: account_statement_import_file
+#: model_terms:ir.ui.view,arch_db:account_statement_import_file.account_statement_import_form
 #, fuzzy
 msgid "Upload a bank statement file"
 msgstr "銀行對帳單明細"
 
-#. module: account_statement_import
-#: code:addons/account_statement_import/wizard/account_statement_import.py:0
+#. module: account_statement_import_file
+#. odoo-python
+#: code:addons/account_statement_import_file/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
 
-#. module: account_statement_import
-#: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
-msgid "or"
-msgstr "或"
+#, python-format
+#~ msgid "Already imported items"
+#~ msgstr "已導入的專案"
+
+#~ msgid "or"
+#~ msgstr "或"
 
 #, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"