diff --git a/account_statement_import/migrations/14.0.1.0.0/pre-migration.py b/account_statement_import/migrations/14.0.1.0.0/pre-migration.py
deleted file mode 100644
index a9bdf2e5..00000000
--- a/account_statement_import/migrations/14.0.1.0.0/pre-migration.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022 ForgeFlow S.L.  <https://www.forgeflow.com>
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-
-_model_renames = [
-    (
-        "account.bank.statement.import",
-        "account.statement.import",
-    ),
-]
-
-_table_renames = [
-    (
-        "account_bank_statement_import",
-        "account_statement_import",
-    ),
-]
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    openupgrade.rename_models(env.cr, _model_renames)
-    openupgrade.rename_tables(env.cr, _table_renames)
diff --git a/account_statement_import/migrations/14.0.2.0.0/pre-migration.py b/account_statement_import/migrations/14.0.2.0.0/pre-migration.py
deleted file mode 100644
index 945fcfdb..00000000
--- a/account_statement_import/migrations/14.0.2.0.0/pre-migration.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 ForgeFlow S.L.  <https://www.forgeflow.com>
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    if openupgrade.column_exists(
-        env.cr, "account_bank_statement_line", "partner_bank_id"
-    ):
-        # during v14, a partner_bank_id field was added to statement lines,
-        # but later we realized it is not needed.
-        # As we remove the explicit partner_bank_id in statement line, we need to transfer the
-        # values to the move for getting them through delegated inheritance
-        openupgrade.logged_query(
-            env.cr,
-            """
-            UPDATE account_move am
-            SET partner_bank_id = absl.partner_bank_id
-            FROM account_bank_statement_line absl
-            WHERE am.statement_line_id = absl.id
-                AND am.partner_bank_id IS NULL AND absl.partner_bank_id IS NOT NULL""",
-        )
-        openupgrade.lift_constraints(
-            env.cr, "account_bank_statement_line", "partner_bank_id"
-        )
diff --git a/account_statement_import/static/src/js/account_dashboard_kanban.js b/account_statement_import/static/src/js/account_dashboard_kanban.js
deleted file mode 100644
index b45327e2..00000000
--- a/account_statement_import/static/src/js/account_dashboard_kanban.js
+++ /dev/null
@@ -1,25 +0,0 @@
-odoo.define("account_statement_import.dashboard.kanban", function (require) {
-    "use strict";
-    var viewRegistry = require("web.view_registry");
-
-    var AccountDashboardView = viewRegistry.get("account_dashboard_kanban");
-    // Value can be undefined on some test scenarios. Avoid an error by checking if it is defined
-    if (AccountDashboardView !== undefined) {
-        var AccountDashboardController =
-            AccountDashboardView.prototype.config.Controller;
-        AccountDashboardController.include({
-            buttons_template: "AccountDashboardView.buttons",
-            // We are reusing the create button
-            _onButtonNew: function (ev) {
-                ev.stopPropagation();
-                return this.trigger_up("do_action", {
-                    action: "account_statement_import.account_statement_import_action",
-                });
-            },
-        });
-        return {
-            AccountDashboardView: AccountDashboardView,
-            AccountDashboardController: AccountDashboardController,
-        };
-    }
-});
diff --git a/account_statement_import/static/src/xml/account_dashboard_kanban.xml b/account_statement_import/static/src/xml/account_dashboard_kanban.xml
deleted file mode 100644
index 7a4cdfd2..00000000
--- a/account_statement_import/static/src/xml/account_dashboard_kanban.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<template>
-    <t t-name="AccountDashboardView.buttons">
-        <div>
-            <button
-                type="button"
-                t-attf-class="btn #{btnClass} o-kanban-button-new"
-                accesskey="c"
-            >
-                <t t-esc="_t('Import Statement (OCA)')" />
-            </button>
-        </div>
-    </t>
-</template>
diff --git a/account_statement_import/templates/assets.xml b/account_statement_import/templates/assets.xml
deleted file mode 100644
index ae901090..00000000
--- a/account_statement_import/templates/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script
-                type="text/javascript"
-                src="/account_statement_import/static/src/js/account_dashboard_kanban.js"
-            />
-        </xpath>
-    </template>
-</odoo>
diff --git a/account_statement_import/wizard/setup_wizards.py b/account_statement_import/wizard/setup_wizards.py
deleted file mode 100644
index 841f0ff4..00000000
--- a/account_statement_import/wizard/setup_wizards.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2004-2020 Odoo S.A.
-# Licence LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0).
-
-from odoo import models
-
-
-class AccountSetupBankManualConfig(models.TransientModel):
-    _inherit = "account.setup.bank.manual.config"
-
-    def validate(self):
-        """Default the bank statement source of new bank journals as 'file_import'"""
-        super().validate()
-        if (
-            self.num_journals_without_account == 0
-            or self.linked_journal_id.bank_statements_source == "undefined"
-        ) and self.env[
-            "account.journal"
-        ]._get_bank_statements_available_import_formats():
-            self.linked_journal_id.bank_statements_source = "file_import"
diff --git a/account_statement_import/README.rst b/account_statement_import_file/README.rst
similarity index 100%
rename from account_statement_import/README.rst
rename to account_statement_import_file/README.rst
diff --git a/account_statement_import/__init__.py b/account_statement_import_file/__init__.py
similarity index 100%
rename from account_statement_import/__init__.py
rename to account_statement_import_file/__init__.py
diff --git a/account_statement_import/__manifest__.py b/account_statement_import_file/__manifest__.py
similarity index 86%
rename from account_statement_import/__manifest__.py
rename to account_statement_import_file/__manifest__.py
index 28c80eb2..198d4440 100644
--- a/account_statement_import/__manifest__.py
+++ b/account_statement_import_file/__manifest__.py
@@ -6,7 +6,7 @@
 {
     "name": "Import Statement Files",
     "category": "Accounting",
-    "version": "14.0.3.3.0",
+    "version": "16.0.1.0.0",
     "license": "LGPL-3",
     "depends": ["account_statement_import_base"],
     "author": "Odoo SA, Akretion, Odoo Community Association (OCA)",
@@ -17,11 +17,9 @@
         "security/ir.model.access.csv",
         "wizard/account_statement_import_view.xml",
         "views/account_journal.xml",
-        "templates/assets.xml",
     ],
     "demo": [
         "demo/partner_bank.xml",
     ],
     "installable": True,
-    "qweb": ["static/src/xml/account_dashboard_kanban.xml"],
 }
diff --git a/account_statement_import/demo/partner_bank.xml b/account_statement_import_file/demo/partner_bank.xml
similarity index 98%
rename from account_statement_import/demo/partner_bank.xml
rename to account_statement_import_file/demo/partner_bank.xml
index ff5a9939..fcf2fbc4 100644
--- a/account_statement_import/demo/partner_bank.xml
+++ b/account_statement_import_file/demo/partner_bank.xml
@@ -5,7 +5,6 @@
   Licence LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0).
 -->
 <odoo>
-    <data>
 
         <record id="ofx_partner_bank_1" model="res.partner.bank">
             <field name="acc_number">BE02631118262640</field>
@@ -31,5 +30,4 @@
             <field name="bank_id" ref="base.res_bank_1" />
         </record>
 
-    </data>
 </odoo>
diff --git a/account_statement_import/i18n/account_statement_import.pot b/account_statement_import_file/i18n/account_statement_import_file.pot
similarity index 88%
rename from account_statement_import/i18n/account_statement_import.pot
rename to account_statement_import_file/i18n/account_statement_import_file.pot
index eb415470..80d68ecc 100644
--- a/account_statement_import/i18n/account_statement_import.pot
+++ b/account_statement_import_file/i18n/account_statement_import_file.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -40,9 +40,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You"
-" should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on"
+" the related bank journal. If the related bank journal doesn't exist yet, "
+"you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -56,7 +57,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -69,7 +69,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -116,7 +115,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -161,16 +159,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -185,8 +183,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/af.po b/account_statement_import_file/i18n/af.po
similarity index 89%
rename from account_statement_import/i18n/af.po
rename to account_statement_import_file/i18n/af.po
index b7d8da55..a9e96d5f 100644
--- a/account_statement_import/i18n/af.po
+++ b/account_statement_import_file/i18n/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Andre de Kock <adekock11@gmail.com>, 2017\n"
 "Language-Team: Afrikaans (https://www.transifex.com/odoo/teams/41243/af/)\n"
@@ -46,9 +46,10 @@ msgstr "Kanselleer"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Geskep op"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vertoningsnaam"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laas Gewysig op"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/am.po b/account_statement_import_file/i18n/am.po
similarity index 89%
rename from account_statement_import/i18n/am.po
rename to account_statement_import_file/i18n/am.po
index aa308bb3..052e26a7 100644
--- a/account_statement_import/i18n/am.po
+++ b/account_statement_import_file/i18n/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Amharic (https://www.transifex.com/odoo/teams/41243/am/)\n"
@@ -45,9 +45,10 @@ msgstr "መሰረዝ"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ar.po b/account_statement_import_file/i18n/ar.po
similarity index 95%
rename from account_statement_import/i18n/ar.po
rename to account_statement_import_file/i18n/ar.po
index 95a7de0e..7c3a399f 100644
--- a/account_statement_import/i18n/ar.po
+++ b/account_statement_import_file/i18n/ar.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Yazeed Dandashi <lay@odoo.com>, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
@@ -61,9 +61,10 @@ msgstr "إلغاء"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -77,7 +78,6 @@ msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "الاسم المعروض"
@@ -90,7 +90,6 @@ msgid ""
 msgstr "احصل على كشوفات حسابك بصيغة إلكترونية واخترها من هنا."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "المُعرف"
@@ -139,7 +138,6 @@ msgid "Journal"
 msgstr "دفتر اليومية"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
@@ -186,16 +184,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "الحساب في كشف الحساب البنكي (%s) مختلف عن حساب دفتر اليومية (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -208,12 +206,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"العملة في كشف الحساب البنكي (%s) مختلفة عن العملة في دفتر اليومية (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -287,6 +284,14 @@ msgstr "أو"
 #~ msgid "Partner Bank Account"
 #~ msgstr "حساب بنكي"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "العملة في كشف الحساب البنكي (%s) مختلفة عن العملة في دفتر اليومية "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "هذا الملف لا يحتوي على أي كشف حساب."
 
diff --git a/account_statement_import/i18n/az.po b/account_statement_import_file/i18n/az.po
similarity index 88%
rename from account_statement_import/i18n/az.po
rename to account_statement_import_file/i18n/az.po
index 5cd81252..7de94fe4 100644
--- a/account_statement_import/i18n/az.po
+++ b/account_statement_import_file/i18n/az.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/odoo/teams/41243/az/)\n"
 "Language: az\n"
@@ -42,9 +42,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -58,7 +59,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -71,7 +71,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -118,7 +117,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -163,16 +161,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -187,8 +185,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/bg.po b/account_statement_import_file/i18n/bg.po
similarity index 89%
rename from account_statement_import/i18n/bg.po
rename to account_statement_import_file/i18n/bg.po
index dd3e3ed8..16d069da 100644
--- a/account_statement_import/i18n/bg.po
+++ b/account_statement_import_file/i18n/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/odoo/teams/41243/bg/)\n"
@@ -45,9 +45,10 @@ msgstr "Откажи"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Създадено на"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Име за показване"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последно променено на"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/bs.po b/account_statement_import_file/i18n/bs.po
similarity index 91%
rename from account_statement_import/i18n/bs.po
rename to account_statement_import_file/i18n/bs.po
index b6ce0a5c..7dd656ed 100644
--- a/account_statement_import/i18n/bs.po
+++ b/account_statement_import_file/i18n/bs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>, 2018\n"
 "Language-Team: Bosnian (https://www.transifex.com/odoo/teams/41243/bs/)\n"
@@ -48,9 +48,10 @@ msgstr "Otkaži"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -64,7 +65,6 @@ msgid "Created on"
 msgstr "Kreirano"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Prikazani naziv"
@@ -77,7 +77,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -126,7 +125,6 @@ msgid "Journal"
 msgstr "Dnevnik knjiženja"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnje mijenjano"
@@ -173,16 +171,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -197,8 +195,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ca.po b/account_statement_import_file/i18n/ca.po
similarity index 84%
rename from account_statement_import/i18n/ca.po
rename to account_statement_import_file/i18n/ca.po
index 4a637b6d..fd310fe8 100644
--- a/account_statement_import/i18n/ca.po
+++ b/account_statement_import_file/i18n/ca.po
@@ -12,16 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2022-01-26 18:52+0000\n"
-"Last-Translator: Jaume Planas <jaume.planas@minorisa.net>\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Manel Fernandez <manelfera@outlook.com>, 2018\n"
 "Language-Team: Catalan (https://www.transifex.com/odoo/teams/41243/ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -50,14 +49,11 @@ msgstr "Cancel·la"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"No s'ha pogut trobar cap compte bancari amb un número '%s' vinculat a la "
-"empresa '%s'. Heu de crear el compte bancari i establir-lo al diari de banc "
-"relacionat. Si el diari de banc relacionat encara no existeix, heu de crear-"
-"ne un de nou."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -70,7 +66,6 @@ msgid "Created on"
 msgstr "Creat el"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar Nom"
@@ -85,7 +80,6 @@ msgstr ""
 "seleccioni'ls aquí."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -103,13 +97,15 @@ msgstr ""
 
 #. module: account_statement_import
 #: model:ir.actions.act_window,name:account_statement_import.account_statement_import_action
+#, fuzzy
 msgid "Import Bank Statement File"
-msgstr "Fitxer d'importació de l'extrate bancari"
+msgstr "Import de l'extracte bancari"
 
 #. module: account_statement_import
 #: model:ir.model,name:account_statement_import.model_account_statement_import
+#, fuzzy
 msgid "Import Bank Statement Files"
-msgstr "Fitxers d'importació d'extractes bancaris"
+msgstr "Importar extractes bancaris"
 
 #. module: account_statement_import
 #: model:ir.ui.menu,name:account_statement_import.account_statement_import_menu
@@ -132,10 +128,9 @@ msgid "Journal"
 msgstr "Diari"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
-msgstr "Última modificació el"
+msgstr "Última modificació el "
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__write_uid
@@ -151,46 +146,46 @@ msgstr "Última actualització el"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid "Missing currency code in the bank statement file."
-msgstr "Al fitxer de l'extracte bancari hi falta el codi de divisa."
+msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
+#, fuzzy, python-format
 msgid "Missing payment_ref on a transaction."
-msgstr "Falta una referència de pagament en una transacció."
+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
+#, 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
+#, fuzzy
 msgid "Statement Filename"
-msgstr "Nom del fitxer de l'extracte"
+msgstr "Arxiu d'extracte bancari"
 
 #. module: account_statement_import
 #: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
 msgid "Supported formats:"
-msgstr "Formats admesos:"
+msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "No s'ha definit el compte comptable del compte bancari al diari '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"El número de compte bancari '%s' existeix a l'Odoo però no s'ha assignat a "
-"cap diari de banc. Heu d'establir-lo en el diari de banc relacionat. Si el "
-"diari de banc relacionat encara no existeix, heu de crear-ne un de nou."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -199,18 +194,14 @@ msgid ""
 "The bank statement file uses currency '%s' but there is no such currency in "
 "Odoo."
 msgstr ""
-"El fitxer de l'extract bancari utilitza la divisa '%s' però aquesta divisa "
-"no existeix a l'Odoo."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La divisa de l'extracte bancari (%s) no és la mateixa que la del diari "
-"'%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -220,8 +211,6 @@ msgid ""
 "number, so you must start the wizard from the right bank journal in the "
 "dashboard."
 msgstr ""
-"El format d'aquest fitxer d'extracte bancari no conté el número de compte "
-"bancari. Heu d'iniciar l'assistent des del diari de banc adient del tauler."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -236,27 +225,29 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid "The parsing of the statement file returned an invalid result."
-msgstr "L'anàlisi del fitxer d'extracte ha retornat un resultat no vàlid."
+msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "This bank statement file format is not supported.\n"
 "Did you install the Odoo module to support this format?"
 msgstr ""
-"No s'admet el format d'aquest fitxer d'extracte bancari.\n"
-"¿Heu instal·lat el mòdul de l'Odoo que admet aquest format?"
+"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
+#, fuzzy
 msgid "Upload Bank Statements"
-msgstr "Puja extractes bancaris"
+msgstr "Importar extractes bancaris"
 
 #. module: account_statement_import
 #: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
+#, fuzzy
 msgid "Upload a bank statement file"
-msgstr "Puja un fitxer d'extracte bancari"
+msgstr "Seleccioni un arxiu d'extracte bancari per importar"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -265,14 +256,13 @@ msgid ""
 "You have already imported this file, or this file only contains already "
 "imported transactions."
 msgstr ""
-"Ja heu importat aquest fitxer, o aquest fitxer només conté transaccions que "
-"ja s'han importades."
 
 #. module: account_statement_import
 #: model_terms:ir.ui.view,arch_db:account_statement_import.journal_dashboard_view_inherit
 msgid "or"
 msgstr "o"
 
+#, fuzzy
 #~ msgid "A bank account transaction can be imported only once!"
 #~ msgstr ""
 #~ "Les transaccions d'un compte bancari poden importar-se només un cop!"
@@ -283,8 +273,17 @@ msgstr "o"
 #~ msgid "Import ID"
 #~ msgstr "Import ID"
 
+#, fuzzy
 #~ msgid "Partner Bank Account"
-#~ msgstr "Compte bancari d'empresa"
+#~ msgstr "Compte bancari"
+
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "El compte bancari d'aquest extracte (%s) no és la mateixa que la del "
+#~ "diari '%s' (%s)"
 
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Aquest fitxer no conte cap declaració."
diff --git a/account_statement_import/i18n/cs.po b/account_statement_import_file/i18n/cs.po
similarity index 94%
rename from account_statement_import/i18n/cs.po
rename to account_statement_import_file/i18n/cs.po
index 1b38fab1..c4c540ff 100644
--- a/account_statement_import/i18n/cs.po
+++ b/account_statement_import_file/i18n/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n"
@@ -53,9 +53,10 @@ msgstr "Zrušit"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -69,7 +70,6 @@ msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Zobrazované jméno"
@@ -82,7 +82,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -131,7 +130,6 @@ msgid "Journal"
 msgstr "Deník"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Naposled změněno"
@@ -178,16 +176,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -202,8 +200,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/da.po b/account_statement_import_file/i18n/da.po
similarity index 93%
rename from account_statement_import/i18n/da.po
rename to account_statement_import_file/i18n/da.po
index 0c9df1bb..3fb5c283 100644
--- a/account_statement_import/i18n/da.po
+++ b/account_statement_import_file/i18n/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
@@ -53,9 +53,10 @@ msgstr "Annullér"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -69,7 +70,6 @@ msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vis navn"
@@ -82,7 +82,6 @@ msgid ""
 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -131,7 +130,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sidst ændret den"
@@ -178,17 +176,17 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
-"Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen (%s)."
+"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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -201,12 +199,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -280,6 +277,14 @@ msgstr "eller"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankkonto"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Denne fil indeholder intet kontoudtog."
 
diff --git a/account_statement_import/i18n/de.po b/account_statement_import_file/i18n/de.po
similarity index 95%
rename from account_statement_import/i18n/de.po
rename to account_statement_import_file/i18n/de.po
index 1ad36295..c366d16d 100644
--- a/account_statement_import/i18n/de.po
+++ b/account_statement_import_file/i18n/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Leon Grill <leg@odoo.com>, 2019\n"
 "Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
@@ -53,9 +53,10 @@ msgstr "Abbrechen"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -69,7 +70,6 @@ msgid "Created on"
 msgstr "Erstellt am"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Anzeigename"
@@ -84,7 +84,6 @@ msgstr ""
 "diese hier aus."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -133,7 +132,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Letzte Änderung am"
@@ -180,18 +178,17 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
-"Das Konto dieses Kontoauszugs (%s) ist nicht das Gleiche, wie das im Journal "
-"(%s)."
+"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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -204,13 +201,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Die Währung des Kontoauszugs (%s) entspricht nicht der Währung des Journals "
-"(%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -284,6 +279,14 @@ msgstr "oder"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankkonto"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Die Währung des Kontoauszugs (%s) entspricht nicht der Währung des "
+#~ "Journals '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Diese Datei enthält keine Buchung."
 
diff --git a/account_statement_import/i18n/el.po b/account_statement_import_file/i18n/el.po
similarity index 93%
rename from account_statement_import/i18n/el.po
rename to account_statement_import_file/i18n/el.po
index 777d8d9b..d5f49013 100644
--- a/account_statement_import/i18n/el.po
+++ b/account_statement_import_file/i18n/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: George Tarasidis <george_tarasidis@yahoo.com>, 2018\n"
 "Language-Team: Greek (https://www.transifex.com/odoo/teams/41243/el/)\n"
@@ -50,9 +50,10 @@ msgstr "Ακύρωση"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Εμφάνιση Ονόματος"
@@ -79,7 +79,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Κωδικός"
@@ -128,7 +127,6 @@ msgid "Journal"
 msgstr "Ημερολόγιο"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Τελευταία τροποποίηση στις"
@@ -175,16 +173,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -199,8 +197,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/en_AU.po b/account_statement_import_file/i18n/en_AU.po
similarity index 88%
rename from account_statement_import/i18n/en_AU.po
rename to account_statement_import_file/i18n/en_AU.po
index e81f9840..2356c8c9 100644
--- a/account_statement_import/i18n/en_AU.po
+++ b/account_statement_import_file/i18n/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2015-09-07 15:47+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: English (Australia) (http://www.transifex.com/odoo/odoo-9/"
@@ -45,9 +45,10 @@ msgstr "Cancel"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Created on"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Display Name"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/en_GB.po b/account_statement_import_file/i18n/en_GB.po
similarity index 89%
rename from account_statement_import/i18n/en_GB.po
rename to account_statement_import_file/i18n/en_GB.po
index 7afbafcc..de748844 100644
--- a/account_statement_import/i18n/en_GB.po
+++ b/account_statement_import_file/i18n/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancel"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Created on"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Display Name"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Last Modified on"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es.po b/account_statement_import_file/i18n/es.po
similarity index 94%
rename from account_statement_import/i18n/es.po
rename to account_statement_import_file/i18n/es.po
index 3c9e0d7e..5240b672 100644
--- a/account_statement_import/i18n/es.po
+++ b/account_statement_import_file/i18n/es.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
-"PO-Revision-Date: 2022-10-28 16:44+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2023-02-26 17:23+0000\n"
 "Last-Translator: Harald Panten <harald.panten@sygel.es>\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "Language: es\n"
@@ -58,9 +58,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -74,7 +75,6 @@ msgid "Created on"
 msgstr "Creado el"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
@@ -89,7 +89,6 @@ msgstr ""
 "selecciónelos aquí."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -138,7 +137,6 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
@@ -185,18 +183,17 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
-"La cuenta bancaria de este extracto (%s) no es la misma que la del diario "
-"(%s)"
+"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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -211,11 +208,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La moneda del extracto bancario  (%s) no es la misma que la moneda del "
-"diario '%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -288,6 +283,13 @@ msgstr "o"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Cuentas bancaria"
 
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La moneda del extracto bancario  (%s) no es la misma que la moneda del "
+#~ "diario '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Este archivo no contiene ninguno extracto."
 
diff --git a/account_statement_import/i18n/es_AR.po b/account_statement_import_file/i18n/es_AR.po
similarity index 82%
rename from account_statement_import/i18n/es_AR.po
rename to account_statement_import_file/i18n/es_AR.po
index e483c8f9..0d65823a 100644
--- a/account_statement_import/i18n/es_AR.po
+++ b/account_statement_import_file/i18n/es_AR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2022-01-07 16:39+0000\n"
 "Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/odoo/"
@@ -47,14 +47,11 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"No se pudo encontrar ninguna cuenta bancaria con el número '%s' vinculada al "
-"contacto '%s'. Debe crear la cuenta bancaria y establecerla en el diario "
-"bancario relacionado. Si el diario bancario relacionado aún no existe, debe "
-"crear uno nuevo."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -67,7 +64,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar Nombre"
@@ -82,7 +78,6 @@ msgstr ""
 "seleccionelos aqui."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +124,6 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
@@ -173,8 +167,8 @@ msgstr "Formatos soportados:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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'."
 
@@ -182,14 +176,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"La cuenta bancaria con el número '%s' existe en Odoo pero no está "
-"establecida en ningún diario bancario. Debe establecerlo en el diario "
-"bancario relacionado. Si el diario bancario relacionado aún no existe, debe "
-"crear uno nuevo."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -205,11 +195,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La moneda del extracto bancario (%s) no es la misma moenda del diario "
-"'%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -283,9 +271,37 @@ msgstr "o"
 #~ msgid "Import ID"
 #~ msgstr "Importar ID"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "No se pudo encontrar ninguna cuenta bancaria con el número '%s' vinculada "
+#~ "al contacto '%s'. Debe crear la cuenta bancaria y establecerla en el "
+#~ "diario bancario relacionado. Si el diario bancario relacionado aún no "
+#~ "existe, debe crear uno nuevo."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Cuenta Bancaria del Contacto"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "La cuenta bancaria con el número '%s' existe en Odoo pero no está "
+#~ "establecida en ningún diario bancario. Debe establecerlo en el diario "
+#~ "bancario relacionado. Si el diario bancario relacionado aún no existe, "
+#~ "debe crear uno nuevo."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La moneda del extracto bancario (%s) no es la misma moenda del diario "
+#~ "'%s' (%s)."
+
 #~ msgid "Company"
 #~ msgstr "Compañía"
 
diff --git a/account_statement_import/i18n/es_BO.po b/account_statement_import_file/i18n/es_BO.po
similarity index 89%
rename from account_statement_import/i18n/es_BO.po
rename to account_statement_import_file/i18n/es_BO.po
index 49d8796e..1b05513a 100644
--- a/account_statement_import/i18n/es_BO.po
+++ b/account_statement_import_file/i18n/es_BO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Bolivia) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_CL.po b/account_statement_import_file/i18n/es_CL.po
similarity index 89%
rename from account_statement_import/i18n/es_CL.po
rename to account_statement_import_file/i18n/es_CL.po
index cd09049d..a3293ead 100644
--- a/account_statement_import/i18n/es_CL.po
+++ b/account_statement_import_file/i18n/es_CL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Chile) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID (identificación)"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_CO.po b/account_statement_import_file/i18n/es_CO.po
similarity index 89%
rename from account_statement_import/i18n/es_CO.po
rename to account_statement_import_file/i18n/es_CO.po
index 6c51cf06..d00e3e4f 100644
--- a/account_statement_import/i18n/es_CO.po
+++ b/account_statement_import_file/i18n/es_CO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre Público"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última Modificación el"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_CR.po b/account_statement_import_file/i18n/es_CR.po
similarity index 89%
rename from account_statement_import/i18n/es_CR.po
rename to account_statement_import_file/i18n/es_CR.po
index 91977b39..0780d3b5 100644
--- a/account_statement_import/i18n/es_CR.po
+++ b/account_statement_import_file/i18n/es_CR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Costa Rica) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_DO.po b/account_statement_import_file/i18n/es_DO.po
similarity index 89%
rename from account_statement_import/i18n/es_DO.po
rename to account_statement_import_file/i18n/es_DO.po
index 1b21a3ce..7abccf78 100644
--- a/account_statement_import/i18n/es_DO.po
+++ b/account_statement_import_file/i18n/es_DO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID (identificación)"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_EC.po b/account_statement_import_file/i18n/es_EC.po
similarity index 89%
rename from account_statement_import/i18n/es_EC.po
rename to account_statement_import_file/i18n/es_EC.po
index e3b60a13..377853e2 100644
--- a/account_statement_import/i18n/es_EC.po
+++ b/account_statement_import_file/i18n/es_EC.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Ecuador) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Fecha de modificación"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_PE.po b/account_statement_import_file/i18n/es_PE.po
similarity index 89%
rename from account_statement_import/i18n/es_PE.po
rename to account_statement_import_file/i18n/es_PE.po
index 4b7bb3fa..f7dace9e 100644
--- a/account_statement_import/i18n/es_PE.po
+++ b/account_statement_import_file/i18n/es_PE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Peru) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nombre a Mostrar"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima Modificación en"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_PY.po b/account_statement_import_file/i18n/es_PY.po
similarity index 89%
rename from account_statement_import/i18n/es_PY.po
rename to account_statement_import_file/i18n/es_PY.po
index b05aa787..516226d8 100644
--- a/account_statement_import/i18n/es_PY.po
+++ b/account_statement_import_file/i18n/es_PY.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Paraguay) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/es_VE.po b/account_statement_import_file/i18n/es_VE.po
similarity index 89%
rename from account_statement_import/i18n/es_VE.po
rename to account_statement_import_file/i18n/es_VE.po
index 8d2e1490..8610f96e 100644
--- a/account_statement_import/i18n/es_VE.po
+++ b/account_statement_import_file/i18n/es_VE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/odoo/"
@@ -46,9 +46,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Modificada por última vez"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/et.po b/account_statement_import_file/i18n/et.po
similarity index 93%
rename from account_statement_import/i18n/et.po
rename to account_statement_import_file/i18n/et.po
index 15ab70ad..9e546d32 100644
--- a/account_statement_import/i18n/et.po
+++ b/account_statement_import_file/i18n/et.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: Helen Sulaoja <helen@avalah.ee>, 2018\n"
 "Language-Team: Estonian (https://www.transifex.com/odoo/teams/41243/et/)\n"
@@ -53,9 +53,10 @@ msgstr "Tühista"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -69,7 +70,6 @@ msgid "Created on"
 msgstr "Loomise kuupäev"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Näidatav nimi"
@@ -82,7 +82,6 @@ msgid ""
 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -131,7 +130,6 @@ msgid "Journal"
 msgstr "Andmik"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Viimati muudetud (millal)"
@@ -178,17 +176,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr ""
-"Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -201,12 +198,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -281,6 +277,14 @@ msgstr "või"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Pangakonto"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "See fail ei sisalda pangaväljavõtet."
 
diff --git a/account_statement_import/i18n/eu.po b/account_statement_import_file/i18n/eu.po
similarity index 89%
rename from account_statement_import/i18n/eu.po
rename to account_statement_import_file/i18n/eu.po
index 42e59089..97e3dc78 100644
--- a/account_statement_import/i18n/eu.po
+++ b/account_statement_import_file/i18n/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/odoo/teams/41243/eu/)\n"
@@ -45,9 +45,10 @@ msgstr "Ezeztatu"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Created on"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Izena erakutsi"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/fa.po b/account_statement_import_file/i18n/fa.po
similarity index 92%
rename from account_statement_import/i18n/fa.po
rename to account_statement_import_file/i18n/fa.po
index b89431b9..cf5c197d 100644
--- a/account_statement_import/i18n/fa.po
+++ b/account_statement_import_file/i18n/fa.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Arash Sardari <arashss77@gmail.com>, 2018\n"
 "Language-Team: Persian (https://www.transifex.com/odoo/teams/41243/fa/)\n"
@@ -51,9 +51,10 @@ msgstr "لغو"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "نام نمایشی"
@@ -80,7 +80,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "شناسه"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "روزنامه"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "آخرین تغییر در"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -200,8 +198,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/fi.po b/account_statement_import_file/i18n/fi.po
similarity index 93%
rename from account_statement_import/i18n/fi.po
rename to account_statement_import_file/i18n/fi.po
index 1f15f98a..4a8b3702 100644
--- a/account_statement_import/i18n/fi.po
+++ b/account_statement_import_file/i18n/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Veikko Väätäjä <veikko.vaataja@gmail.com>, 2018\n"
 "Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n"
@@ -51,9 +51,10 @@ msgstr "Peruuta"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "Luotu"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Näyttönimi"
@@ -81,7 +81,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Tunniste (ID)"
@@ -130,7 +129,6 @@ msgid "Journal"
 msgstr "Päiväkirja"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Viimeksi muokattu"
@@ -177,16 +175,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Tiiotteen tili  (%s) ei vastaa päiväkirjaa (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -199,11 +197,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Tiiotteen tili  (%s) ei vastaa päiväkirjaa (%s)."
+"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
@@ -278,6 +276,12 @@ msgstr "tai"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Tilinumero"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "Tiiotteen tili  (%s) ei vastaa päiväkirjaa '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Tiedosto ei sisällä lainkaan tiliotteita."
 
diff --git a/account_statement_import/i18n/fo.po b/account_statement_import_file/i18n/fo.po
similarity index 89%
rename from account_statement_import/i18n/fo.po
rename to account_statement_import_file/i18n/fo.po
index 9ecca097..288ae05d 100644
--- a/account_statement_import/i18n/fo.po
+++ b/account_statement_import_file/i18n/fo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Faroese (https://www.transifex.com/odoo/teams/41243/fo/)\n"
@@ -45,9 +45,10 @@ msgstr "Strika"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Byrjað tann"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Vís navn"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Seinast rættað tann"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/fr.po b/account_statement_import_file/i18n/fr.po
similarity index 90%
rename from account_statement_import/i18n/fr.po
rename to account_statement_import_file/i18n/fr.po
index d1251846..3fd5a1c3 100644
--- a/account_statement_import/i18n/fr.po
+++ b/account_statement_import_file/i18n/fr.po
@@ -17,16 +17,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
-"PO-Revision-Date: 2022-11-08 13:45+0000\n"
-"Last-Translator: Yannick Vaucher <yannick.vaucher@camptocamp.com>\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2021-03-22 15:46+0000\n"
+"Last-Translator: Yves Le Doeuff <yld@alliasys.fr>\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -55,14 +55,11 @@ msgstr "Annuler"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Impossible de trouver un compte bancaire avec le numéro '% s' associé au "
-"partenaire '% s'. Vous devez créer le compte bancaire et le définir dans le "
-"journal bancaire associé. Si le journal bancaire associé n'existe pas "
-"encore, vous devez en créer un nouveau."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -75,7 +72,6 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher Nom"
@@ -90,7 +86,6 @@ msgstr ""
 "sélectionnez-les ici."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -108,11 +103,13 @@ msgstr ""
 
 #. module: account_statement_import
 #: model:ir.actions.act_window,name:account_statement_import.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
+#, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Import d'un relevé bancaire"
 
@@ -129,7 +126,7 @@ msgstr ""
 #. module: account_statement_import
 #: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
 msgid "Import and View"
-msgstr "Importer"
+msgstr ""
 
 #. module: account_statement_import
 #: model:ir.model,name:account_statement_import.model_account_journal
@@ -137,7 +134,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
@@ -181,8 +177,8 @@ msgstr "Formats acceptés :"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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)."
 
@@ -190,14 +186,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Le compte bancaire avec le numéro '%s' existe dans Odoo mais il n'est défini "
-"sur aucun journal bancaire. Vous devez le définir dans le journal bancaire "
-"associé. Si le journal bancaire associé n'existe pas encore, vous devez en "
-"créer un nouveau."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -213,10 +205,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La devise de ce relevé (%s) n'est pas la même que celle du journal '%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -292,9 +283,37 @@ msgstr "ou"
 #~ msgid "Import ID"
 #~ msgstr "ID d'importation"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Impossible de trouver un compte bancaire avec le numéro '% s' associé au "
+#~ "partenaire '% s'. Vous devez créer le compte bancaire et le définir dans "
+#~ "le journal bancaire associé. Si le journal bancaire associé n'existe pas "
+#~ "encore, vous devez en créer un nouveau."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Compte bancaire du partenaire"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Le compte bancaire avec le numéro '%s' existe dans Odoo mais il n'est "
+#~ "défini sur aucun journal bancaire. Vous devez le définir dans le journal "
+#~ "bancaire associé. Si le journal bancaire associé n'existe pas encore, "
+#~ "vous devez en créer un nouveau."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La devise de ce relevé (%s) n'est pas la même que celle du journal "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Ce fichier ne contient aucun relevé."
 
diff --git a/account_statement_import/i18n/fr_BE.po b/account_statement_import_file/i18n/fr_BE.po
similarity index 83%
rename from account_statement_import/i18n/fr_BE.po
rename to account_statement_import_file/i18n/fr_BE.po
index 0567827c..4827be22 100644
--- a/account_statement_import/i18n/fr_BE.po
+++ b/account_statement_import_file/i18n/fr_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2021-02-18 11:45+0000\n"
 "Last-Translator: Yves Le Doeuff <yld@alliasys.fr>\n"
 "Language-Team: French (Belgium) (http://www.transifex.com/odoo/odoo-9/"
@@ -47,14 +47,11 @@ msgstr "Annuler"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Impossible de trouver un compte bancaire avec le numéro '% s' lié au "
-"partenaire '% s'. Vous devez créer le compte bancaire et le définir dans le "
-"journal bancaire associé. Si le journal bancaire associé n'existe pas "
-"encore, vous devez en créer un nouveau."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -67,7 +64,6 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher le nom"
@@ -82,7 +78,6 @@ msgstr ""
 "et sélectionnez-les ici."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -130,7 +125,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
@@ -174,22 +168,18 @@ msgstr "Formats pris en charge:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Le compte bancaire avec le numéro '% s' existe dans Odoo mais il n'est "
-"défini dans aucun journal de banque. Vous devez le définir dans le journal "
-"de banque associé. Si le journal de banque associé n'existe pas encore, vous "
-"devez en créer un nouveau."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -205,11 +195,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La devise du relevé bancaire (% s) n'est pas la même que la devise du "
-"journal '% s' (% s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -284,9 +272,37 @@ msgstr "ou"
 #~ msgid "Import ID"
 #~ msgstr "ID d'importation"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Impossible de trouver un compte bancaire avec le numéro '% s' lié au "
+#~ "partenaire '% s'. Vous devez créer le compte bancaire et le définir dans "
+#~ "le journal bancaire associé. Si le journal bancaire associé n'existe pas "
+#~ "encore, vous devez en créer un nouveau."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Compte bancaire du partenaire"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Le compte bancaire avec le numéro '% s' existe dans Odoo mais il n'est "
+#~ "défini dans aucun journal de banque. Vous devez le définir dans le "
+#~ "journal de banque associé. Si le journal de banque associé n'existe pas "
+#~ "encore, vous devez en créer un nouveau."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La devise du relevé bancaire (% s) n'est pas la même que la devise du "
+#~ "journal '% s' (% s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Ce fichier ne contient aucune instruction."
 
diff --git a/account_statement_import/i18n/fr_CA.po b/account_statement_import_file/i18n/fr_CA.po
similarity index 89%
rename from account_statement_import/i18n/fr_CA.po
rename to account_statement_import_file/i18n/fr_CA.po
index 1b686c83..798bbe31 100644
--- a/account_statement_import/i18n/fr_CA.po
+++ b/account_statement_import_file/i18n/fr_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: French (Canada) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Annuler"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Identifiant"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/fr_FR.po b/account_statement_import_file/i18n/fr_FR.po
similarity index 81%
rename from account_statement_import/i18n/fr_FR.po
rename to account_statement_import_file/i18n/fr_FR.po
index b9cc6739..a9f8bfc9 100644
--- a/account_statement_import/i18n/fr_FR.po
+++ b/account_statement_import_file/i18n/fr_FR.po
@@ -6,7 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-10-03 10:35+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2021-04-10 17:46+0000\n"
 "Last-Translator: Yves Le Doeuff <yld@alliasys.fr>\n"
 "Language-Team: none\n"
 "Language: fr_FR\n"
@@ -43,14 +44,11 @@ msgstr "Annuler"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Impossible de trouver un compte bancaire avec le numéro '% s' associé au "
-"partenaire '% s'. Vous devez créer le compte bancaire et le définir dans le "
-"journal bancaire associé. Si le journal bancaire associé n'existe pas "
-"encore, vous devez en créer un nouveau."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -63,7 +61,6 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Afficher Nom"
@@ -78,7 +75,6 @@ msgstr ""
 "sélectionnez-les ici."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -117,7 +113,7 @@ msgstr ""
 #. module: account_statement_import
 #: model_terms:ir.ui.view,arch_db:account_statement_import.account_statement_import_form
 msgid "Import and View"
-msgstr "Importer"
+msgstr ""
 
 #. module: account_statement_import
 #: model:ir.model,name:account_statement_import.model_account_journal
@@ -125,7 +121,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
@@ -169,8 +164,8 @@ msgstr "Formats acceptés :"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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)."
 
@@ -178,14 +173,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Le compte bancaire avec le numéro '%s' existe dans Odoo mais il n'est défini "
-"sur aucun journal bancaire. Vous devez le définir dans le journal bancaire "
-"associé. Si le journal bancaire associé n'existe pas encore, vous devez en "
-"créer un nouveau."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -201,10 +192,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La devise de ce relevé (%s) n'est pas la même que celle du journal '%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -279,5 +269,33 @@ msgstr "ou"
 #~ msgid "Import ID"
 #~ msgstr "ID d'importation"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Impossible de trouver un compte bancaire avec le numéro '% s' associé au "
+#~ "partenaire '% s'. Vous devez créer le compte bancaire et le définir dans "
+#~ "le journal bancaire associé. Si le journal bancaire associé n'existe pas "
+#~ "encore, vous devez en créer un nouveau."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Compte bancaire du partenaire"
+
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Le compte bancaire avec le numéro '%s' existe dans Odoo mais il n'est "
+#~ "défini sur aucun journal bancaire. Vous devez le définir dans le journal "
+#~ "bancaire associé. Si le journal bancaire associé n'existe pas encore, "
+#~ "vous devez en créer un nouveau."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La devise de ce relevé (%s) n'est pas la même que celle du journal "
+#~ "'%s' (%s)."
diff --git a/account_statement_import/i18n/gl.po b/account_statement_import_file/i18n/gl.po
similarity index 89%
rename from account_statement_import/i18n/gl.po
rename to account_statement_import_file/i18n/gl.po
index 541b11ba..df6db4c2 100644
--- a/account_statement_import/i18n/gl.po
+++ b/account_statement_import_file/i18n/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/odoo/teams/41243/gl/)\n"
@@ -45,9 +45,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Creado o"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/gu.po b/account_statement_import_file/i18n/gu.po
similarity index 90%
rename from account_statement_import/i18n/gu.po
rename to account_statement_import_file/i18n/gu.po
index 394f4671..18ac1396 100644
--- a/account_statement_import/i18n/gu.po
+++ b/account_statement_import_file/i18n/gu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Spellbound Soft Solutions <jeel.spellbound@gmail.com>, "
 "2018\n"
@@ -50,9 +50,10 @@ msgstr "રદ કરો"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "પ્રદર્શન નામ"
@@ -79,7 +79,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ઓળખ"
@@ -128,7 +127,6 @@ msgid "Journal"
 msgstr "રોજનામું"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -175,16 +173,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -199,8 +197,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/he.po b/account_statement_import_file/i18n/he.po
similarity index 93%
rename from account_statement_import/i18n/he.po
rename to account_statement_import_file/i18n/he.po
index c594e7ad..0679ccc4 100644
--- a/account_statement_import/i18n/he.po
+++ b/account_statement_import_file/i18n/he.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Amit Spilman <amit@laylinetech.com>, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/odoo/teams/41243/he/)\n"
@@ -55,9 +55,10 @@ msgstr "בטל"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -71,7 +72,6 @@ msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "הצג שם"
@@ -84,7 +84,6 @@ msgid ""
 msgstr "קבלו את דפי החשבון שלכם בתבנית ממוחשבת מהבנק, ובחרו אותם כאן."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "תעודה מזהה"
@@ -133,7 +132,6 @@ msgid "Journal"
 msgstr "יומנים"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "שינוי אחרון ב"
@@ -180,16 +178,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -202,11 +200,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן (%s)."
+"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
@@ -280,6 +278,12 @@ msgstr "או"
 #~ msgid "Partner Bank Account"
 #~ msgstr "חשבון בנק"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "קובץ זה אינו מכיל תנועות בחשבון."
 
diff --git a/account_statement_import/i18n/hr.po b/account_statement_import_file/i18n/hr.po
similarity index 93%
rename from account_statement_import/i18n/hr.po
rename to account_statement_import_file/i18n/hr.po
index 96a8e218..601419a3 100644
--- a/account_statement_import/i18n/hr.po
+++ b/account_statement_import_file/i18n/hr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Stjepan Lovasić <stjepan.lovasic@gmail.com>, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
@@ -59,9 +59,10 @@ msgstr "Odustani"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -75,7 +76,6 @@ msgid "Created on"
 msgstr "Kreirano"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Naziv"
@@ -89,7 +89,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -138,7 +137,6 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnja promjena"
@@ -185,16 +183,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -207,11 +205,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku (%s)."
+"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
@@ -285,6 +283,12 @@ msgstr "ili"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankovni račun"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Ova datoteka ne sadrži nijedanu stavku."
 
diff --git a/account_statement_import/i18n/hu.po b/account_statement_import_file/i18n/hu.po
similarity index 93%
rename from account_statement_import/i18n/hu.po
rename to account_statement_import_file/i18n/hu.po
index a6502495..1f114234 100644
--- a/account_statement_import/i18n/hu.po
+++ b/account_statement_import_file/i18n/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Tibor Kőnig <konig.tibor@evitalit.hu>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
@@ -51,9 +51,10 @@ msgstr "Mégse"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "Létrehozva"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Megjelenített név"
@@ -82,7 +82,6 @@ msgstr ""
 "válassza ki itt."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Azonosító"
@@ -131,7 +130,6 @@ msgid "Journal"
 msgstr "Napló"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Legutóbb frissítve"
@@ -178,16 +176,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -200,11 +198,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval (%s)."
+"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
@@ -278,6 +276,13 @@ msgstr "vagy"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankszámla"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Ez a fájl nem tartalmaz kivonatot."
 
diff --git a/account_statement_import/i18n/id.po b/account_statement_import_file/i18n/id.po
similarity index 94%
rename from account_statement_import/i18n/id.po
rename to account_statement_import_file/i18n/id.po
index a6d92ef3..00cb802b 100644
--- a/account_statement_import/i18n/id.po
+++ b/account_statement_import_file/i18n/id.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Gusti Rini <gustirini@gmail.com>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/odoo/teams/41243/id/)\n"
@@ -56,9 +56,10 @@ msgstr "Batal"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -72,7 +73,6 @@ msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nama Tampilan"
@@ -85,7 +85,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -134,7 +133,6 @@ msgid "Journal"
 msgstr "Jurnal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Terakhir diubah pada"
@@ -181,16 +179,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -205,8 +203,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/is.po b/account_statement_import_file/i18n/is.po
similarity index 92%
rename from account_statement_import/i18n/is.po
rename to account_statement_import_file/i18n/is.po
index cc6a1ee4..177c7b3a 100644
--- a/account_statement_import/i18n/is.po
+++ b/account_statement_import_file/i18n/is.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: Bjorn Ingvarsson <boi@exigo.is>, 2018\n"
 "Language-Team: Icelandic (https://www.transifex.com/odoo/teams/41243/is/)\n"
@@ -48,9 +48,10 @@ msgstr "Hætta við"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -64,7 +65,6 @@ msgid "Created on"
 msgstr "Stofnað þann"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nafn"
@@ -77,7 +77,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Auðkenni"
@@ -126,7 +125,6 @@ msgid "Journal"
 msgstr "Færslubók"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Síðast breytt þann"
@@ -173,16 +171,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -197,8 +195,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/it.po b/account_statement_import_file/i18n/it.po
similarity index 91%
rename from account_statement_import/i18n/it.po
rename to account_statement_import_file/i18n/it.po
index 289cc38d..7a9b2ba3 100644
--- a/account_statement_import/i18n/it.po
+++ b/account_statement_import_file/i18n/it.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
-"PO-Revision-Date: 2023-01-02 11:48+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2023-01-02 11:46+0000\n"
 "Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "Language: it\n"
@@ -62,13 +62,11 @@ msgstr "Annulla"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Impossibile trovare conti bancari con numero \"%s\" collegati al partner \"%s"
-"\", creare il conto e impostarlo nel relativo registro banca. Se il registro "
-"ancora non esiste crearne uno nuovo."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -81,7 +79,6 @@ msgid "Created on"
 msgstr "Creato il"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome visualizzato"
@@ -95,7 +92,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -142,7 +138,6 @@ msgid "Journal"
 msgstr "Registro"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
@@ -186,21 +181,18 @@ msgstr "Formati supportati:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Il conto con numero \"%s\" esiste in Odoo ma non è impostato in alcun "
-"registro banca, assegnarlo nel relativo registro. Se tale registro ancora "
-"non esiste, crearne uno nuovo."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -216,11 +208,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"La valuta dell'estratto conto bancario (%s) non corrisponde a quella del "
-"registro \"%s\" (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -294,9 +284,35 @@ msgstr "/"
 #~ msgid "Import ID"
 #~ msgstr "ID Importazione"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Impossibile trovare conti bancari con numero \"%s\" collegati al partner "
+#~ "\"%s\", creare il conto e impostarlo nel relativo registro banca. Se il "
+#~ "registro ancora non esiste crearne uno nuovo."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Conto bancario partner"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Il conto con numero \"%s\" esiste in Odoo ma non è impostato in alcun "
+#~ "registro banca, assegnarlo nel relativo registro. Se tale registro ancora "
+#~ "non esiste, crearne uno nuovo."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "La valuta dell'estratto conto bancario (%s) non corrisponde a quella del "
+#~ "registro \"%s\" (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Il file non contiene alcuna registrazione."
 
diff --git a/account_statement_import/i18n/ja.po b/account_statement_import_file/i18n/ja.po
similarity index 92%
rename from account_statement_import/i18n/ja.po
rename to account_statement_import_file/i18n/ja.po
index 9a435789..e986b876 100644
--- a/account_statement_import/i18n/ja.po
+++ b/account_statement_import_file/i18n/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Tim Siu Lai <tl@roomsfor.hk>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n"
@@ -51,9 +51,10 @@ msgstr "取消"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "作成日"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "表示名"
@@ -80,7 +80,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "仕訳帳"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最終更新日"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -200,8 +198,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ka.po b/account_statement_import_file/i18n/ka.po
similarity index 89%
rename from account_statement_import/i18n/ka.po
rename to account_statement_import_file/i18n/ka.po
index 0e8e768a..3cd610ec 100644
--- a/account_statement_import/i18n/ka.po
+++ b/account_statement_import_file/i18n/ka.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Georgian (https://www.transifex.com/odoo/teams/41243/ka/)\n"
@@ -45,9 +45,10 @@ msgstr "შეწყვეტა"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "შექმნის თარიღი"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "სახელი"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "იდენტიფიკატორი"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "ბოლოს განახლებულია"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/kab.po b/account_statement_import_file/i18n/kab.po
similarity index 89%
rename from account_statement_import/i18n/kab.po
rename to account_statement_import_file/i18n/kab.po
index 86299aa3..6ff7fe6e 100644
--- a/account_statement_import/i18n/kab.po
+++ b/account_statement_import_file/i18n/kab.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Kabyle (https://www.transifex.com/odoo/teams/41243/kab/)\n"
@@ -45,9 +45,10 @@ msgstr "Sefsex"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Yerna di"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Asulay"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Aleqqem aneggaru di"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/km.po b/account_statement_import_file/i18n/km.po
similarity index 90%
rename from account_statement_import/i18n/km.po
rename to account_statement_import_file/i18n/km.po
index 7d43b595..728679e7 100644
--- a/account_statement_import/i18n/km.po
+++ b/account_statement_import_file/i18n/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Samkhann Seang <seangsamkhann@gmail.com>, 2018\n"
 "Language-Team: Khmer (https://www.transifex.com/odoo/teams/41243/km/)\n"
@@ -47,9 +47,10 @@ msgstr "លុបចោល"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -63,7 +64,6 @@ msgid "Created on"
 msgstr "បង្កើតនៅ"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "ឈ្មោះសំរាប់បង្ហាញ"
@@ -76,7 +76,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -125,7 +124,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "កាលបរិច្ឆេតកែប្រែចុងក្រោយ"
@@ -170,16 +168,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -194,8 +192,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ko.po b/account_statement_import_file/i18n/ko.po
similarity index 94%
rename from account_statement_import/i18n/ko.po
rename to account_statement_import_file/i18n/ko.po
index cd591aa7..6e1590f1 100644
--- a/account_statement_import/i18n/ko.po
+++ b/account_statement_import_file/i18n/ko.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: Mark Lee <odoos@soti.33mail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/odoo/teams/41243/ko/)\n"
@@ -51,9 +51,10 @@ msgstr "취소"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "작성일"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "이름 표시"
@@ -80,7 +80,6 @@ msgid ""
 msgstr "은행에서 예금거래 명세서를 전자 형식으로 가져오고 여기서 선택합니다."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "분개장"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "최근 수정"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "이 명세서의 계정(%s)이 분개장(%s)과 동일하지 않습니다."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -198,11 +196,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "이 명세서의 계정(%s)이 분개장(%s)과 동일하지 않습니다."
+"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
@@ -277,6 +275,12 @@ msgstr "또는"
 #~ msgid "Partner Bank Account"
 #~ msgstr "은행 계좌"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "이 명세서의 계정(%s)이 분개장 '%s' (%s)과 동일하지 않습니다."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "이 파일에 명세서가 없습니다."
 
diff --git a/account_statement_import/i18n/lb.po b/account_statement_import_file/i18n/lb.po
similarity index 88%
rename from account_statement_import/i18n/lb.po
rename to account_statement_import_file/i18n/lb.po
index e7ca54f1..603d2edc 100644
--- a/account_statement_import/i18n/lb.po
+++ b/account_statement_import_file/i18n/lb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Language-Team: Luxembourgish (https://www.transifex.com/odoo/teams/41243/"
 "lb/)\n"
@@ -43,9 +43,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -59,7 +60,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -72,7 +72,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -119,7 +118,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -164,16 +162,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -188,8 +186,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/lo.po b/account_statement_import_file/i18n/lo.po
similarity index 89%
rename from account_statement_import/i18n/lo.po
rename to account_statement_import_file/i18n/lo.po
index 22d6fa2a..4b816804 100644
--- a/account_statement_import/i18n/lo.po
+++ b/account_statement_import_file/i18n/lo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Lao (https://www.transifex.com/odoo/teams/41243/lo/)\n"
@@ -45,9 +45,10 @@ msgstr "ຍົກເລີອກ"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/lt.po b/account_statement_import_file/i18n/lt.po
similarity index 94%
rename from account_statement_import/i18n/lt.po
rename to account_statement_import_file/i18n/lt.po
index 85a86624..9a80c6b8 100644
--- a/account_statement_import/i18n/lt.po
+++ b/account_statement_import_file/i18n/lt.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Linas Versada <linaskrisiukenas@gmail.com>, 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/odoo/teams/41243/lt/)\n"
@@ -56,9 +56,10 @@ msgstr "Atšaukti"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -72,7 +73,6 @@ msgid "Created on"
 msgstr "Sukurta"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Rodomas pavadinimas"
@@ -87,7 +87,6 @@ msgstr ""
 "čia."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -136,7 +135,6 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Paskutinį kartą keista"
@@ -183,16 +181,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Šio išrašo sąskaita (%s) nėra tokia pati, kaip žurnalo (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -205,11 +203,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Banko išrašo valiuta (%s) nėra tokia pati, kaip žurnalo valiuta (%s)."
+"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
@@ -283,6 +281,13 @@ msgstr "arba"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Banko sąskaita"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Banko išrašo valiuta (%s) nėra tokia pati, kaip žurnalo valiuta '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Šiame faile nėra jokių išrašų."
 
diff --git a/account_statement_import/i18n/lv.po b/account_statement_import_file/i18n/lv.po
similarity index 89%
rename from account_statement_import/i18n/lv.po
rename to account_statement_import_file/i18n/lv.po
index ea477bac..b6f75fd6 100644
--- a/account_statement_import/i18n/lv.po
+++ b/account_statement_import_file/i18n/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/odoo/teams/41243/lv/)\n"
@@ -46,9 +46,10 @@ msgstr "Atcelt"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Izveidots"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/mk.po b/account_statement_import_file/i18n/mk.po
similarity index 89%
rename from account_statement_import/i18n/mk.po
rename to account_statement_import_file/i18n/mk.po
index ec89d630..a88ec3b8 100644
--- a/account_statement_import/i18n/mk.po
+++ b/account_statement_import_file/i18n/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/odoo/teams/41243/mk/)\n"
@@ -45,9 +45,10 @@ msgstr "Откажи"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Креирано на"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Прикажи име"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последна промена на"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/mn.po b/account_statement_import_file/i18n/mn.po
similarity index 95%
rename from account_statement_import/i18n/mn.po
rename to account_statement_import_file/i18n/mn.po
index 9dd6906d..4be19a9f 100644
--- a/account_statement_import/i18n/mn.po
+++ b/account_statement_import_file/i18n/mn.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: nurbakhit nurka <nurbakhit@bumanit.mn>, 2019\n"
 "Language-Team: Mongolian (https://www.transifex.com/odoo/teams/41243/mn/)\n"
@@ -50,9 +50,10 @@ msgstr "Цуцлах"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr "Үүсгэсэн огноо"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Дэлгэрэнгүй нэр"
@@ -79,7 +79,6 @@ msgid ""
 msgstr "Банкны хуулгын электрон форматыг банкнаасаа авч энд сонгоно уу."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -128,7 +127,6 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Сүүлд зассан огноо"
@@ -175,16 +173,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr " (%s) хуулганы данс нь (%s) журналийн данстай ижил биш байна."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -197,11 +195,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Банкны хуулга валют (%s) нь журналын валют (%s)-тай ижил байх ёстой."
+"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
@@ -275,6 +273,13 @@ msgstr "эсвэл"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Банкны данс"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Банкны хуулга валют (%s) нь журналын валют '%s' (%s)-тай ижил байх ёстой."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Файл нь ямар ч хуулга агуулаагүй байна."
 
diff --git a/account_statement_import/i18n/nb.po b/account_statement_import_file/i18n/nb.po
similarity index 93%
rename from account_statement_import/i18n/nb.po
rename to account_statement_import_file/i18n/nb.po
index 5d0a1d58..6e2b81ef 100644
--- a/account_statement_import/i18n/nb.po
+++ b/account_statement_import_file/i18n/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Marius Stedjan <marius@stedjan.com>, 2019\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/"
@@ -49,9 +49,10 @@ msgstr "Avbryt"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -65,7 +66,6 @@ msgid "Created on"
 msgstr "Opprettet"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Visningsnavn"
@@ -78,7 +78,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -127,7 +126,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sist endret"
@@ -174,16 +172,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -198,8 +196,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ne.po b/account_statement_import_file/i18n/ne.po
similarity index 88%
rename from account_statement_import/i18n/ne.po
rename to account_statement_import_file/i18n/ne.po
index 6edec294..32cb9eae 100644
--- a/account_statement_import/i18n/ne.po
+++ b/account_statement_import_file/i18n/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Language-Team: Nepali (https://www.transifex.com/odoo/teams/41243/ne/)\n"
 "Language: ne\n"
@@ -42,9 +42,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -58,7 +59,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -71,7 +71,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -118,7 +117,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -163,16 +161,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -187,8 +185,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/nl.po b/account_statement_import_file/i18n/nl.po
similarity index 91%
rename from account_statement_import/i18n/nl.po
rename to account_statement_import_file/i18n/nl.po
index 3eab2fdf..886448ea 100644
--- a/account_statement_import/i18n/nl.po
+++ b/account_statement_import_file/i18n/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2021-04-26 22:47+0000\n"
 "Last-Translator: Bosd <c5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me>\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -53,13 +53,11 @@ msgstr "Annuleren"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Bankrekening '%s' van relatie '%s' kan niet worden gevonden. Maak de "
-"bankrekening aan en koppel deze aan het bijbehorende dagboek. Als het "
-"gerelateerde dagboek nog niet bestaat, maak dan een nieuwe aan."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -72,7 +70,6 @@ msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
@@ -87,7 +84,6 @@ msgstr ""
 "deze hier."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -136,7 +132,6 @@ msgid "Journal"
 msgstr "Dagboek"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
@@ -180,21 +175,18 @@ msgstr "Ondersteunende formaten:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Het bankrekening met nummer '%s' bestaat reeds maar er is geen dagboek "
-"ingesteld. U dient dit in te stellen in het betreffende dagboek. Indien het "
-"dagboek nog niet bestaat, dan dient u een nieuwe aan te maken."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -210,11 +202,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"De valuta van de bankafschriften (%s) is niet gelijk aan de ingestelde "
-"valuta '%s' op het dagboek (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -288,9 +278,35 @@ msgstr "of"
 #~ msgid "Import ID"
 #~ msgstr "Import ID"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Bankrekening '%s' van relatie '%s' kan niet worden gevonden. Maak de "
+#~ "bankrekening aan en koppel deze aan het bijbehorende dagboek. Als het "
+#~ "gerelateerde dagboek nog niet bestaat, maak dan een nieuwe aan."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankrekening van relatie"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Het bankrekening met nummer '%s' bestaat reeds maar er is geen dagboek "
+#~ "ingesteld. U dient dit in te stellen in het betreffende dagboek. Indien "
+#~ "het dagboek nog niet bestaat, dan dient u een nieuwe aan te maken."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "De valuta van de bankafschriften (%s) is niet gelijk aan de ingestelde "
+#~ "valuta '%s' op het dagboek (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Dit bestand bevat geen enkel afschrift."
 
diff --git a/account_statement_import/i18n/nl_BE.po b/account_statement_import_file/i18n/nl_BE.po
similarity index 89%
rename from account_statement_import/i18n/nl_BE.po
rename to account_statement_import_file/i18n/nl_BE.po
index 6da29c89..9fccac91 100644
--- a/account_statement_import/i18n/nl_BE.po
+++ b/account_statement_import_file/i18n/nl_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Dutch (Belgium) (https://www.transifex.com/odoo/teams/41243/"
@@ -46,9 +46,10 @@ msgstr "Annuleren"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Schermnaam"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Laatst gewijzigd op"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/pl.po b/account_statement_import_file/i18n/pl.po
similarity index 94%
rename from account_statement_import/i18n/pl.po
rename to account_statement_import_file/i18n/pl.po
index 68c09f2e..68e98a74 100644
--- a/account_statement_import/i18n/pl.po
+++ b/account_statement_import_file/i18n/pl.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Natalia Gros <nag@odoo.com>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/odoo/teams/41243/pl/)\n"
@@ -62,9 +62,10 @@ msgstr "Anuluj"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -78,7 +79,6 @@ msgid "Created on"
 msgstr "Data utworzenia"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nazwa wyświetlana"
@@ -93,7 +93,6 @@ msgstr ""
 "wybierz go z tego miejsca."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -142,7 +141,6 @@ msgid "Journal"
 msgstr "Dziennik"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Data ostatniej modyfikacji"
@@ -189,16 +187,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Konto świadczenia (%s) nie pokrywa się z dziennikiem (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -211,11 +209,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Konto świadczenia (%s) nie pokrywa się z dziennikiem (%s)."
+"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
@@ -289,6 +287,12 @@ msgstr "lub"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Konto bankowe"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "Konto świadczenia (%s) nie pokrywa się z dziennikiem '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Plik nie zawiera wyciągu"
 
diff --git a/account_statement_import/i18n/pt.po b/account_statement_import_file/i18n/pt.po
similarity index 82%
rename from account_statement_import/i18n/pt.po
rename to account_statement_import_file/i18n/pt.po
index 031d2780..5390f282 100644
--- a/account_statement_import/i18n/pt.po
+++ b/account_statement_import_file/i18n/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2021-09-13 19:33+0000\n"
 "Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>\n"
 "Language-Team: Portuguese (https://www.transifex.com/odoo/teams/41243/pt/)\n"
@@ -44,13 +44,11 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Não foi encontrada nenhuma conta bancária com o número '%s' ligada ao "
-"parceiro '%s'. Você deve criar a conta bancária e defini-la no diário "
-"bancário relacionado. Se este ainda não existir, deve criar um novo diário."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -63,7 +61,6 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome a Exibir"
@@ -77,7 +74,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -124,7 +120,6 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação em"
@@ -168,21 +163,18 @@ msgstr "Formatos suportados:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"A conta bancária com o número \"%s\" existe no Odoo, mas não está definida "
-"em nenhum diário bancário. Você deve defini-la no diário bancário "
-"relacionado. Se este ainda não existir, deve criar um novo diário."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -197,11 +189,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"A moeda do extrato bancário (%s) não é a mesma que a moeda do diário "
-"'%s' (%s))."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -273,5 +263,33 @@ msgstr "ou"
 #~ msgid "Import ID"
 #~ msgstr "ID de Importação"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Não foi encontrada nenhuma conta bancária com o número '%s' ligada ao "
+#~ "parceiro '%s'. Você deve criar a conta bancária e defini-la no diário "
+#~ "bancário relacionado. Se este ainda não existir, deve criar um novo "
+#~ "diário."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Conta Bancária de Parceiro"
+
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "A conta bancária com o número \"%s\" existe no Odoo, mas não está "
+#~ "definida em nenhum diário bancário. Você deve defini-la no diário "
+#~ "bancário relacionado. Se este ainda não existir, deve criar um novo "
+#~ "diário."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "A moeda do extrato bancário (%s) não é a mesma que a moeda do diário "
+#~ "'%s' (%s))."
diff --git a/account_statement_import/i18n/pt_BR.po b/account_statement_import_file/i18n/pt_BR.po
similarity index 94%
rename from account_statement_import/i18n/pt_BR.po
rename to account_statement_import_file/i18n/pt_BR.po
index b450e4d2..f3b6669d 100644
--- a/account_statement_import/i18n/pt_BR.po
+++ b/account_statement_import_file/i18n/pt_BR.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Luiz Carareto Alonso <Luiz.cararetoalonso@gmail.com>, 2019\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/"
@@ -62,9 +62,10 @@ msgstr "Cancelar"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -78,7 +79,6 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Nome exibido"
@@ -93,7 +93,6 @@ msgstr ""
 "selecione-os aqui."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -142,7 +141,6 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Última modificação em"
@@ -189,16 +187,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "A conta deste extrato (%s) não é a mesma que o diário (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -211,11 +209,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "A conta deste extrato (%s) não é a mesma que o diário (%s)."
+"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
@@ -290,6 +288,12 @@ msgstr "ou"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Conta Bancária"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "A conta deste extrato (%s) não é a mesma que o diário '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Este arquivo não contém qualquer extrato."
 
diff --git a/account_statement_import/i18n/ro.po b/account_statement_import_file/i18n/ro.po
similarity index 88%
rename from account_statement_import/i18n/ro.po
rename to account_statement_import_file/i18n/ro.po
index 152dfae9..95d0e656 100644
--- a/account_statement_import/i18n/ro.po
+++ b/account_statement_import_file/i18n/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
 "Language: ro\n"
@@ -43,9 +43,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -59,7 +60,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -72,7 +72,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -119,7 +118,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -164,16 +162,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -188,8 +186,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/ru.po b/account_statement_import_file/i18n/ru.po
similarity index 94%
rename from account_statement_import/i18n/ru.po
rename to account_statement_import_file/i18n/ru.po
index c8a9a7ad..01fccd5d 100644
--- a/account_statement_import/i18n/ru.po
+++ b/account_statement_import_file/i18n/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Vitalius Sharkhun <al070572sva@gmail.com>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
@@ -52,9 +52,10 @@ msgstr "Отменить"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -68,7 +69,6 @@ msgid "Created on"
 msgstr "Создан"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Отображаемое Имя"
@@ -82,7 +82,6 @@ msgstr ""
 "Получайте выписки из вашего банка в электронном формате и выбирайте их здесь."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "Номер"
@@ -131,7 +130,6 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Последнее изменение"
@@ -178,16 +176,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Счёт этой Выписки (%s) не совпадает с Журналом (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -200,11 +198,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Счёт этой Выписки (%s) не совпадает с Журналом (%s)."
+"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
@@ -278,6 +276,12 @@ msgstr "или"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Банковский счёт"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "Счёт этой Выписки (%s) не совпадает с Журналом '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Данный файл не содержит ни одной выписки"
 
diff --git a/account_statement_import/i18n/sk.po b/account_statement_import_file/i18n/sk.po
similarity index 92%
rename from account_statement_import/i18n/sk.po
rename to account_statement_import_file/i18n/sk.po
index 3c71e0a5..9b06782e 100644
--- a/account_statement_import/i18n/sk.po
+++ b/account_statement_import_file/i18n/sk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: gebri <gebri@inmail.sk>, 2018\n"
 "Language-Team: Slovak (https://www.transifex.com/odoo/teams/41243/sk/)\n"
@@ -49,9 +49,10 @@ msgstr "Zrušiť"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -65,7 +66,6 @@ msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Zobrazovaný Názov"
@@ -80,7 +80,6 @@ msgstr ""
 "ich tu."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "Účtovná kniha"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Posledná modifikácia"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha (%s)."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -198,11 +196,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha (%s)."
+"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
@@ -277,6 +275,12 @@ msgstr "alebo"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Bankový účet"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Tento súbor neobsahuje žiadny výpis."
 
diff --git a/account_statement_import/i18n/sl.po b/account_statement_import_file/i18n/sl.po
similarity index 88%
rename from account_statement_import/i18n/sl.po
rename to account_statement_import_file/i18n/sl.po
index c538aece..693c4f71 100644
--- a/account_statement_import/i18n/sl.po
+++ b/account_statement_import_file/i18n/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/odoo/teams/41243/sl/)\n"
 "Language: sl\n"
@@ -43,9 +43,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -59,7 +60,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -72,7 +72,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -119,7 +118,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -164,16 +162,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -188,8 +186,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/sq.po b/account_statement_import_file/i18n/sq.po
similarity index 89%
rename from account_statement_import/i18n/sq.po
rename to account_statement_import_file/i18n/sq.po
index 8f2dd573..f3d8408d 100644
--- a/account_statement_import/i18n/sq.po
+++ b/account_statement_import_file/i18n/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: Albanian (https://www.transifex.com/odoo/teams/41243/sq/)\n"
@@ -45,9 +45,10 @@ msgstr "Anullo"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -61,7 +62,6 @@ msgid "Created on"
 msgstr "Krijuar me"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Emri i paraqitur"
@@ -74,7 +74,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -121,7 +120,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Modifikimi i fundit në"
@@ -166,16 +164,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -190,8 +188,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/sr.po b/account_statement_import_file/i18n/sr.po
similarity index 90%
rename from account_statement_import/i18n/sr.po
rename to account_statement_import_file/i18n/sr.po
index 90a0cec9..74ec1744 100644
--- a/account_statement_import/i18n/sr.po
+++ b/account_statement_import_file/i18n/sr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-09-21 13:17+0000\n"
 "Last-Translator: Đorđe Cvijanović <cdorde@gmail.com>, 2018\n"
 "Language-Team: Serbian (https://www.transifex.com/odoo/teams/41243/sr/)\n"
@@ -48,9 +48,10 @@ msgstr "Otkaži"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -64,7 +65,6 @@ msgid "Created on"
 msgstr "Kreiran"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -77,7 +77,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -126,7 +125,6 @@ msgid "Journal"
 msgstr "Извештај"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -173,16 +171,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -197,8 +195,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/sr@latin.po b/account_statement_import_file/i18n/sr@latin.po
similarity index 91%
rename from account_statement_import/i18n/sr@latin.po
rename to account_statement_import_file/i18n/sr@latin.po
index f3db7b94..9d1de33f 100644
--- a/account_statement_import/i18n/sr@latin.po
+++ b/account_statement_import_file/i18n/sr@latin.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: Bojan Vrućinić <bojan.vrucinic@gmail.com>, 2017\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/odoo/teams/41243/sr"
@@ -51,9 +51,10 @@ msgstr "Odustani"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -67,7 +68,6 @@ msgid "Created on"
 msgstr "Datum kreiranja"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Naziv za prikaz"
@@ -80,7 +80,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Zadnja promena"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -200,8 +198,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/sv.po b/account_statement_import_file/i18n/sv.po
similarity index 85%
rename from account_statement_import/i18n/sv.po
rename to account_statement_import_file/i18n/sv.po
index 7410bc34..2fa10d73 100644
--- a/account_statement_import/i18n/sv.po
+++ b/account_statement_import_file/i18n/sv.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2022-03-18 16:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
+"PO-Revision-Date: 2021-11-19 15:36+0000\n"
 "Last-Translator: Simon S <simon.stromberg@vertel.se>\n"
 "Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
 "Language: sv\n"
@@ -50,13 +50,11 @@ msgstr "Avbryt"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
-"Kunde inte hitta något bankkonto med nummer '%s' kopplat till partner '%s'. "
-"Du bör skapa bankkontot och ange det i den relaterade bankjournalen. Om den "
-"relaterade bankjournalen inte finns ännu bör du skapa en ny."
 
 #. module: account_statement_import
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__create_uid
@@ -69,7 +67,6 @@ msgid "Created on"
 msgstr "Skapad den"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Visningsnamn"
@@ -83,7 +80,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -101,11 +97,13 @@ msgstr ""
 
 #. module: account_statement_import
 #: model:ir.actions.act_window,name:account_statement_import.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
+#, fuzzy
 msgid "Import Bank Statement Files"
 msgstr "Importera bankkontoutdrag"
 
@@ -130,7 +128,6 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Senast ändrad den"
@@ -174,21 +171,18 @@ msgstr "Format som stöds:"
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+#, 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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
-"Bankkontot med nummer '%s' finns i systemet men är inte angivet i någon "
-"bankjournal. Du bör ange det i den relaterade bankjournalen. Om den "
-"relaterade bankjournalen inte finns ännu bör du skapa en ny."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -204,11 +198,9 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Valutan för kontoutdraget (%s) är inte densamma som valutan för journalen "
-"'%s' (%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -282,9 +274,36 @@ msgstr "eller"
 #~ msgid "Import ID"
 #~ msgstr "Import ID"
 
+#~ msgid ""
+#~ "Could not find any bank account with number '%s' linked to partner '%s'. "
+#~ "You should create the bank account and set it on the related bank "
+#~ "journal. If the related bank journal doesn't exist yet, you should create "
+#~ "a new one."
+#~ msgstr ""
+#~ "Kunde inte hitta något bankkonto med nummer '%s' kopplat till partner "
+#~ "'%s'. Du bör skapa bankkontot och ange det i den relaterade "
+#~ "bankjournalen. Om den relaterade bankjournalen inte finns ännu bör du "
+#~ "skapa en ny."
+
 #~ msgid "Partner Bank Account"
 #~ msgstr "Partners bankkonto"
 
+#~ msgid ""
+#~ "The bank account with number '%s' exists in Odoo but it is not set on any "
+#~ "bank journal. You should set it on the related bank journal. If the "
+#~ "related bank journal doesn't exist yet, you should create a new one."
+#~ msgstr ""
+#~ "Bankkontot med nummer '%s' finns i systemet men är inte angivet i någon "
+#~ "bankjournal. Du bör ange det i den relaterade bankjournalen. Om den "
+#~ "relaterade bankjournalen inte finns ännu bör du skapa en ny."
+
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Valutan för kontoutdraget (%s) är inte densamma som valutan för journalen "
+#~ "'%s' (%s)."
+
 #~ msgid "Account Holder"
 #~ msgstr "Kontoinnehavare"
 
diff --git a/account_statement_import/i18n/ta.po b/account_statement_import_file/i18n/ta.po
similarity index 89%
rename from account_statement_import/i18n/ta.po
rename to account_statement_import_file/i18n/ta.po
index d6108e80..6f3e76e6 100644
--- a/account_statement_import/i18n/ta.po
+++ b/account_statement_import_file/i18n/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2016-02-05 10:18+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Tamil (http://www.transifex.com/odoo/odoo-9/language/ta/)\n"
@@ -44,9 +44,10 @@ msgstr "ரத்து"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -62,7 +63,6 @@ msgstr ""
 "தேதி"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "காட்சி பெயர்"
@@ -75,7 +75,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -122,7 +121,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "கடைசியாக திருத்திய"
@@ -167,16 +165,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -191,8 +189,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/te.po b/account_statement_import_file/i18n/te.po
similarity index 89%
rename from account_statement_import/i18n/te.po
rename to account_statement_import_file/i18n/te.po
index a58dab93..e9b9b696 100644
--- a/account_statement_import/i18n/te.po
+++ b/account_statement_import_file/i18n/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2016-06-08 07:48+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Telugu (http://www.transifex.com/odoo/odoo-9/language/te/)\n"
@@ -44,9 +44,10 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -60,7 +61,6 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr ""
@@ -73,7 +73,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr ""
@@ -120,7 +119,6 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -165,16 +163,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -189,8 +187,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/th.po b/account_statement_import_file/i18n/th.po
similarity index 91%
rename from account_statement_import/i18n/th.po
rename to account_statement_import_file/i18n/th.po
index 00d17851..b7b7ca2d 100644
--- a/account_statement_import/i18n/th.po
+++ b/account_statement_import_file/i18n/th.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-21 13:17+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: gsong <gsong2014@foxmail.com>, 2018\n"
 "Language-Team: Thai (https://www.transifex.com/odoo/teams/41243/th/)\n"
@@ -50,9 +50,10 @@ msgstr "ยกเลิก"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "ชื่อที่ใช้แสดง"
@@ -79,7 +79,6 @@ msgid ""
 msgstr ""
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "รหัส"
@@ -128,7 +127,6 @@ msgid "Journal"
 msgstr "สมุดบัญชี"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
@@ -175,16 +173,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -199,8 +197,8 @@ msgstr ""
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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
diff --git a/account_statement_import/i18n/tr.po b/account_statement_import_file/i18n/tr.po
similarity index 94%
rename from account_statement_import/i18n/tr.po
rename to account_statement_import_file/i18n/tr.po
index 18aa925e..7728982d 100644
--- a/account_statement_import/i18n/tr.po
+++ b/account_statement_import_file/i18n/tr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
@@ -58,9 +58,10 @@ msgstr "İptal"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -74,7 +75,6 @@ msgid "Created on"
 msgstr "Oluşturulma"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Görünüm Adı"
@@ -88,7 +88,6 @@ 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_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -137,7 +136,6 @@ msgid "Journal"
 msgstr "Yevmiye"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Son Güncelleme"
@@ -184,16 +182,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Bu kaydın (%s) hesabı, yevmiye (%s) aynı değil."
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -206,13 +204,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Banka hesap özetinin para birimi (%s) yevmiye para birimi ile aynı değil "
-"(%s)."
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
@@ -286,6 +282,14 @@ msgstr "veya"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Banka Hesabı"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Banka hesap özetinin para birimi (%s) yevmiye para birimi ile aynı değil "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Bu dosya hiçbir açıklama içermiyor."
 
diff --git a/account_statement_import/i18n/uk.po b/account_statement_import_file/i18n/uk.po
similarity index 95%
rename from account_statement_import/i18n/uk.po
rename to account_statement_import_file/i18n/uk.po
index 98a7c9ee..b3c7f345 100644
--- a/account_statement_import/i18n/uk.po
+++ b/account_statement_import_file/i18n/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -50,9 +50,10 @@ msgstr "Скасувати"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr "Створено на"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Назва для відображення"
@@ -80,7 +80,6 @@ msgstr ""
 "Отримайте виписку в електронному форматі з вашого банку та оберіть її тут."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -129,7 +128,6 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Останні зміни на"
@@ -176,16 +174,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "Рахунок виписки (%s) не співпадає з рахунком журналу (%s) !"
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -198,11 +196,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "Валюта банківської виписки(%s) не така ж, як валюта журналу (%s)."
+"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
@@ -278,6 +276,13 @@ msgstr "або"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Банківський рахунок"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Валюта банківської виписки(%s) не така ж, як валюта журналу '%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Файл не містить виписки."
 
diff --git a/account_statement_import/i18n/vi.po b/account_statement_import_file/i18n/vi.po
similarity index 94%
rename from account_statement_import/i18n/vi.po
rename to account_statement_import_file/i18n/vi.po
index dec8f5f0..76ad3a44 100644
--- a/account_statement_import/i18n/vi.po
+++ b/account_statement_import_file/i18n/vi.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Dao Nguyen <trucdao.uel@gmail.com>, 2019\n"
 "Language-Team: Vietnamese (https://www.transifex.com/odoo/teams/41243/vi/)\n"
@@ -53,9 +53,10 @@ msgstr "Hủy"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -69,7 +70,6 @@ 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_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "Tên hiển thị"
@@ -84,7 +84,6 @@ msgstr ""
 "đây."
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -133,7 +132,6 @@ msgid "Journal"
 msgstr "Sổ nhật ký"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "Sửa lần cuối"
@@ -180,18 +178,17 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
+msgid "The Bank Accounting Account is not set on the journal '%s'."
 msgstr ""
-"Tài khoản của giao dịch này (%s) không giống với tài khoản của sổ nhật ký "
-"(%s)."
+"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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -204,13 +201,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
+"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 ""
-"Tài khoản của giao dịch này (%s) 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
@@ -284,6 +279,14 @@ msgstr "hoặc"
 #~ msgid "Partner Bank Account"
 #~ msgstr "Tài khoản ngân hàng"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr ""
+#~ "Tài khoản của giao dịch này (%s) không giống với tài khoản của sổ nhật ký "
+#~ "'%s' (%s)."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "Tập tin này không chứa bất kỳ sao kê nào."
 
diff --git a/account_statement_import/i18n/zh_CN.po b/account_statement_import_file/i18n/zh_CN.po
similarity index 94%
rename from account_statement_import/i18n/zh_CN.po
rename to account_statement_import_file/i18n/zh_CN.po
index fe50fb53..86cfeed0 100644
--- a/account_statement_import/i18n/zh_CN.po
+++ b/account_statement_import_file/i18n/zh_CN.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: ryan ryan <itechr@outlook.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/"
@@ -62,9 +62,10 @@ msgstr "取消日期"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -78,7 +79,6 @@ msgid "Created on"
 msgstr "创建时间"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "显示名称"
@@ -91,7 +91,6 @@ msgid ""
 msgstr "从银行拿到电子格式的银行对账单并且在这里选择他们"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -140,7 +139,6 @@ msgid "Journal"
 msgstr "日记账"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最后更改日"
@@ -187,16 +185,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "对账单中的科目(%s)和日记账(%s)中的不一样"
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -209,11 +207,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "银行对账单 (%s) 的币种和日记账 (%s)的币种不一样."
+"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
@@ -287,6 +285,12 @@ msgstr "或"
 #~ msgid "Partner Bank Account"
 #~ msgstr "银行账户"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "银行对账单 (%s) 的币种和日记账 '%s' (%s)的币种不一样."
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "这个文件不包含任何对账单"
 
diff --git a/account_statement_import/i18n/zh_TW.po b/account_statement_import_file/i18n/zh_TW.po
similarity index 94%
rename from account_statement_import/i18n/zh_TW.po
rename to account_statement_import_file/i18n/zh_TW.po
index f0dee120..76e2cc93 100644
--- a/account_statement_import/i18n/zh_TW.po
+++ b/account_statement_import_file/i18n/zh_TW.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~12.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-27 09:10+0000\n"
+"POT-Creation-Date: 2022-01-26 09:11+0000\n"
 "PO-Revision-Date: 2019-08-26 09:08+0000\n"
 "Last-Translator: Michael Yeung, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/"
@@ -50,9 +50,10 @@ msgstr "取消"
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, python-format
 msgid ""
-"Could not find any bank account with number '%s' linked to partner '%s'. You "
-"should create the bank account and set it on the related bank journal. If "
-"the related bank journal doesn't exist yet, you should create a new one."
+"Could not find any bank account with number '%(account_number)s' linked to "
+"partner '%(partner_name)s'. You should create the bank account and set it on "
+"the related bank journal. If the related bank journal doesn't exist yet, you "
+"should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -66,7 +67,6 @@ msgid "Created on"
 msgstr "建立於"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__display_name
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__display_name
 msgid "Display Name"
 msgstr "顯示名稱"
@@ -79,7 +79,6 @@ msgid ""
 msgstr "從銀行拿到電子格式的銀行對帳單並且在這裡選擇他們"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal__id
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import__id
 msgid "ID"
 msgstr "ID"
@@ -128,7 +127,6 @@ msgid "Journal"
 msgstr "日記帳"
 
 #. module: account_statement_import
-#: model:ir.model.fields,field_description:account_statement_import.field_account_journal____last_update
 #: model:ir.model.fields,field_description:account_statement_import.field_account_statement_import____last_update
 msgid "Last Modified on"
 msgstr "最後修改於"
@@ -175,16 +173,16 @@ msgstr ""
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
 #, fuzzy, python-format
-msgid "The Bank Accounting Account in not set on the journal '%s'."
-msgstr "對帳單中的科目(%s)和日記帳(%s)中的不一樣"
+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
 #, python-format
 msgid ""
-"The bank account with number '%s' exists in Odoo but it is not set on any "
-"bank journal. You should set it on the related bank journal. If the related "
-"bank journal doesn't exist yet, you should create a new one."
+"The bank account with number '%(account_number)s' exists in Odoo but it is "
+"not set on any bank journal. You should set it on the related bank journal. "
+"If the related bank journal doesn't exist yet, you should create a new one."
 msgstr ""
 
 #. module: account_statement_import
@@ -197,11 +195,11 @@ msgstr ""
 
 #. module: account_statement_import
 #: code:addons/account_statement_import/wizard/account_statement_import.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The currency of the bank statement (%s) is not the same as the currency of "
-"the journal '%s' (%s)."
-msgstr "銀行報表 (%s) 的貨幣與日誌 (%s) 的幣種不同。"
+"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
@@ -275,6 +273,12 @@ msgstr "或"
 #~ msgid "Partner Bank Account"
 #~ msgstr "銀行帳戶"
 
+#, fuzzy
+#~ msgid ""
+#~ "The currency of the bank statement (%s) is not the same as the currency "
+#~ "of the journal '%s' (%s)."
+#~ msgstr "銀行報表 (%s) 的貨幣與日誌 '%s' (%s) 的幣種不同。"
+
 #~ msgid "This file doesn't contain any statement."
 #~ msgstr "這個文件不包含任何對帳單"
 
diff --git a/account_statement_import/models/__init__.py b/account_statement_import_file/models/__init__.py
similarity index 100%
rename from account_statement_import/models/__init__.py
rename to account_statement_import_file/models/__init__.py
diff --git a/account_statement_import/models/account_journal.py b/account_statement_import_file/models/account_journal.py
similarity index 64%
rename from account_statement_import/models/account_journal.py
rename to account_statement_import_file/models/account_journal.py
index c6e37d4e..c504807e 100644
--- a/account_statement_import/models/account_journal.py
+++ b/account_statement_import_file/models/account_journal.py
@@ -3,12 +3,20 @@
 # @author: Alexis de Lattre <alexis.delattre@akretion.com>
 # Licence LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0).
 
-from odoo import _, models
+from odoo import _, api, models
 
 
 class AccountJournal(models.Model):
     _inherit = "account.journal"
 
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        formats_list = self._get_bank_statements_available_import_formats()
+        if formats_list:
+            res["bank_statements_source"] = "file_import"
+        return res
+
     def _get_bank_statements_available_import_formats(self):
         """Returns a list of strings representing the supported import formats."""
         return []
@@ -19,16 +27,16 @@ class AccountJournal(models.Model):
         if formats_list:
             formats_list.sort()
             import_formats_str = ", ".join(formats_list)
-            rslt.append(("file_import", _("Import") + "(" + import_formats_str + ")"))
+            rslt.insert(
+                0, ("file_import", _("Import") + "(" + import_formats_str + ")")
+            )
         return rslt
 
     def import_account_statement(self):
         """return action to import bank/cash statements.
         This button should be called only on journals with type =='bank'"""
-        action = (
-            self.env.ref("account_statement_import.account_statement_import_action")
-            .sudo()
-            .read()[0]
+        action = self.env["ir.actions.actions"]._for_xml_id(
+            "account_statement_import_file.account_statement_import_action"
         )
         action["context"] = {"journal_id": self.id}
         return action
diff --git a/account_statement_import/readme/CONTRIBUTORS.rst b/account_statement_import_file/readme/CONTRIBUTORS.rst
similarity index 100%
rename from account_statement_import/readme/CONTRIBUTORS.rst
rename to account_statement_import_file/readme/CONTRIBUTORS.rst
diff --git a/account_statement_import/readme/DESCRIPTION.rst b/account_statement_import_file/readme/DESCRIPTION.rst
similarity index 100%
rename from account_statement_import/readme/DESCRIPTION.rst
rename to account_statement_import_file/readme/DESCRIPTION.rst
diff --git a/account_statement_import/readme/USAGE.rst b/account_statement_import_file/readme/USAGE.rst
similarity index 100%
rename from account_statement_import/readme/USAGE.rst
rename to account_statement_import_file/readme/USAGE.rst
diff --git a/account_statement_import/security/ir.model.access.csv b/account_statement_import_file/security/ir.model.access.csv
similarity index 100%
rename from account_statement_import/security/ir.model.access.csv
rename to account_statement_import_file/security/ir.model.access.csv
diff --git a/account_statement_import/static/description/icon.png b/account_statement_import_file/static/description/icon.png
similarity index 100%
rename from account_statement_import/static/description/icon.png
rename to account_statement_import_file/static/description/icon.png
diff --git a/account_statement_import/static/description/icon.svg b/account_statement_import_file/static/description/icon.svg
similarity index 100%
rename from account_statement_import/static/description/icon.svg
rename to account_statement_import_file/static/description/icon.svg
diff --git a/account_statement_import/static/description/index.html b/account_statement_import_file/static/description/index.html
similarity index 100%
rename from account_statement_import/static/description/index.html
rename to account_statement_import_file/static/description/index.html
diff --git a/account_statement_import/views/account_journal.xml b/account_statement_import_file/views/account_journal.xml
similarity index 57%
rename from account_statement_import/views/account_journal.xml
rename to account_statement_import_file/views/account_journal.xml
index 1f81b2ec..81a5f275 100644
--- a/account_statement_import/views/account_journal.xml
+++ b/account_statement_import_file/views/account_journal.xml
@@ -11,21 +11,23 @@
         <field name="model">account.journal</field>
         <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
         <field name="arch" type="xml">
-            <!--
-                We need to add the create tag in order to show buttons.
-                However, we will change them using the JS definition.
-            -->
-            <kanban position="attributes">
-                <attribute name="create">1</attribute>
-            </kanban>
-            <xpath expr='//span[@name="button_import_placeholder"]' position='inside'>
-                <span>or <a
-                        type="object"
+            <xpath
+                expr='//a[@name="action_configure_bank_journal"]/..'
+                position='before'
+            >
+                <t t-if="dashboard.bank_statements_source == 'file_import'">
+                    <button
                         name="import_account_statement"
-                    >Import (OCA)</a></span>
+                        type="object"
+                        class="btn btn-primary"
+                        groups="account.group_account_user"
+                    >
+                        <span>Import (OCA)</span>
+                    </button>
+                </t>
             </xpath>
-            <xpath expr='//div[@name="bank_cash_commands"]' position="before">
-                <div t-if="journal_type == 'bank'">
+            <xpath expr='//div[@name="bank_customer_payment"]' position="before">
+                <div t-if="journal_type == 'bank'" groups="account.group_account_user">
                     <a
                         type="object"
                         name="import_account_statement"
diff --git a/account_statement_import/wizard/__init__.py b/account_statement_import_file/wizard/__init__.py
similarity index 100%
rename from account_statement_import/wizard/__init__.py
rename to account_statement_import_file/wizard/__init__.py
diff --git a/account_statement_import/wizard/account_statement_import.py b/account_statement_import_file/wizard/account_statement_import.py
similarity index 82%
rename from account_statement_import/wizard/account_statement_import.py
rename to account_statement_import_file/wizard/account_statement_import.py
index 2a72221c..9b3f1982 100644
--- a/account_statement_import/wizard/account_statement_import.py
+++ b/account_statement_import_file/wizard/account_statement_import.py
@@ -17,7 +17,6 @@ class AccountStatementImport(models.TransientModel):
     _description = "Import Bank Statement Files"
 
     statement_file = fields.Binary(
-        string="Statement File",
         required=True,
         help="Get you bank statements in electronic format from your bank "
         "and select them here.",
@@ -28,7 +27,7 @@ class AccountStatementImport(models.TransientModel):
         self.ensure_one()
         result = {
             "statement_ids": [],
-            "notifications": [],
+            "notifications": [],  # list of text messages
         }
         logger.info("Start to import bank statement file %s", self.statement_filename)
         file_data = base64.b64decode(self.statement_file)
@@ -51,23 +50,30 @@ class AccountStatementImport(models.TransientModel):
         action = self.env["ir.actions.actions"]._for_xml_id(
             "account.action_bank_statement_tree"
         )
-        if len(result["statement_ids"]) == 1:
-            action.update(
-                {
-                    "view_mode": "form,tree",
-                    "views": False,
-                    "res_id": result["statement_ids"][0],
-                }
-            )
-        else:
-            action["domain"] = [("id", "in", result["statement_ids"])]
+        # there is no more bank statement form view in v16
+        action["domain"] = [("id", "in", result["statement_ids"])]
+        if result["notifications"]:
+            action_with_notif = {
+                "type": "ir.actions.client",
+                "tag": "display_notification",
+                "params": {
+                    "type": "warning",
+                    "sticky": True,
+                    "message": "\n\n".join(result["notifications"]),
+                    "next": action,
+                },
+            }
+            return action_with_notif
         return action
 
     def _prepare_create_attachment(self, result):
+        # Attach to first bank statement
+        res_id = result["statement_ids"][0]
+        st = self.env["account.bank.statement"].browse(res_id)
         vals = {
             "name": self.statement_filename,
-            # Attach to first bank statement
-            "res_id": result["statement_ids"][0],
+            "res_id": res_id,
+            "company_id": st.company_id.id,
             "res_model": "account.bank.statement",
             "datas": self.statement_file,
         }
@@ -106,7 +112,7 @@ class AccountStatementImport(models.TransientModel):
         journal = self._match_journal(account_number, currency)
         if not journal.default_account_id:
             raise UserError(
-                _("The Bank Accounting Account in not set on the " "journal '%s'.")
+                _("The Bank Accounting Account is not set on the journal '%s'.")
                 % journal.display_name
             )
         # Prepare statement data to be used for bank statements creation
@@ -220,13 +226,15 @@ class AccountStatementImport(models.TransientModel):
                 ],
                 limit=1,
             )
-            journal_id = self.env.context.get("journal_id")
-            if journal_id and journal.id != journal_id:
+            ctx_journal_id = self.env.context.get("journal_id")
+            if journal and ctx_journal_id and journal.id != ctx_journal_id:
+                ctx_journal = journal_obj.browse(ctx_journal_id)
                 raise UserError(
                     _(
-                        "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).",
+                        journal_match=journal.display_name,
+                        journal_selected=ctx_journal.display_name,
                     )
                 )
 
@@ -241,24 +249,25 @@ class AccountStatementImport(models.TransientModel):
                 if bank_accounts:
                     raise UserError(
                         _(
-                            "The bank account with number '%s' exists in Odoo "
+                            "The bank account with number '%(account_number)s' exists in Odoo "
                             "but it is not set on any bank journal. You should "
                             "set it on the related bank journal. If the related "
                             "bank journal doesn't exist yet, you should create "
-                            "a new one."
+                            "a new one.",
+                            account_number=account_number,
                         )
-                        % (account_number,)
                     )
                 else:
                     raise UserError(
                         _(
-                            "Could not find any bank account with number '%s' "
-                            "linked to partner '%s'. You should create the bank "
+                            "Could not find any bank account with number '%(account_number)s' "
+                            "linked to partner '%(partner_name)s'. You should create the bank "
                             "account and set it on the related bank journal. "
                             "If the related bank journal doesn't exist yet, you "
-                            "should create a new one."
+                            "should create a new one.",
+                            account_number=account_number,
+                            partner_name=company.partner_id.display_name,
                         )
-                        % (account_number, company.partner_id.display_name)
                     )
 
         # We support multi-file and multi-statement in a file
@@ -268,18 +277,21 @@ class AccountStatementImport(models.TransientModel):
         if journal_currency != currency:
             raise UserError(
                 _(
-                    "The currency of the bank statement (%s) is not the same as the "
-                    "currency of the journal '%s' (%s)."
+                    "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).",
+                    currency_name=currency.name,
+                    journal_name=journal.display_name,
+                    journal_currency_name=journal_currency.name,
                 )
-                % (currency.name, journal.display_name, journal_currency.name)
             )
         return journal
 
     def _complete_stmts_vals(self, stmts_vals, journal, account_number):
         speeddict = journal._statement_line_import_speeddict()
         for st_vals in stmts_vals:
-            st_vals["journal_id"] = journal.id
             for lvals in st_vals["transactions"]:
+                lvals["journal_id"] = journal.id
                 journal._statement_line_import_update_unique_import_id(
                     lvals, account_number
                 )
@@ -335,19 +347,11 @@ class AccountStatementImport(models.TransientModel):
         # Prepare import feedback
         num_ignored = len(existing_st_line_ids)
         if num_ignored > 0:
-            result["notifications"].append(
-                {
-                    "type": "warning",
-                    "message": _(
-                        "%d transactions had already been imported and were ignored."
-                    )
+            if num_ignored == 1:
+                msg = _("1 transaction had already been imported and was ignored.")
+            else:
+                msg = (
+                    _("%d transactions had already been imported and were ignored.")
                     % num_ignored
-                    if num_ignored > 1
-                    else _("1 transaction had already been imported and was ignored."),
-                    "details": {
-                        "name": _("Already imported items"),
-                        "model": "account.bank.statement.line",
-                        "ids": list(existing_st_line_ids.keys()),
-                    },
-                }
-            )
+                )
+            result["notifications"].append(msg)
diff --git a/account_statement_import/wizard/account_statement_import_view.xml b/account_statement_import_file/wizard/account_statement_import_view.xml
similarity index 100%
rename from account_statement_import/wizard/account_statement_import_view.xml
rename to account_statement_import_file/wizard/account_statement_import_view.xml
diff --git a/setup/account_statement_import_file/odoo/addons/account_statement_import_file b/setup/account_statement_import_file/odoo/addons/account_statement_import_file
new file mode 120000
index 00000000..df8e4753
--- /dev/null
+++ b/setup/account_statement_import_file/odoo/addons/account_statement_import_file
@@ -0,0 +1 @@
+../../../../account_statement_import_file
\ No newline at end of file
diff --git a/setup/account_statement_import_file/setup.py b/setup/account_statement_import_file/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/account_statement_import_file/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)