[I18N] Update translation terms from Transifex

1 files changed, 2145 insertions, 1705 deletions

diff --git a/odoo/addons/base/i18n/ru.po b/odoo/addons/base/i18n/ru.po
index ab2abd6fbda..473f4f1e2bb 100644
--- a/odoo/addons/base/i18n/ru.po
+++ b/odoo/addons/base/i18n/ru.po
@@ -28,13 +28,15 @@
 # Андрей Ландау <zaebokkunwow@gmail.com>, 2017
 # Dmitry sky <d.v.selitsky@gmail.com>, 2017
 # Yuriy Ney <k_wizard@mail.ru>, 2018
+# sergeiruzkiicode <sergei.ruzki@icode.by>, 2018
+# Алексей Билькевич (belskiy) <mmmbrsk@gmail.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~11.1+e\n"
+"Project-Id-Version: Odoo Server saas~11.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:47+0000\n"
-"PO-Revision-Date: 2017-12-13 14:47+0000\n"
-"Last-Translator: Yuriy Ney <k_wizard@mail.ru>, 2018\n"
+"POT-Creation-Date: 2018-03-22 14:03+0000\n"
+"PO-Revision-Date: 2018-03-22 14:03+0000\n"
+"Last-Translator: Алексей Билькевич (belskiy) <mmmbrsk@gmail.com>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -220,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_config.py:315
+#: code:addons/base/models/res_config.py:314
 #, python-format
 msgid ""
 "\n"
@@ -632,6 +634,13 @@ msgstr ""
 "Печатать сумму для расходов в словесном виде"
 
 #. module: base
+#: model:ir.module.module,summary:base.module_social_media
+msgid ""
+"\n"
+"        Social media connectors for company settings."
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_base_sparse_field
 msgid ""
 "\n"
@@ -643,6 +652,15 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_social_media
+msgid ""
+"\n"
+"        The purpose of this technical module is to provide a front for\n"
+"        social media configuration for any other module that might need it.\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_delivery_barcode
 msgid ""
 "\n"
@@ -798,6 +816,13 @@ msgstr ""
 "    "
 
 #. module: base
+#: model:ir.module.module,description:base.module_quality_mrp_workorder
+msgid ""
+"\n"
+"    Adds Quality Control to workorders.\n"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_quality_mrp
 msgid ""
 "\n"
@@ -867,7 +892,7 @@ msgstr ""
 #: model:ir.module.module,description:base.module_project_forecast
 msgid ""
 "\n"
-"    Resource management for Project\n"
+"    Schedule your teams across projects and estimate deadlines more accurately.\n"
 "    "
 msgstr ""
 
@@ -1139,12 +1164,11 @@ msgid ""
 "\n"
 "Accounting reports for Singapore\n"
 "================================\n"
+"This module allow to generate the GST Return (F5) and the IRAS Audit File.\n"
+" - To generate the GST Return, go to Accounting -> Reporting -> GST Return\n"
+" - To generate the IRAS Audit File, go to Accounting -> Reporting -> IRAS Audit File\n"
 "    "
 msgstr ""
-"\n"
-"Бухгалтерская отчетность для Сингапура\n"
-"================================\n"
-" "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_th_reports
@@ -3074,6 +3098,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
+#: model:ir.module.module,description:base.module_analytic_enterprise
 msgid ""
 "\n"
 "Module for defining analytic accounting object.\n"
@@ -3817,15 +3842,26 @@ msgstr ""
 #: model:ir.module.module,description:base.module_quality
 msgid ""
 "\n"
-"Quality Control\n"
+"Quality Base\n"
 "===============\n"
-"\n"
 "* Define quality points that will generate quality checks on pickings,\n"
 "  manufacturing orders or work orders (quality_mrp)\n"
 "* Quality alerts can be created independently or related to quality checks\n"
 "* Possibility to add a measure to the quality check with a min/max tolerance\n"
 "* Define your stages for the quality alerts\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_quality_control
+msgid ""
 "\n"
+"Quality Control\n"
+"===============\n"
+"* Define quality points that will generate quality checks on pickings,\n"
+"  manufacturing orders or work orders (quality_mrp)\n"
+"* Quality alerts can be created independently or related to quality checks\n"
+"* Possibility to add a measure to the quality check with a min/max tolerance\n"
+"* Define your stages for the quality alerts\n"
 msgstr ""
 
 #. module: base
@@ -4018,37 +4054,13 @@ msgid ""
 "Singapore accounting chart and localization.\n"
 "=======================================================\n"
 "\n"
-"After installing this module, the Configuration wizard for accounting is launched.\n"
-"    * The Chart of Accounts consists of the list of all the general ledger accounts\n"
-"      required to maintain the transactions of Singapore.\n"
-"    * On that particular wizard, you will be asked to pass the name of the company,\n"
-"      the chart template to follow, the no. of digits to generate, the code for your\n"
-"      account and bank account, currency to create journals.\n"
-"\n"
-"    * The Chart of Taxes would display the different types/groups of taxes such as\n"
-"      Standard Rates, Zeroed, Exempted, MES and Out of Scope.\n"
-"    * The tax codes are specified considering the Tax Group and for easy accessibility of\n"
-"      submission of GST Tax Report.\n"
+"This module add, for accounting:\n"
+" - The Chart of Accounts of Singapore\n"
+" - Field UEN (Unique Entity Number) on company and partner\n"
+" - Field PermitNo and PermitNoDate on invoice\n"
 "\n"
 "    "
 msgstr ""
-"\n"
-"Сингапурский план счетов бухгалтерского учета и локализация.\n"
-"=============================================================== =====\n"
-"\n"
-"После установки этого модуля запускается мастер настройки для бухгалтерского учета.\n"
-"     * План счетов состоит из списка всех счетов главной книги,\n"
-"       необходимых для обслуживания операций Сингапура.\n"
-"     * В этом конкретном мастере вам будет предложено передать название компании,\n"
-"       шаблон счетов для поддерживания, номер цифр для генерации, код для вашего\n"
-"       счета и банковский счет, валюта для создания журналов.\n"
-"\n"
-"     * В Таблице налогов будут отображаться различные типы / группы налогов, например,\n"
-"       Стандартные ставки, нулевые, освобожденные, система управления производственными процессами и вне сферы действия.\n"
-"     * Налоговые коды указываются с учетом Группы налогообложения и для удобства доступа\n"
-"       представление Налогового отчета Налог на товары и услуги.\n"
-"\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -4130,7 +4142,7 @@ msgid ""
 "An ISR will be generated if you specify the information it needs :\n"
 "    - The bank account you expect to be paid on must be set, and have a valid postal reference.\n"
 "    - Your invoice must have been set assigned a bank account to receive its payment\n"
-"    (this can be done manually, but a default value is automatically set if you have defined a bank account).\n"
+"      (this can be done manually, but a default value is automatically set if you have defined a bank account).\n"
 "    - You must have set the postal references of your bank.\n"
 "    - Your invoice must be in EUR or CHF (as ISRs do not accept other currencies)\n"
 "\n"
@@ -4205,7 +4217,7 @@ msgstr ""
 "     "
 
 #. module: base
-#: model:ir.module.module,description:base.module_mrp_repair
+#: model:ir.module.module,description:base.module_repair
 msgid ""
 "\n"
 "The aim is to have a complete module to manage all products repairs.\n"
@@ -4300,6 +4312,44 @@ msgstr ""
 "=================================================================================================\n"
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_pos_cert
+msgid ""
+"\n"
+"This add-on brings the technical requirements of the French regulation CGI art. 286, I. 3° bis that stipulates certain criteria concerning the inalterability, security, storage and archiving of data related to sales to private individuals (B2C).\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"Install it if you use the Point of Sale app to sell to individuals.\n"
+"\n"
+"The module adds following features:\n"
+"\n"
+"    Inalterability: deactivation of all the ways to cancel or modify key data of POS orders, invoices and journal entries\n"
+"\n"
+"    Security: chaining algorithm to verify the inalterability\n"
+"\n"
+"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
+"\n"
+"    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_certification
+msgid ""
+"\n"
+"This add-on brings the technical requirements of the French regulation CGI art. 286, I. 3° bis that stipulates certain criteria concerning the inalterability, security, storage and archiving of data related to sales to private individuals (B2C).\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"The module adds following features:\n"
+"\n"
+"    Inalterability: deactivation of all the ways to cancel or modify key data, invoices and journal entries\n"
+"\n"
+"    Security: chaining algorithm to verify the inalterability\n"
+"\n"
+"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
+"\n"
+"    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_pos_cache
 msgid ""
 "\n"
@@ -4853,6 +4903,19 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_sale_closing
+msgid ""
+"\n"
+"This module adds support for automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"The module adds following features:\n"
+"\n"
+"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
+"\n"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_barcodes
 msgid ""
 "\n"
@@ -5043,6 +5106,23 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_ca_check_printing
+msgid ""
+"\n"
+"This module allows to print your payments on pre-printed checks.\n"
+"You can configure the output (layout, stubs, paper format, etc.) in company settings, and manage the\n"
+"checks numbering (if you use pre-printed checks without numbers) in journal settings.\n"
+"As per Canadian Payment Association (https://www.payments.ca/sites/default/files/standard_006_complete_0.pdf)\n"
+"\n"
+"Supported formats\n"
+"-----------------\n"
+"- Check on top : Quicken / QuickBooks standard\n"
+"- Check on middle: Peachtree standard\n"
+"- Check on bottom: ADP standard\n"
+"    "
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_anonymization
 msgid ""
 "\n"
@@ -5832,6 +5912,12 @@ msgstr ""
 "Приобретатель платежей с использованием Worldwide SIPS."
 
 #. module: base
+#: code:addons/base/models/ir_ui_view.py:1048
+#, python-format
+msgid " - %r in %s=%r"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_inter_company_rules
 msgid ""
 " Module for synchronization of Documents between several companies. For example, this allow you to have a Sales Order created automatically when a Purchase Order is validated with another company of the system as vendor, and inversely.\n"
@@ -5840,6 +5926,13 @@ msgid ""
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,description:base.module_l10n_hk
+msgid ""
+" This is the base module to manage chart of accounting and localization for "
+"Hong Kong "
+msgstr ""
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "%A - Full weekday name."
 msgstr "%A - Полное название дня недели."
@@ -5906,10 +5999,10 @@ msgstr "%p — Эквивалентно AM или PM.\""
 
 #. module: base
 #: code:addons/base/models/ir_filters.py:38
-#: code:addons/base/models/res_partner.py:325
-#: code:addons/base/models/res_users.py:145
-#: code:addons/base/models/res_users.py:399
-#: code:addons/base/models/res_users.py:401
+#: code:addons/base/models/res_partner.py:324
+#: code:addons/base/models/res_users.py:146
+#: code:addons/base/models/res_users.py:410
+#: code:addons/base/models/res_users.py:412
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (копия)"
@@ -5925,7 +6018,7 @@ msgid "%y - Year without century [00,99].\""
 msgstr "%y — Двухзначный год [00—99].\""
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1402
+#: code:addons/base/models/ir_model.py:1406
 #, python-format
 msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
@@ -6091,11 +6184,6 @@ msgid ":B10    16  31 x 44 mm"
 msgstr ":B10 16 31 x 44 мм"
 
 #. module: base
-#: model:ir.actions.act_window,help:base.open_module_tree
-msgid "<b>No module found!</b>"
-msgstr "<b>Модулей не обнаружено!</b>"
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid ""
 "<code style=\"white-space: pre-wrap\">\n"
@@ -6302,7 +6390,7 @@ msgid "A AGRICULTURE, FORESTRY AND FISHING"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2745
+#: code:addons/models.py:2753
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr "Документ изменился с момента вашего последнего просмотра (%s:%d)"
@@ -6382,6 +6470,11 @@ msgid "A unit must be provided to duration widgets"
 msgstr "Блок должен быть предоставлен виджетам длительности"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__exclude_contact
+msgid "A user associated to the contact"
+msgstr "Пользователь, связанный с контактом"
+
+#. module: base
 #: selection:report.paperformat,format:0
 msgid "A0  5   841 x 1189 mm"
 msgstr "A0 5 841 x 1189 мм"
@@ -6432,28 +6525,28 @@ msgid "A9  13  37 x 52 mm"
 msgstr "A9 13 37 x 52 мм"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_title_shortcut
+#: model:ir.model.fields,field_description:base.field_res_partner_title__shortcut
 msgid "Abbreviation"
 msgstr "Аббревиатура"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_acc_type
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__acc_type
 msgid "Acc Type"
 msgstr "Тип счёта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_user_ids
+#: model:ir.model.fields,field_description:base.field_res_company__user_ids
 msgid "Accepted Users"
 msgstr "Акцептованные пользователи"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_ids
+#: model:ir.model.fields,field_description:base.field_ir_model__access_ids
 #: model:ir.ui.view,arch_db:base.ir_access_view_form
 msgid "Access"
 msgstr "Доступ"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_model_access
+#: model:ir.model.fields,field_description:base.field_res_groups__model_access
 msgid "Access Controls"
 msgstr "Управление доступом"
 
@@ -6463,7 +6556,7 @@ msgid "Access Groups"
 msgstr "Группы доступа"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_menu_access
+#: model:ir.model.fields,field_description:base.field_res_groups__menu_access
 msgid "Access Menu"
 msgstr "Меню доступа"
 
@@ -6486,7 +6579,7 @@ msgid "Access Rights"
 msgstr "Права доступа"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_access_token
+#: model:ir.model.fields,field_description:base.field_ir_attachment__access_token
 msgid "Access Token"
 msgstr "Токен доступа"
 
@@ -6511,17 +6604,17 @@ msgid "Account Extension"
 msgstr "Расширение счета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_partner_id
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__partner_id
 msgid "Account Holder"
 msgstr "Владелец счета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_account_no
+#: model:ir.model.fields,field_description:base.field_res_company__account_no
 msgid "Account No."
 msgstr "Счет номер"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_acc_number
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__acc_number
 msgid "Account Number"
 msgstr "Номер счёта"
 
@@ -6633,10 +6726,10 @@ msgstr ""
 #: selection:ir.actions.client,binding_type:0
 #: selection:ir.actions.report,binding_type:0
 #: selection:ir.actions.server,binding_type:0
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_act_window_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_action_id
-#: model:ir.model.fields,field_description:base.field_ir_filters_action_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_action
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__act_window_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__action_id
+#: model:ir.model.fields,field_description:base.field_ir_filters__action_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__action
 #: model:ir.ui.view,arch_db:base.action_view
 #: model:ir.ui.view,arch_db:base.action_view_search
 #: model:ir.ui.view,arch_db:base.action_view_tree
@@ -6645,57 +6738,57 @@ msgid "Action"
 msgstr "Действие"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_help
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_help
-#: model:ir.model.fields,field_description:base.field_ir_act_server_help
-#: model:ir.model.fields,field_description:base.field_ir_act_url_help
-#: model:ir.model.fields,field_description:base.field_ir_act_window_help
-#: model:ir.model.fields,field_description:base.field_ir_actions_help
-#: model:ir.model.fields,field_description:base.field_ir_actions_help_274
-#: model:ir.model.fields,field_description:base.field_ir_cron_help
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__help
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__help
+#: model:ir.model.fields,field_description:base.field_ir_cron__help
 msgid "Action Description"
 msgstr "Описание действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_name
-#: model:ir.model.fields,field_description:base.field_ir_act_server_name
-#: model:ir.model.fields,field_description:base.field_ir_act_url_name
-#: model:ir.model.fields,field_description:base.field_ir_act_window_name
-#: model:ir.model.fields,field_description:base.field_ir_cron_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__name
+#: model:ir.model.fields,field_description:base.field_ir_cron__name
 msgid "Action Name"
 msgstr "Название действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_url_target
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__target
 msgid "Action Target"
 msgstr "Цель действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_state
-#: model:ir.model.fields,field_description:base.field_ir_cron_state
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__state
+#: model:ir.model.fields,field_description:base.field_ir_cron__state
 msgid "Action To Do"
 msgstr "Действие для выполнения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_type
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_type
-#: model:ir.model.fields,field_description:base.field_ir_act_server_type
-#: model:ir.model.fields,field_description:base.field_ir_act_url_type
-#: model:ir.model.fields,field_description:base.field_ir_act_window_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_type_271
-#: model:ir.model.fields,field_description:base.field_ir_cron_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__type
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__type
+#: model:ir.model.fields,field_description:base.field_ir_cron__type
 #: model:ir.ui.view,arch_db:base.view_server_action_search
 msgid "Action Type"
 msgstr "Тип действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_url_url
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__url
 msgid "Action URL"
 msgstr "Перейти по адресу"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_usage
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__usage
 msgid "Action Usage"
 msgstr "Использование действия"
 
@@ -6713,21 +6806,21 @@ msgid "Activate more currencies"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_active
-#: model:ir.model.fields,field_description:base.field_ir_filters_active
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_active
-#: model:ir.model.fields,field_description:base.field_ir_model_access_active
-#: model:ir.model.fields,field_description:base.field_ir_rule_active
-#: model:ir.model.fields,field_description:base.field_ir_sequence_active
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_active
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_active
-#: model:ir.model.fields,field_description:base.field_res_bank_active
-#: model:ir.model.fields,field_description:base.field_res_currency_active
-#: model:ir.model.fields,field_description:base.field_res_lang_active
-#: model:ir.model.fields,field_description:base.field_res_partner_active
-#: model:ir.model.fields,field_description:base.field_res_partner_category_active
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_active
-#: model:ir.model.fields,field_description:base.field_res_users_active
+#: model:ir.model.fields,field_description:base.field_ir_cron__active
+#: model:ir.model.fields,field_description:base.field_ir_filters__active
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__active
+#: model:ir.model.fields,field_description:base.field_ir_model_access__active
+#: model:ir.model.fields,field_description:base.field_ir_rule__active
+#: model:ir.model.fields,field_description:base.field_ir_sequence__active
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__active
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__active
+#: model:ir.model.fields,field_description:base.field_res_bank__active
+#: model:ir.model.fields,field_description:base.field_res_currency__active
+#: model:ir.model.fields,field_description:base.field_res_lang__active
+#: model:ir.model.fields,field_description:base.field_res_partner__active
+#: model:ir.model.fields,field_description:base.field_res_partner_category__active
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__active
+#: model:ir.model.fields,field_description:base.field_res_users__active
 #: model:ir.ui.view,arch_db:base.res_lang_search
 #: model:ir.ui.view,arch_db:base.view_currency_search
 #: model:ir.ui.view,arch_db:base.view_view_search
@@ -6735,6 +6828,12 @@ msgid "Active"
 msgstr "Активно"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_sequence__number_next_actual
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__number_next_actual
+msgid "Actual Next Number"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_website_sale_delivery
 msgid "Add Delivery Costs to Online Sales"
 msgstr "Добавить стоимость доставки к онлайн продажам"
@@ -6789,8 +6888,8 @@ msgid "Address"
 msgstr "Адрес"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_type
-#: model:ir.model.fields,field_description:base.field_res_users_type
+#: model:ir.model.fields,field_description:base.field_res_partner__type
+#: model:ir.model.fields,field_description:base.field_res_users__type
 msgid "Address Type"
 msgstr "Тип адреса"
 
@@ -6945,7 +7044,7 @@ msgid "Administrative"
 msgstr "Административный"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_state_name
+#: model:ir.model.fields,help:base.field_res_country_state__name
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
@@ -6953,9 +7052,9 @@ msgstr ""
 "область"
 
 #. module: base
-#: code:addons/base/models/ir_model.py:908
-#: code:addons/base/models/ir_model.py:1020
-#: code:addons/base/models/ir_model.py:1518
+#: code:addons/base/models/ir_model.py:912
+#: code:addons/base/models/ir_model.py:1024
+#: code:addons/base/models/ir_model.py:1522
 #, python-format
 msgid "Administrator access is required to uninstall a module"
 msgstr "Для удаления модуля нужны права администратора"
@@ -7024,6 +7123,16 @@ msgid "All"
 msgstr "Все"
 
 #. module: base
+#: code:addons/base/wizard/base_partner_merge.py:273
+#, python-format
+msgid ""
+"All contacts must have the same email. Only the Administrator can merge "
+"contacts with different emails."
+msgstr ""
+"Все договоры должны иметь одинаковую электронную почту. Только администратор"
+" может объединить договоры с разными адресами."
+
+#. module: base
 #: model:ir.module.module,summary:base.module_pos_reprint
 msgid "Allow cashier to reprint receipts"
 msgstr "Разрешать кассиру перепечатывать квитанции"
@@ -7104,7 +7213,7 @@ msgid "American Samoa"
 msgstr "Американское Самоа"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_tag
+#: model:ir.model.fields,help:base.field_ir_actions_client__tag
 msgid ""
 "An arbitrary string, interpreted by the client according to its own needs "
 "and wishes. There is no central tag repository across clients."
@@ -7113,7 +7222,7 @@ msgstr ""
 "нуждам и желаниям. Нет централизованного хранилища тегов по клиентам."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_module_module_auto_install
+#: model:ir.model.fields,help:base.field_ir_module_module__auto_install
 msgid ""
 "An auto-installable module is automatically installed by the system when all"
 " its dependencies are satisfied. If the module has no dependency, it is "
@@ -7129,6 +7238,11 @@ msgid "Analytic Accounting"
 msgstr "Аналитический учёт"
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_enterprise
+msgid "Analytic Accounting Enterprise"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_mrp_account
 msgid "Analytic accounting in Manufacturing"
 msgstr "Аналитический учёт в Производстве"
@@ -7165,7 +7279,7 @@ msgid "App Store"
 msgstr "Магазин приложений"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_report_header
+#: model:ir.model.fields,help:base.field_res_company__report_header
 msgid ""
 "Appears by default on the top right corner of your printed documents (report"
 " header)."
@@ -7175,13 +7289,13 @@ msgstr ""
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
-#: model:ir.model.fields,field_description:base.field_ir_module_module_application
-#: model:ir.model.fields,field_description:base.field_res_groups_category_id
+#: model:ir.model.fields,field_description:base.field_ir_module_module__application
+#: model:ir.model.fields,field_description:base.field_res_groups__category_id
 msgid "Application"
 msgstr "Приложение"
 
 #. module: base
-#: code:addons/base/models/res_users.py:720
+#: code:addons/base/models/res_users.py:759
 #: model:ir.ui.view,arch_db:base.user_groups_view
 #, python-format
 msgid "Application Accesses"
@@ -7198,7 +7312,7 @@ msgid "Apply"
 msgstr "Применить "
 
 #. module: base
-#: code:addons/base/models/ir_module.py:631
+#: code:addons/base/models/ir_module.py:633
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade_install
 #, python-format
@@ -7211,22 +7325,22 @@ msgid "Apply Scheduled Upgrades"
 msgstr "Выполнить обновления"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_rule_perm_create
+#: model:ir.model.fields,field_description:base.field_ir_rule__perm_create
 msgid "Apply for Create"
 msgstr "Применить для создания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_rule_perm_unlink
+#: model:ir.model.fields,field_description:base.field_ir_rule__perm_unlink
 msgid "Apply for Delete"
 msgstr "Применить для удаления"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_rule_perm_read
+#: model:ir.model.fields,field_description:base.field_ir_rule__perm_read
 msgid "Apply for Read"
 msgstr "Применить для чтения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_rule_perm_write
+#: model:ir.model.fields,field_description:base.field_ir_rule__perm_write
 msgid "Apply for Write"
 msgstr "Применить для записи"
 
@@ -7250,12 +7364,12 @@ msgid "Apps"
 msgstr "Приложения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_modules
+#: model:ir.model.fields,field_description:base.field_base_language_export__modules
 msgid "Apps To Export"
 msgstr "Приложения для экспорта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_module_info
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__module_info
 msgid "Apps to Update"
 msgstr "Программы для обновления"
 
@@ -7265,12 +7379,12 @@ msgid "Apps:"
 msgstr "Приложения:"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_arch_db
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_db
 msgid "Arch Blob"
 msgstr "Архив Blob"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_arch_fs
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_fs
 msgid "Arch Filename"
 msgstr "Имя файла архива"
 
@@ -7285,6 +7399,19 @@ msgid "Archived"
 msgstr "Архивировано"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Are you sure to execute the automatic merge of your contacts ?"
+msgstr ""
+"Вы уверены, что хотите выполнить автоматическое слияние ваших контактов?"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid ""
+"Are you sure to execute the list of automatic merges of your contacts ?"
+msgstr ""
+"Вы уверенны, что хотите выполнить автоматическое объединение контактов?"
+
+#. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
 msgstr "Аргентина"
@@ -7300,9 +7427,9 @@ msgid "Argentina - Accounting Reports"
 msgstr "Аргентина- Бухгалтерские Отчёты"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_params
-msgid "Arguments sent to the client along withthe view tag"
-msgstr "Аргументы, отправленные клиенту вместе с тегом вида"
+#: model:ir.model.fields,help:base.field_ir_actions_client__params
+msgid "Arguments sent to the client along with the view tag"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.am
@@ -7320,7 +7447,7 @@ msgid "Assets Management"
 msgstr "Управление активами"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_report_ids
+#: model:ir.model.fields,field_description:base.field_report_paperformat__report_ids
 msgid "Associated reports"
 msgstr "Связанные отчеты"
 
@@ -7335,7 +7462,7 @@ msgid "Associations: Members"
 msgstr "Ассоциации:Члены"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:53
+#: code:addons/base/models/res_lang.py:60
 #, python-format
 msgid "At least one language must be active."
 msgstr "По крайней мере один язык должен быть активным."
@@ -7356,7 +7483,7 @@ msgid "Attachment"
 msgstr "Приложение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_name
+#: model:ir.model.fields,field_description:base.field_ir_attachment__name
 msgid "Attachment Name"
 msgstr "Название вложения"
 
@@ -7416,7 +7543,7 @@ msgid "Authentication via LDAP"
 msgstr "Авторизация с помощью LDAP"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_author
+#: model:ir.model.fields,field_description:base.field_ir_module_module__author
 #: model:ir.ui.view,arch_db:base.view_module_filter
 msgid "Author"
 msgstr "Автор"
@@ -7433,7 +7560,7 @@ msgid "Authorize.Net Payment Acquirer"
 msgstr "Authorize.Net платежная система покупателей"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_auto_search
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__auto_search
 msgid "Auto Search"
 msgstr "Авто поиск"
 
@@ -7458,19 +7585,24 @@ msgid "Automated Translations through Gengo API"
 msgstr "Авто переводы через Gengo  API"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_auto_install
+#: model:ir.model.fields,field_description:base.field_ir_module_module__auto_install
 msgid "Automatic Installation"
 msgstr "Автоматическая установка"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:728
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Automatic Merge Wizard"
+msgstr "Мастер автоматических слияний"
+
+#. module: base
+#: code:addons/base/models/ir_module.py:730
 #, python-format
 msgid "Automatic install of downloaded Apps is currently disabled."
 msgstr ""
 "В настоящее время автоматическая установка загруженных приложений отключена."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_translation_state
+#: model:ir.model.fields,help:base.field_ir_translation__state
 msgid ""
 "Automatically set to let administators find new terms that might need to be "
 "translated"
@@ -7576,7 +7708,7 @@ msgstr "Бангладеш"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_bank_id
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__bank_id
 #: model:ir.ui.view,arch_db:base.view_res_bank_form
 msgid "Bank"
 msgstr "Банк"
@@ -7584,15 +7716,15 @@ msgstr "Банк"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
 #: model:ir.model,name:base.model_res_partner_bank
-#: model:ir.model.fields,field_description:base.field_res_company_bank_ids
+#: model:ir.model.fields,field_description:base.field_res_company__bank_ids
 #: model:ir.ui.view,arch_db:base.view_partner_bank_search
 #: model:ir.ui.view,arch_db:base.view_partner_bank_tree
 msgid "Bank Accounts"
 msgstr "Банковские счета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_bic
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_bank_bic
+#: model:ir.model.fields,field_description:base.field_res_bank__bic
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__bank_bic
 msgid "Bank Identifier Code"
 msgstr "БИК"
 
@@ -7607,19 +7739,19 @@ msgid "Bank account"
 msgstr "Банковский счёт"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_bank_acc_type
+#: model:ir.model.fields,help:base.field_res_partner_bank__acc_type
 msgid "Bank account type, inferred from account number"
 msgstr "Тип банковского счета, выведенный из номера счета"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_bank_ids
+#: model:ir.model.fields,help:base.field_res_company__bank_ids
 msgid "Bank accounts related to this company"
 msgstr "Банковские счета , связанные с этой компанией"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_bank_form
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_ids
-#: model:ir.model.fields,field_description:base.field_res_users_bank_ids
+#: model:ir.model.fields,field_description:base.field_res_partner__bank_ids
+#: model:ir.model.fields,field_description:base.field_res_users__bank_ids
 #: model:ir.ui.view,arch_db:base.view_res_bank_tree
 msgid "Banks"
 msgstr "Банки"
@@ -7630,8 +7762,8 @@ msgid "Barbados"
 msgstr "Барбадос"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_barcode
-#: model:ir.model.fields,field_description:base.field_res_users_barcode
+#: model:ir.model.fields,field_description:base.field_res_partner__barcode
+#: model:ir.model.fields,field_description:base.field_res_users__barcode
 msgid "Barcode"
 msgstr "Штрих-код"
 
@@ -7664,7 +7796,7 @@ msgid "Base Field"
 msgstr "Базовое поле"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:233
+#: code:addons/base/models/res_lang.py:240
 #, python-format
 msgid "Base Language 'en_US' can not be deleted!"
 msgstr "Основной язык 'en_US' не может быть удален!"
@@ -7681,6 +7813,11 @@ msgid "Base Properties"
 msgstr "Основные настройки"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_base
+msgid "Base View Architecture"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_base_import
 msgid "Base import"
 msgstr "Базовый импорт"
@@ -7708,16 +7845,16 @@ msgid "Base: Auto-vacuum internal data"
 msgstr "Base: авто-очистка внутренних данных"
 
 #. module: base
-#: model:ir.actions.server,name:base.action_server_module_immediate_install
-msgid "Base: Module Immediate Install"
-msgstr "Base: немедленная установка модулей"
-
-#. module: base
 #: model:ir.module.module,summary:base.module_web_grid
 msgid "Basic 2D Grid view for odoo"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_quality
+msgid "Basic Feature for Quality"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,summary:base.module_iap
 msgid "Basic models and helpers to support In-App purchases."
 msgstr ""
@@ -7738,7 +7875,7 @@ msgid "Before Amount"
 msgstr "Перед суммой"
 
 #. module: base
-#: code:addons/base/models/res_users.py:954
+#: code:addons/base/models/res_users.py:997
 #, python-format
 msgid ""
 "Before clicking on 'Change Password', you have to write a new password."
@@ -7831,26 +7968,26 @@ msgid "Binary"
 msgstr "Двоичный"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_server_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_url_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_binding_model_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_binding_model_id_275
-#: model:ir.model.fields,field_description:base.field_ir_cron_binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__binding_model_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__binding_model_id
 msgid "Binding Model"
 msgstr "Связанная модель"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_act_server_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_act_url_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_act_window_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_binding_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_binding_type_276
-#: model:ir.model.fields,field_description:base.field_ir_cron_binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__binding_type
+#: model:ir.model.fields,field_description:base.field_ir_cron__binding_type
 msgid "Binding Type"
 msgstr "Связанный Тип"
 
@@ -7905,7 +8042,7 @@ msgid "Botswana"
 msgstr "Ботсвана"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_bottom
+#: model:ir.model.fields,field_description:base.field_report_paperformat__margin_bottom
 msgid "Bottom Margin (mm)"
 msgstr "Нижнее поле (мм)"
 
@@ -8044,8 +8181,8 @@ msgstr "Календарь"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_calendar_sms
-msgid "Calendar SMS"
-msgstr "SMS-оповещения"
+msgid "Calendar - SMS"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.kh
@@ -8067,7 +8204,7 @@ msgstr ""
 "каждую отдельно"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:614
+#: code:addons/base/models/ir_module.py:616
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
 msgstr "Невозможно обновить модуль '%s'. Он не установлен."
@@ -8089,6 +8226,12 @@ msgid "Canada - Accounting"
 msgstr "Канада - отчеты"
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ca_check_printing
+msgid "Canadian Checks Layout"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
 #: model:ir.ui.view,arch_db:base.change_password_wizard_view
 #: model:ir.ui.view,arch_db:base.res_config_view_base
 #: model:ir.ui.view,arch_db:base.view_base_import_language
@@ -8126,7 +8269,7 @@ msgid "Cancel Upgrade"
 msgstr "Отмена обновления"
 
 #. module: base
-#: code:addons/base/models/res_config.py:382
+#: code:addons/base/models/res_config.py:385
 #, python-format
 msgid "Cannot duplicate configuration!"
 msgstr "Не могут дублировать конфигурацию !"
@@ -8140,7 +8283,7 @@ msgstr ""
 "представлениях:"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:221
+#: code:addons/base/models/res_lang.py:228
 #, python-format
 msgid "Cannot unactivate a language that is currently used by users."
 msgstr ""
@@ -8157,7 +8300,7 @@ msgid "Cascade"
 msgstr "Каскадом"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_category_id
+#: model:ir.model.fields,field_description:base.field_ir_module_module__category_id
 #: model:ir.ui.view,arch_db:base.view_module_filter
 msgid "Category"
 msgstr "Категория"
@@ -8209,7 +8352,7 @@ msgid "Change the way addresses are displayed in reports"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_partner.py:338
+#: code:addons/base/models/res_partner.py:337
 #, python-format
 msgid ""
 "Changing the company of a contact should only be done if it was never "
@@ -8249,6 +8392,11 @@ msgid "Chat With Your Website Visitors"
 msgstr "Общайтесь с посетителями вашего веб-сайта"
 
 #. module: base
+#: model:ir.module.category,name:base.module_category_localization_check_printing
+msgid "Check Printing"
+msgstr "Проверьте печать"
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_printing
 msgid "Check Printing Base"
 msgstr "Проверить базу печати"
@@ -8259,8 +8407,8 @@ msgid "Check Printing in Expenses"
 msgstr "Печать чеков в Расходах"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_is_company
-#: model:ir.model.fields,help:base.field_res_users_is_company
+#: model:ir.model.fields,help:base.field_res_partner__is_company
+#: model:ir.model.fields,help:base.field_res_users__is_company
 msgid "Check if the contact is a company, otherwise it is a person"
 msgstr "Отметьте, если это компания, иначе частное лицо"
 
@@ -8270,14 +8418,14 @@ msgid "Check printing commons"
 msgstr "Проверка общих ресурсов печати"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_customer
-#: model:ir.model.fields,help:base.field_res_users_customer
+#: model:ir.model.fields,help:base.field_res_partner__customer
+#: model:ir.model.fields,help:base.field_res_users__customer
 msgid "Check this box if this contact is a customer."
 msgstr "Установите этот флажок, если этот контакт является клиентом."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_supplier
-#: model:ir.model.fields,help:base.field_res_users_supplier
+#: model:ir.model.fields,help:base.field_res_partner__supplier
+#: model:ir.model.fields,help:base.field_res_users__supplier
 msgid ""
 "Check this box if this contact is a vendor. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
@@ -8287,50 +8435,50 @@ msgstr ""
 "покупку."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_employee
-#: model:ir.model.fields,help:base.field_res_users_employee
+#: model:ir.model.fields,help:base.field_res_partner__employee
+#: model:ir.model.fields,help:base.field_res_users__employee
 msgid "Check this box if this contact is an Employee."
 msgstr "Выберите эту опцию, если этот контакт - сотрудник ."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_checksum
+#: model:ir.model.fields,field_description:base.field_ir_attachment__checksum
 msgid "Checksum/SHA1"
 msgstr "Контрольная сумма/SHA1"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_child_ids
-#: model:ir.model.fields,field_description:base.field_ir_cron_child_ids
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__child_ids
+#: model:ir.model.fields,field_description:base.field_ir_cron__child_ids
 msgid "Child Actions"
 msgstr "Подчиненные действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_child_ids
+#: model:ir.model.fields,field_description:base.field_ir_module_category__child_ids
 msgid "Child Applications"
 msgstr "Дочерние приложения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_child_ids
+#: model:ir.model.fields,field_description:base.field_res_company__child_ids
 msgid "Child Companies"
 msgstr "Дочерние компании"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_field_parent
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__field_parent
 msgid "Child Field"
 msgstr "Подчиненной поле"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_child_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__child_id
 msgid "Child IDs"
 msgstr "Подчиненные идентификаторы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_child_ids
+#: model:ir.model.fields,field_description:base.field_res_partner_category__child_ids
 msgid "Child Tags"
 msgstr "Дочерные теги"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_child_ids
-#: model:ir.model.fields,help:base.field_ir_cron_child_ids
+#: model:ir.model.fields,help:base.field_ir_actions_server__child_ids
+#: model:ir.model.fields,help:base.field_ir_cron__child_ids
 msgid ""
 "Child server actions that will be executed. Note that the last return "
 "returned action value will be used as global return value."
@@ -8360,6 +8508,21 @@ msgid "China"
 msgstr "Китай"
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "China - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn_small_business
+msgid "China - Small Business CoA"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn_standard
+msgid "China - Standard CoA"
+msgstr ""
+
+#. module: base
 #: code:addons/base/models/ir_actions_report.py:683
 #, python-format
 msgid "Choose Your Document Layout"
@@ -8373,7 +8536,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_encryption
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_encryption
 msgid ""
 "Choose the connection encryption scheme:\n"
 "- None: SMTP sessions are done in cleartext.\n"
@@ -8391,10 +8554,10 @@ msgid "Christmas Island"
 msgstr "Остров Рождества"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_city
-#: model:ir.model.fields,field_description:base.field_res_company_city
-#: model:ir.model.fields,field_description:base.field_res_partner_city
-#: model:ir.model.fields,field_description:base.field_res_users_city
+#: model:ir.model.fields,field_description:base.field_res_bank__city
+#: model:ir.model.fields,field_description:base.field_res_company__city
+#: model:ir.model.fields,field_description:base.field_res_partner__city
+#: model:ir.model.fields,field_description:base.field_res_users__city
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
@@ -8414,58 +8577,22 @@ msgid "Clean"
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_ui_view_custom
-msgid "Click here to create a customized view"
-msgstr "Нажмите, чтобы создать новое представление"
-
-#. module: base
-#: model:ir.actions.act_window,help:base.action_attachment
-msgid "Click here to create new documents."
-msgstr "Нажмите для создания нового документа"
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_base_module_update
 msgid "Click on Update below to start the process..."
 msgstr "Нажмите 'Обновить' для запуска процесса..."
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_customer_form
-#: model:ir.actions.act_window,help:base.action_partner_form
-#: model:ir.actions.act_window,help:base.action_partner_supplier_form
-msgid "Click to add a contact in your address book."
-msgstr "Кликните, чтобы добавить контакт в Вашу адресную книгу"
-
-#. module: base
-#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
-msgid "Click to create a bank account."
-msgstr "Нажмите, чтобы создать банковский счет."
-
-#. module: base
-#: model:ir.actions.act_window,help:base.action_res_bank_form
-msgid "Click to create a new bank."
-msgstr "Нажмите, чтобы создать новый банк."
-
-#. module: base
-#: model:ir.actions.act_window,help:base.res_partner_industry_action
-msgid "Click to create a new industry."
-msgstr ""
-
-#. module: base
-#: model:ir.actions.act_window,help:base.action_partner_category_form
-msgid "Click to create a new partner tag."
-msgstr "Нажмите, чтобы создать новый тег партнера"
-
-#. module: base
 #: selection:ir.logging,type:0
 msgid "Client"
 msgstr "Клиент"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_tag
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__tag
 msgid "Client action tag"
 msgstr "Тег действия клиента"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
 #: model:ir.ui.view,arch_db:base.view_base_language_install
 #: model:ir.ui.view,arch_db:base.view_base_module_update
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
@@ -8484,7 +8611,7 @@ msgid "Code"
 msgstr "Код"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_compute
+#: model:ir.model.fields,help:base.field_ir_model_fields__compute
 msgid ""
 "Code to compute the value of the field.\n"
 "Iterate on the recordset 'self' and assign the field's value:\n"
@@ -8533,30 +8660,30 @@ msgid "Colombian Accounting and Tax Preconfiguration"
 msgstr "Предварительная настройка учета и налогов в Колумбии"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_color
-#: model:ir.model.fields,field_description:base.field_res_partner_category_color
-#: model:ir.model.fields,field_description:base.field_res_partner_color
-#: model:ir.model.fields,field_description:base.field_res_users_color
+#: model:ir.model.fields,field_description:base.field_res_groups__color
+#: model:ir.model.fields,field_description:base.field_res_partner__color
+#: model:ir.model.fields,field_description:base.field_res_partner_category__color
+#: model:ir.model.fields,field_description:base.field_res_users__color
 msgid "Color Index"
 msgstr "Цветовая палитра"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_column1
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__column1
 msgid "Column 1"
 msgstr "Колонка 1"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_column2
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__column2
 msgid "Column 2"
 msgstr "Колонка 2"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_column2
+#: model:ir.model.fields,help:base.field_ir_model_fields__column2
 msgid "Column referring to the record in the comodel table"
 msgstr "Столбец, ссылающийся на запись в таблице комодели"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_column1
+#: model:ir.model.fields,help:base.field_ir_model_fields__column1
 msgid "Column referring to the record in the model table"
 msgstr "Столбец, ссылающийся на запись в таблице модели"
 
@@ -8566,7 +8693,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr "Comm10E 25  105 x 241 мм, 10 общих наклеек США"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_view_mode
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__view_mode
 msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
@@ -8575,7 +8702,7 @@ msgstr ""
 "«форма», «дерево», «календарь» и т.д. (По умолчанию: дерево, форма)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_comment
+#: model:ir.model.fields,field_description:base.field_res_groups__comment
 msgid "Comment"
 msgstr "Комментарий"
 
@@ -8585,8 +8712,8 @@ msgid "Comments"
 msgstr "Комментарии"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_commercial_partner_id
-#: model:ir.model.fields,field_description:base.field_res_users_commercial_partner_id
+#: model:ir.model.fields,field_description:base.field_res_partner__commercial_partner_id
+#: model:ir.model.fields,field_description:base.field_res_users__commercial_partner_id
 msgid "Commercial Entity"
 msgstr "Коммерческая организация"
 
@@ -8609,7 +8736,7 @@ msgstr "Коморские Острова"
 #: model:ir.actions.act_window,name:base.action_res_company_form
 #: model:ir.actions.act_window,name:base.company_normal_action_tree
 #: model:ir.model,name:base.model_res_company
-#: model:ir.model.fields,field_description:base.field_res_users_company_ids
+#: model:ir.model.fields,field_description:base.field_res_users__company_ids
 #: model:ir.ui.menu,name:base.menu_action_res_company_form
 #: model:ir.ui.view,arch_db:base.view_company_tree
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
@@ -8622,14 +8749,14 @@ msgid "Companies count"
 msgstr "Количество компаний"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_company_id
-#: model:ir.model.fields,field_description:base.field_ir_default_company_id
-#: model:ir.model.fields,field_description:base.field_ir_property_company_id
-#: model:ir.model.fields,field_description:base.field_ir_sequence_company_id
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_company_id
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_company_id
-#: model:ir.model.fields,field_description:base.field_res_partner_company_id
-#: model:ir.model.fields,field_description:base.field_res_users_company_id
+#: model:ir.model.fields,field_description:base.field_ir_attachment__company_id
+#: model:ir.model.fields,field_description:base.field_ir_default__company_id
+#: model:ir.model.fields,field_description:base.field_ir_property__company_id
+#: model:ir.model.fields,field_description:base.field_ir_sequence__company_id
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__company_id
+#: model:ir.model.fields,field_description:base.field_res_partner__company_id
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__company_id
+#: model:ir.model.fields,field_description:base.field_res_users__company_id
 #: model:ir.ui.view,arch_db:base.ir_default_search_view
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 #: model:ir.ui.view,arch_db:base.view_company_form
@@ -8643,20 +8770,20 @@ msgid "Company"
 msgstr "Компания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_logo
+#: model:ir.model.fields,field_description:base.field_res_company__logo
 msgid "Company Logo"
 msgstr "Логотип компании"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_name
-#: model:ir.model.fields,field_description:base.field_res_partner_company_name
-#: model:ir.model.fields,field_description:base.field_res_users_company_name
+#: model:ir.model.fields,field_description:base.field_res_company__name
+#: model:ir.model.fields,field_description:base.field_res_partner__company_name
+#: model:ir.model.fields,field_description:base.field_res_users__company_name
 msgid "Company Name"
 msgstr "Название компании"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_commercial_company_name
-#: model:ir.model.fields,field_description:base.field_res_users_commercial_company_name
+#: model:ir.model.fields,field_description:base.field_res_partner__commercial_company_name
+#: model:ir.model.fields,field_description:base.field_res_users__commercial_company_name
 msgid "Company Name Entity"
 msgstr "Сущность имени компании"
 
@@ -8667,18 +8794,18 @@ msgid "Company Properties"
 msgstr "Собственность компании"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_company_registry
+#: model:ir.model.fields,field_description:base.field_res_company__company_registry
 msgid "Company Registry"
 msgstr "ОГРН"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_report_header
+#: model:ir.model.fields,field_description:base.field_res_company__report_header
 msgid "Company Tagline"
 msgstr "Девиз компании"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_company_type
-#: model:ir.model.fields,field_description:base.field_res_users_company_type
+#: model:ir.model.fields,field_description:base.field_res_partner__company_type
+#: model:ir.model.fields,field_description:base.field_res_users__company_type
 msgid "Company Type"
 msgstr "Тип компании"
 
@@ -8688,23 +8815,23 @@ msgid "Compare timesheets and forecast for your projects"
 msgstr "Сравнить расписания и прогнозы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_contact_address
-#: model:ir.model.fields,field_description:base.field_res_users_contact_address
+#: model:ir.model.fields,field_description:base.field_res_partner__contact_address
+#: model:ir.model.fields,field_description:base.field_res_users__contact_address
 msgid "Complete Address"
 msgstr "Полный адрес"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_complete_name
+#: model:ir.model.fields,field_description:base.field_ir_model_data__complete_name
 msgid "Complete ID"
 msgstr "Полный ID"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_complete_name
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__complete_name
 msgid "Complete Name"
 msgstr "Полное название"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_compute
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__compute
 msgid "Compute"
 msgstr "Вычислить"
 
@@ -8727,7 +8854,7 @@ msgstr ""
 "                                     <Strong>Зависимости</strong> и <strong>Вычисление</strong>."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_default_condition
+#: model:ir.model.fields,field_description:base.field_ir_default__condition
 msgid "Condition"
 msgstr "Условие"
 
@@ -8787,7 +8914,7 @@ msgid "Connection Information"
 msgstr "Сведения о соединении"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_encryption
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_encryption
 msgid "Connection Security"
 msgstr "Безопасность Соединения"
 
@@ -8808,13 +8935,13 @@ msgid "Connection Test Succeeded! Everything seems properly set up!"
 msgstr "Успешное подключение! Все кажется правильно настроенным!"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_name
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__name
 #: selection:ir.translation,type:0
 msgid "Constraint"
 msgstr "Ограничение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_type
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__type
 msgid "Constraint Type"
 msgstr "Тип ограничения"
 
@@ -8878,8 +9005,9 @@ msgid "Contact Titles"
 msgstr "Обращение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_child_ids
-#: model:ir.model.fields,field_description:base.field_res_users_child_ids
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__partner_ids
+#: model:ir.model.fields,field_description:base.field_res_partner__child_ids
+#: model:ir.model.fields,field_description:base.field_res_users__child_ids
 #: model:ir.ui.view,arch_db:base.view_partner_tree
 msgid "Contacts"
 msgstr "Контакты"
@@ -8900,19 +9028,19 @@ msgid "Contacts require a name."
 msgstr "Требуется имя контакта."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_filters_context
+#: model:ir.model.fields,field_description:base.field_ir_filters__context
 msgid "Context"
 msgstr "Контекст"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_context
-#: model:ir.model.fields,field_description:base.field_ir_act_window_context
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__context
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__context
 msgid "Context Value"
 msgstr "Значение контекста"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_context
-#: model:ir.model.fields,help:base.field_ir_act_window_context
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__context
+#: model:ir.model.fields,help:base.field_ir_actions_client__context
 msgid ""
 "Context dictionary as Python expression, empty by default (Default: {})"
 msgstr ""
@@ -8920,7 +9048,7 @@ msgstr ""
 "умолчанию: {})"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_contributors
+#: model:ir.model.fields,field_description:base.field_ir_module_module__contributors
 msgid "Contributors"
 msgstr "Участники"
 
@@ -8930,11 +9058,16 @@ msgid "Cook Islands"
 msgstr "Острова Кука"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_copy
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__copy
 msgid "Copied"
 msgstr "Скопированный"
 
 #. module: base
+#: model:ir.module.category,name:base.module_category_theme_corporate
+msgid "Corporate"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.cr
 msgid "Costa Rica"
 msgstr "Коста-Рика"
@@ -8945,31 +9078,29 @@ msgid "Costa Rica - Accounting"
 msgstr "Коста Рика - Учет"
 
 #. module: base
-#: code:addons/base/models/res_partner.py:622
+#: code:addons/base/models/res_partner.py:621
 #, python-format
 msgid "Couldn't create contact without email address!"
 msgstr "Невозможно создать контакт без адреса электронной почты!"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_count
+#: model:ir.model.fields,field_description:base.field_ir_model__count
 msgid "Count (incl. archived)"
 msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
-#: model:ir.model.fields,field_description:base.field_res_country_group_country_ids
+#: model:ir.model.fields,field_description:base.field_res_country_group__country_ids
 msgid "Countries"
 msgstr "Страны"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
-#: model:ir.model.fields,field_description:base.field_res_bank_country
-#: model:ir.model.fields,field_description:base.field_res_company_country_id
-#: model:ir.model.fields,field_description:base.field_res_country_state_country_id
-#: model:ir.model.fields,field_description:base.field_res_partner_commercial_partner_country_id
-#: model:ir.model.fields,field_description:base.field_res_partner_country_id
-#: model:ir.model.fields,field_description:base.field_res_users_commercial_partner_country_id
-#: model:ir.model.fields,field_description:base.field_res_users_country_id
+#: model:ir.model.fields,field_description:base.field_res_bank__country
+#: model:ir.model.fields,field_description:base.field_res_company__country_id
+#: model:ir.model.fields,field_description:base.field_res_country_state__country_id
+#: model:ir.model.fields,field_description:base.field_res_partner__country_id
+#: model:ir.model.fields,field_description:base.field_res_users__country_id
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_country_tree
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
@@ -8981,12 +9112,12 @@ msgid "Country"
 msgstr "Страна"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_phone_code
+#: model:ir.model.fields,field_description:base.field_res_country__phone_code
 msgid "Country Calling Code"
 msgstr "Телефонный код страны"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_code
+#: model:ir.model.fields,field_description:base.field_res_country__code
 msgid "Country Code"
 msgstr "Код страны"
 
@@ -8999,12 +9130,12 @@ msgid "Country Group"
 msgstr "Группа страны"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_country_group_ids
+#: model:ir.model.fields,field_description:base.field_res_country__country_group_ids
 msgid "Country Groups"
 msgstr "Группы стран"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_name
+#: model:ir.model.fields,field_description:base.field_res_country__name
 msgid "Country Name"
 msgstr "Название страны"
 
@@ -9014,7 +9145,7 @@ msgid "Country state"
 msgstr "Область"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_perm_create
+#: model:ir.model.fields,field_description:base.field_ir_model_access__perm_create
 msgid "Create Access"
 msgstr "Доступ на создание"
 
@@ -9029,8 +9160,8 @@ msgid "Create Contextual Action"
 msgstr "Создать контекстное действие"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_create_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_create_date
+#: model:ir.model.fields,field_description:base.field_ir_logging__create_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__create_date
 msgid "Create Date"
 msgstr "Дата создания"
 
@@ -9066,11 +9197,57 @@ msgid "Create a Menu"
 msgstr "Создать меню"
 
 #. module: base
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid "Create a bank account"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view_custom
+msgid "Create a customized view"
+msgstr ""
+
+#. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create a new Record"
 msgstr "Создать новую Запись"
 
 #. module: base
+#: model:ir.actions.act_window,help:base.action_res_bank_form
+msgid "Create a new bank"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_company_form
+msgid "Create a new company"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid "Create a new contact tag"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid "Create a new customer in your address book"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_attachment
+msgid "Create a new document"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.res_partner_industry_action
+msgid "Create a new industry"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid "Create a new vendor in your address book"
+msgstr ""
+
+#. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
 msgid ""
 "Create and manage the companies that will be managed by Odoo from here. "
@@ -9119,8 +9296,8 @@ msgid "Create your custom dashboard"
 msgstr "Создать собственную панель"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_crud_model_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_crud_model_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__crud_model_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__crud_model_id
 msgid "Create/Write Target Model"
 msgstr "Создать/Написать целевую модель"
 
@@ -9135,137 +9312,141 @@ msgid "Created Views"
 msgstr "Созданные представления"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_create_uid
-#: model:ir.model.fields,field_description:base.field_base_language_import_create_uid
-#: model:ir.model.fields,field_description:base.field_base_language_install_create_uid
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_create_uid
-#: model:ir.model.fields,field_description:base.field_base_module_update_create_uid
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_create_uid
-#: model:ir.model.fields,field_description:base.field_base_update_translations_create_uid
-#: model:ir.model.fields,field_description:base.field_change_password_user_create_uid
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_client_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_server_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_url_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_window_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_279
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_cron_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_default_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_exports_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_filters_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_access_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_data_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_category_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_property_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_rule_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_sequence_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_create_uid
-#: model:ir.model.fields,field_description:base.field_report_paperformat_create_uid
-#: model:ir.model.fields,field_description:base.field_res_bank_create_uid
-#: model:ir.model.fields,field_description:base.field_res_company_create_uid
-#: model:ir.model.fields,field_description:base.field_res_config_create_uid
-#: model:ir.model.fields,field_description:base.field_res_config_installer_create_uid
-#: model:ir.model.fields,field_description:base.field_res_config_settings_create_uid
-#: model:ir.model.fields,field_description:base.field_res_country_create_uid
-#: model:ir.model.fields,field_description:base.field_res_country_group_create_uid
-#: model:ir.model.fields,field_description:base.field_res_country_state_create_uid
-#: model:ir.model.fields,field_description:base.field_res_currency_create_uid
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_create_uid
-#: model:ir.model.fields,field_description:base.field_res_groups_create_uid
-#: model:ir.model.fields,field_description:base.field_res_lang_create_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_create_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_category_create_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_create_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_create_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_title_create_uid
-#: model:ir.model.fields,field_description:base.field_res_users_create_uid
-#: model:ir.model.fields,field_description:base.field_res_users_log_create_uid
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_create_uid
+#: model:ir.model.fields,field_description:base.field_base_language_export__create_uid
+#: model:ir.model.fields,field_description:base.field_base_language_import__create_uid
+#: model:ir.model.fields,field_description:base.field_base_language_install__create_uid
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__create_uid
+#: model:ir.model.fields,field_description:base.field_base_module_update__create_uid
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__create_uid
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__create_uid
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__create_uid
+#: model:ir.model.fields,field_description:base.field_base_update_translations__create_uid
+#: model:ir.model.fields,field_description:base.field_change_password_user__create_uid
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_cron__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_default__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_exports__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_filters__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_access__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_data__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_category__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_property__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_rule__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_sequence__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__create_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__create_uid
+#: model:ir.model.fields,field_description:base.field_report_paperformat__create_uid
+#: model:ir.model.fields,field_description:base.field_res_bank__create_uid
+#: model:ir.model.fields,field_description:base.field_res_company__create_uid
+#: model:ir.model.fields,field_description:base.field_res_config__create_uid
+#: model:ir.model.fields,field_description:base.field_res_config_installer__create_uid
+#: model:ir.model.fields,field_description:base.field_res_config_settings__create_uid
+#: model:ir.model.fields,field_description:base.field_res_country__create_uid
+#: model:ir.model.fields,field_description:base.field_res_country_group__create_uid
+#: model:ir.model.fields,field_description:base.field_res_country_state__create_uid
+#: model:ir.model.fields,field_description:base.field_res_currency__create_uid
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__create_uid
+#: model:ir.model.fields,field_description:base.field_res_groups__create_uid
+#: model:ir.model.fields,field_description:base.field_res_lang__create_uid
+#: model:ir.model.fields,field_description:base.field_res_partner__create_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__create_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_category__create_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__create_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_title__create_uid
+#: model:ir.model.fields,field_description:base.field_res_users__create_uid
+#: model:ir.model.fields,field_description:base.field_res_users_log__create_uid
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__create_uid
 msgid "Created by"
 msgstr "Создано"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_create_date
-#: model:ir.model.fields,field_description:base.field_base_language_import_create_date
-#: model:ir.model.fields,field_description:base.field_base_language_install_create_date
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_create_date
-#: model:ir.model.fields,field_description:base.field_base_module_update_create_date
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_create_date
-#: model:ir.model.fields,field_description:base.field_base_update_translations_create_date
-#: model:ir.model.fields,field_description:base.field_change_password_user_create_date
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_client_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_server_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_url_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_window_create_date
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_280
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_date
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_date
-#: model:ir.model.fields,field_description:base.field_ir_cron_create_date
-#: model:ir.model.fields,field_description:base.field_ir_default_create_date
-#: model:ir.model.fields,field_description:base.field_ir_exports_create_date
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_create_date
-#: model:ir.model.fields,field_description:base.field_ir_filters_create_date
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_access_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_data_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_create_date
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_create_date
-#: model:ir.model.fields,field_description:base.field_ir_module_category_create_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_create_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_create_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_create_date
-#: model:ir.model.fields,field_description:base.field_ir_property_create_date
-#: model:ir.model.fields,field_description:base.field_ir_rule_create_date
-#: model:ir.model.fields,field_description:base.field_ir_sequence_create_date
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_create_date
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_create_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_create_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_create_date
-#: model:ir.model.fields,field_description:base.field_report_paperformat_create_date
-#: model:ir.model.fields,field_description:base.field_res_bank_create_date
-#: model:ir.model.fields,field_description:base.field_res_company_create_date
-#: model:ir.model.fields,field_description:base.field_res_config_create_date
-#: model:ir.model.fields,field_description:base.field_res_config_installer_create_date
-#: model:ir.model.fields,field_description:base.field_res_config_settings_create_date
-#: model:ir.model.fields,field_description:base.field_res_country_create_date
-#: model:ir.model.fields,field_description:base.field_res_country_group_create_date
-#: model:ir.model.fields,field_description:base.field_res_country_state_create_date
-#: model:ir.model.fields,field_description:base.field_res_currency_create_date
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_create_date
-#: model:ir.model.fields,field_description:base.field_res_groups_create_date
-#: model:ir.model.fields,field_description:base.field_res_lang_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_category_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_title_create_date
-#: model:ir.model.fields,field_description:base.field_res_users_create_date
-#: model:ir.model.fields,field_description:base.field_res_users_log_create_date
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_create_date
+#: model:ir.model.fields,field_description:base.field_base_language_export__create_date
+#: model:ir.model.fields,field_description:base.field_base_language_import__create_date
+#: model:ir.model.fields,field_description:base.field_base_language_install__create_date
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__create_date
+#: model:ir.model.fields,field_description:base.field_base_module_update__create_date
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__create_date
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__create_date
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__create_date
+#: model:ir.model.fields,field_description:base.field_base_update_translations__create_date
+#: model:ir.model.fields,field_description:base.field_change_password_user__create_date
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__create_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__create_date
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__create_date
+#: model:ir.model.fields,field_description:base.field_ir_cron__create_date
+#: model:ir.model.fields,field_description:base.field_ir_default__create_date
+#: model:ir.model.fields,field_description:base.field_ir_exports__create_date
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__create_date
+#: model:ir.model.fields,field_description:base.field_ir_filters__create_date
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model_access__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model_data__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__create_date
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__create_date
+#: model:ir.model.fields,field_description:base.field_ir_module_category__create_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module__create_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__create_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__create_date
+#: model:ir.model.fields,field_description:base.field_ir_property__create_date
+#: model:ir.model.fields,field_description:base.field_ir_rule__create_date
+#: model:ir.model.fields,field_description:base.field_ir_sequence__create_date
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__create_date
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__create_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__create_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__create_date
+#: model:ir.model.fields,field_description:base.field_report_paperformat__create_date
+#: model:ir.model.fields,field_description:base.field_res_bank__create_date
+#: model:ir.model.fields,field_description:base.field_res_company__create_date
+#: model:ir.model.fields,field_description:base.field_res_config__create_date
+#: model:ir.model.fields,field_description:base.field_res_config_installer__create_date
+#: model:ir.model.fields,field_description:base.field_res_config_settings__create_date
+#: model:ir.model.fields,field_description:base.field_res_country__create_date
+#: model:ir.model.fields,field_description:base.field_res_country_group__create_date
+#: model:ir.model.fields,field_description:base.field_res_country_state__create_date
+#: model:ir.model.fields,field_description:base.field_res_currency__create_date
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__create_date
+#: model:ir.model.fields,field_description:base.field_res_groups__create_date
+#: model:ir.model.fields,field_description:base.field_res_lang__create_date
+#: model:ir.model.fields,field_description:base.field_res_partner__create_date
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__create_date
+#: model:ir.model.fields,field_description:base.field_res_partner_category__create_date
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__create_date
+#: model:ir.model.fields,field_description:base.field_res_partner_title__create_date
+#: model:ir.model.fields,field_description:base.field_res_users__create_date
+#: model:ir.model.fields,field_description:base.field_res_users_log__create_date
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__create_date
 msgid "Created on"
 msgstr "Создан"
 
@@ -9280,8 +9461,8 @@ msgid "Creation Month"
 msgstr "Месяц создания  "
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_credit_limit
-#: model:ir.model.fields,field_description:base.field_res_users_credit_limit
+#: model:ir.model.fields,field_description:base.field_res_partner__credit_limit
+#: model:ir.model.fields,field_description:base.field_res_users__credit_limit
 msgid "Credit Limit"
 msgstr "Кредитный лимит"
 
@@ -9330,18 +9511,18 @@ msgstr "Валюты"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency
-#: model:ir.model.fields,field_description:base.field_res_company_currency_id
-#: model:ir.model.fields,field_description:base.field_res_country_currency_id
-#: model:ir.model.fields,field_description:base.field_res_currency_name
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_currency_id
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_currency_id
+#: model:ir.model.fields,field_description:base.field_res_company__currency_id
+#: model:ir.model.fields,field_description:base.field_res_country__currency_id
+#: model:ir.model.fields,field_description:base.field_res_currency__name
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__currency_id
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__currency_id
 #: model:ir.ui.view,arch_db:base.view_currency_form
 #: model:ir.ui.view,arch_db:base.view_currency_search
 msgid "Currency"
 msgstr "Валюта"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_name
+#: model:ir.model.fields,help:base.field_res_currency__name
 msgid "Currency Code (ISO 4217)"
 msgstr "Код валюты (ISO 4217)"
 
@@ -9359,27 +9540,27 @@ msgid "Currency Rates"
 msgstr "Курс Валюты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_currency_subunit_label
+#: model:ir.model.fields,field_description:base.field_res_currency__currency_subunit_label
 msgid "Currency Subunit"
 msgstr "Подблок валюты"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_currency_subunit_label
+#: model:ir.model.fields,help:base.field_res_currency__currency_subunit_label
 msgid "Currency Subunit Name"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_currency_unit_label
+#: model:ir.model.fields,field_description:base.field_res_currency__currency_unit_label
 msgid "Currency Unit"
 msgstr "Валютная единица"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_currency_unit_label
+#: model:ir.model.fields,help:base.field_res_currency__currency_unit_label
 msgid "Currency Unit Name"
 msgstr "Наименование единицы валюты."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_symbol
+#: model:ir.model.fields,help:base.field_res_currency__symbol
 msgid "Currency sign, to be used when printing amounts."
 msgstr "Знак валюты, который будет использоваться при печати сумм."
 
@@ -9389,7 +9570,12 @@ msgid "Current Company"
 msgstr "Текущая Компания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_rate
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__current_line_id
+msgid "Current Line"
+msgstr "Текущая строка"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_currency__rate
 msgid "Current Rate"
 msgstr "Текущий курс"
 
@@ -9438,7 +9624,7 @@ msgid "Custom fields must have a name that starts with 'x_' !"
 msgstr "Названия пользовательских полей должны начинаться с 'x_'  !"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_name_position
+#: model:ir.model.fields,field_description:base.field_res_country__name_position
 msgid "Customer Name Position"
 msgstr ""
 
@@ -9546,12 +9732,12 @@ msgid "Database Anonymization"
 msgstr "Анонимизация базы данных"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_db_datas
+#: model:ir.model.fields,field_description:base.field_ir_attachment__db_datas
 msgid "Database Data"
 msgstr "База данных"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_res_id
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__res_id
 msgid ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
@@ -9560,7 +9746,7 @@ msgstr ""
 "``view_mode`` установлено только в 'form'"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_dbname
+#: model:ir.model.fields,field_description:base.field_ir_logging__dbname
 msgid "Database Name"
 msgstr "Название базы данных"
 
@@ -9570,7 +9756,7 @@ msgid "Database Structure"
 msgstr "Структура базы данных"
 
 #. module: base
-#: code:addons/models.py:2668
+#: code:addons/models.py:2676
 #, python-format
 msgid ""
 "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a "
@@ -9580,22 +9766,22 @@ msgstr ""
 "({}) могут быть вызваны несогласованностью типа в предыдущем запросе"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_date
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_name
-#: model:ir.model.fields,field_description:base.field_res_partner_date
-#: model:ir.model.fields,field_description:base.field_res_users_date
+#: model:ir.model.fields,field_description:base.field_res_currency__date
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__name
+#: model:ir.model.fields,field_description:base.field_res_partner__date
+#: model:ir.model.fields,field_description:base.field_res_users__date
 #: selection:ir.property,type:0
 #: model:ir.ui.view,arch_db:base.view_currency_rate_search
 msgid "Date"
 msgstr "Дата"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_create_date
+#: model:ir.model.fields,field_description:base.field_ir_attachment__create_date
 msgid "Date Created"
 msgstr "Дата создания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_date_format
+#: model:ir.model.fields,field_description:base.field_res_lang__date_format
 msgid "Date Format"
 msgstr "Формат даты"
 
@@ -9635,12 +9821,12 @@ msgid "Days"
 msgstr "Дней"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_debug
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_debug
 msgid "Debugging"
 msgstr "Отладка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_decimal_places
+#: model:ir.model.fields,field_description:base.field_res_currency__decimal_places
 msgid "Decimal Places"
 msgstr "Число десятичных знаков"
 
@@ -9650,12 +9836,22 @@ msgid "Decimal Precision Configuration"
 msgstr "Настройка точности"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_decimal_point
+#: model:ir.model.fields,field_description:base.field_res_lang__decimal_point
 msgid "Decimal Separator"
 msgstr "Десятичный разделитель"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_filters_is_default
+#: model:ir.actions.act_window,name:base.action_partner_deduplicate
+msgid "Deduplicate Contacts"
+msgstr "Дедуплицировать контакты"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Deduplicate the other Contacts"
+msgstr "Дедуплицировать другие контакты"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_filters__is_default
 msgid "Default Filter"
 msgstr "Фильтр по умолчанию"
 
@@ -9665,17 +9861,17 @@ msgid "Default Theme"
 msgstr "Тема по умолчанию"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_default_json_value
+#: model:ir.model.fields,field_description:base.field_ir_default__json_value
 msgid "Default Value (JSON format)"
 msgstr "Значение по умолчанию (в формате JSON)"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_limit
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__limit
 msgid "Default limit for the list view"
 msgstr "Лимит по умолчанию для вида списка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_default
+#: model:ir.model.fields,field_description:base.field_report_paperformat__default
 msgid "Default paper format ?"
 msgstr "Размер бумаги по умолчанию ?"
 
@@ -9705,12 +9901,12 @@ msgid "Defined Reports"
 msgstr "Заданные отчеты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_definition
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__definition
 msgid "Definition"
 msgstr "Описание"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_perm_unlink
+#: model:ir.model.fields,field_description:base.field_ir_model_access__perm_unlink
 msgid "Delete Access"
 msgstr "Доступ на удаление"
 
@@ -9730,7 +9926,7 @@ msgid "Delivery Costs"
 msgstr "Стоимость доставки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_demo
+#: model:ir.model.fields,field_description:base.field_ir_module_module__demo
 msgid "Demo Data"
 msgstr "Демонстрационные данные"
 
@@ -9745,14 +9941,14 @@ msgid "Denmark"
 msgstr "Дания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_depends
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependencies_id
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__depends
+#: model:ir.model.fields,field_description:base.field_ir_module_module__dependencies_id
 #: model:ir.ui.view,arch_db:base.module_form
 msgid "Dependencies"
 msgstr "Зависимости"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_depends
+#: model:ir.model.fields,help:base.field_ir_model_fields__depends
 msgid ""
 "Dependencies of compute method; a list of comma-separated field names, like\n"
 "\n"
@@ -9763,22 +9959,22 @@ msgstr ""
 "    name, partner_id.name"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_depend_id
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__depend_id
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
 msgstr "Зависимость"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_description
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_name
-#: model:ir.model.fields,field_description:base.field_ir_module_category_description
-#: model:ir.model.fields,field_description:base.field_ir_module_module_description
+#: model:ir.model.fields,field_description:base.field_ir_attachment__description
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__name
+#: model:ir.model.fields,field_description:base.field_ir_module_category__description
+#: model:ir.model.fields,field_description:base.field_ir_module_module__description
 #: model:ir.ui.view,arch_db:base.view_attachment_form
 msgid "Description"
 msgstr "Описание"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_description_html
+#: model:ir.model.fields,field_description:base.field_ir_module_module__description_html
 msgid "Description HTML"
 msgstr "Описание HTML"
 
@@ -9793,8 +9989,13 @@ msgid "Design, send and track emails"
 msgstr "Создавайте, отправляйте и отслеживайте почту"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_res_model
-#: model:ir.model.fields,field_description:base.field_ir_act_window_res_model
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__dst_partner_id
+msgid "Destination Contact"
+msgstr "Назначенный контакт"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__res_model
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__res_model
 msgid "Destination Model"
 msgstr "Модель назначения"
 
@@ -9804,14 +10005,14 @@ msgid "Detailed algorithm:"
 msgstr "Подробный алгоритм:"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_position
+#: model:ir.model.fields,help:base.field_res_currency__position
 msgid ""
 "Determines where the currency symbol should be placed after or before the "
 "amount."
 msgstr "Показывает, куда вставлять символ: после или до суммы."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_name_position
+#: model:ir.model.fields,help:base.field_res_country__name_position
 msgid ""
 "Determines where the customer/company name should be placed, i.e. after or "
 "before the address."
@@ -9843,7 +10044,7 @@ msgid "Diagram"
 msgstr "Диаграмма"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_direction
+#: model:ir.model.fields,field_description:base.field_res_lang__direction
 msgid "Direction"
 msgstr "Направление"
 
@@ -9853,7 +10054,7 @@ msgid "Directory"
 msgstr "Директория"
 
 #. module: base
-#: code:addons/base/models/res_config.py:428
+#: code:addons/base/models/res_config.py:431
 #, python-format
 msgid ""
 "Disabling this option will also uninstall the following modules \n"
@@ -9884,98 +10085,100 @@ msgid "Display"
 msgstr "Показать"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field__unknown_display_name
-#: model:ir.model.fields,field_description:base.field_base_display_name
-#: model:ir.model.fields,field_description:base.field_base_language_export_display_name
-#: model:ir.model.fields,field_description:base.field_base_language_import_display_name
-#: model:ir.model.fields,field_description:base.field_base_language_install_display_name
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_display_name
-#: model:ir.model.fields,field_description:base.field_base_module_update_display_name
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_display_name
-#: model:ir.model.fields,field_description:base.field_base_update_translations_display_name
-#: model:ir.model.fields,field_description:base.field_change_password_user_display_name
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_display_name
-#: model:ir.model.fields,field_description:base.field_format_address_mixin_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_client_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_server_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_url_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_window_display_name
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_display_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_display_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_278
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_display_name
-#: model:ir.model.fields,field_description:base.field_ir_attachment_display_name
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_display_name
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_display_name
-#: model:ir.model.fields,field_description:base.field_ir_cron_display_name
-#: model:ir.model.fields,field_description:base.field_ir_default_display_name
-#: model:ir.model.fields,field_description:base.field_ir_exports_display_name
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_display_name
-#: model:ir.model.fields,field_description:base.field_ir_fields_converter_display_name
-#: model:ir.model.fields,field_description:base.field_ir_filters_display_name
-#: model:ir.model.fields,field_description:base.field_ir_http_display_name
-#: model:ir.model.fields,field_description:base.field_ir_logging_display_name
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_access_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_data_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_display_name
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_display_name
-#: model:ir.model.fields,field_description:base.field_ir_module_category_display_name
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_display_name
-#: model:ir.model.fields,field_description:base.field_ir_module_module_display_name
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_display_name
-#: model:ir.model.fields,field_description:base.field_ir_property_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text_display_name
-#: model:ir.model.fields,field_description:base.field_ir_rule_display_name
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_display_name
-#: model:ir.model.fields,field_description:base.field_ir_sequence_display_name
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_display_name
-#: model:ir.model.fields,field_description:base.field_ir_translation_display_name
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_display_name
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_display_name
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_display_name
-#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference_display_name
-#: model:ir.model.fields,field_description:base.field_report_paperformat_display_name
-#: model:ir.model.fields,field_description:base.field_res_bank_display_name
-#: model:ir.model.fields,field_description:base.field_res_company_display_name
-#: model:ir.model.fields,field_description:base.field_res_config_display_name
-#: model:ir.model.fields,field_description:base.field_res_config_installer_display_name
-#: model:ir.model.fields,field_description:base.field_res_config_settings_display_name
-#: model:ir.model.fields,field_description:base.field_res_country_display_name
-#: model:ir.model.fields,field_description:base.field_res_country_group_display_name
-#: model:ir.model.fields,field_description:base.field_res_country_state_display_name
-#: model:ir.model.fields,field_description:base.field_res_currency_display_name
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_display_name
-#: model:ir.model.fields,field_description:base.field_res_groups_display_name
-#: model:ir.model.fields,field_description:base.field_res_lang_display_name
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_display_name
-#: model:ir.model.fields,field_description:base.field_res_partner_category_display_name
-#: model:ir.model.fields,field_description:base.field_res_partner_display_name
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_display_name
-#: model:ir.model.fields,field_description:base.field_res_partner_title_display_name
-#: model:ir.model.fields,field_description:base.field_res_users_display_name
-#: model:ir.model.fields,field_description:base.field_res_users_log_display_name
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_display_name
+#: model:ir.model.fields,field_description:base.field__unknown__display_name
+#: model:ir.model.fields,field_description:base.field_base__display_name
+#: model:ir.model.fields,field_description:base.field_base_language_export__display_name
+#: model:ir.model.fields,field_description:base.field_base_language_import__display_name
+#: model:ir.model.fields,field_description:base.field_base_language_install__display_name
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__display_name
+#: model:ir.model.fields,field_description:base.field_base_module_update__display_name
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__display_name
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__display_name
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__display_name
+#: model:ir.model.fields,field_description:base.field_base_update_translations__display_name
+#: model:ir.model.fields,field_description:base.field_change_password_user__display_name
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__display_name
+#: model:ir.model.fields,field_description:base.field_format_address_mixin__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__display_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__display_name
+#: model:ir.model.fields,field_description:base.field_ir_attachment__display_name
+#: model:ir.model.fields,field_description:base.field_ir_autovacuum__display_name
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__display_name
+#: model:ir.model.fields,field_description:base.field_ir_cron__display_name
+#: model:ir.model.fields,field_description:base.field_ir_default__display_name
+#: model:ir.model.fields,field_description:base.field_ir_exports__display_name
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__display_name
+#: model:ir.model.fields,field_description:base.field_ir_fields_converter__display_name
+#: model:ir.model.fields,field_description:base.field_ir_filters__display_name
+#: model:ir.model.fields,field_description:base.field_ir_http__display_name
+#: model:ir.model.fields,field_description:base.field_ir_logging__display_name
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model_access__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model_data__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__display_name
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__display_name
+#: model:ir.model.fields,field_description:base.field_ir_module_category__display_name
+#: model:ir.model.fields,field_description:base.field_ir_module_module__display_name
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__display_name
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__display_name
+#: model:ir.model.fields,field_description:base.field_ir_property__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection__display_name
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text__display_name
+#: model:ir.model.fields,field_description:base.field_ir_rule__display_name
+#: model:ir.model.fields,field_description:base.field_ir_sequence__display_name
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__display_name
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__display_name
+#: model:ir.model.fields,field_description:base.field_ir_translation__display_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__display_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__display_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__display_name
+#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference__display_name
+#: model:ir.model.fields,field_description:base.field_report_paperformat__display_name
+#: model:ir.model.fields,field_description:base.field_res_bank__display_name
+#: model:ir.model.fields,field_description:base.field_res_company__display_name
+#: model:ir.model.fields,field_description:base.field_res_config__display_name
+#: model:ir.model.fields,field_description:base.field_res_config_installer__display_name
+#: model:ir.model.fields,field_description:base.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:base.field_res_country__display_name
+#: model:ir.model.fields,field_description:base.field_res_country_group__display_name
+#: model:ir.model.fields,field_description:base.field_res_country_state__display_name
+#: model:ir.model.fields,field_description:base.field_res_currency__display_name
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__display_name
+#: model:ir.model.fields,field_description:base.field_res_groups__display_name
+#: model:ir.model.fields,field_description:base.field_res_lang__display_name
+#: model:ir.model.fields,field_description:base.field_res_partner__display_name
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__display_name
+#: model:ir.model.fields,field_description:base.field_res_partner_category__display_name
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__display_name
+#: model:ir.model.fields,field_description:base.field_res_partner_title__display_name
+#: model:ir.model.fields,field_description:base.field_res_users__display_name
+#: model:ir.model.fields,field_description:base.field_res_users_log__display_name
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__display_name
 msgid "Display Name"
 msgstr "Отображаемое Имя"
 
@@ -9985,7 +10188,7 @@ msgid "Display Website Elements in Studio"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_header_line
+#: model:ir.model.fields,field_description:base.field_report_paperformat__header_line
 msgid "Display a header line"
 msgstr "Отобразить строку заголовка"
 
@@ -10021,7 +10224,7 @@ msgstr ""
 "работы."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_address_format
+#: model:ir.model.fields,help:base.field_res_country__address_format
 msgid ""
 "Display format to use for addresses belonging to this country.\n"
 "\n"
@@ -10053,13 +10256,13 @@ msgid "Document Management"
 msgstr "Управление документами"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_external_report_layout
+#: model:ir.model.fields,field_description:base.field_res_company__external_report_layout
 msgid "Document Template"
 msgstr "Шаблон документа"
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1175
-#: code:addons/base/models/ir_model.py:1178
+#: code:addons/base/models/ir_model.py:1179
+#: code:addons/base/models/ir_model.py:1182
 #, python-format
 msgid "Document model"
 msgstr "Модель документа"
@@ -10075,14 +10278,14 @@ msgid "Documentation examples test"
 msgstr "Документация тестовые примеры"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_filters_domain
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_domain
-#: model:ir.model.fields,field_description:base.field_ir_rule_domain_force
+#: model:ir.model.fields,field_description:base.field_ir_filters__domain
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__domain
+#: model:ir.model.fields,field_description:base.field_ir_rule__domain_force
 msgid "Domain"
 msgstr "Домен"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_domain
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__domain
 msgid "Domain Value"
 msgstr "Значение домена"
 
@@ -10119,6 +10322,13 @@ msgid "Drop Shipping"
 msgstr "Прямые поставки"
 
 #. module: base
+#: code:addons/base/models/res_company.py:18
+#, python-format
+msgid ""
+"Duplicating a company is not allowed. Please create a new company instead."
+msgstr ""
+
+#. module: base
 #: code:addons/base/models/ir_qweb_fields.py:382
 #, python-format
 msgid "Durations can't be negative"
@@ -10180,16 +10390,13 @@ msgid "Egypt"
 msgstr "Египет"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_partner_share
-#: model:ir.model.fields,help:base.field_res_users_partner_share
+#: model:ir.model.fields,help:base.field_res_partner__partner_share
+#: model:ir.model.fields,help:base.field_res_users__partner_share
 msgid ""
-"Either customer (no user), either shared user. Indicated the current partner"
-" is a customer without access or with a limited access created for sharing "
-"data."
+"Either customer (not a user), either shared user. Indicated the current "
+"partner is a customer without access or with a limited access created for "
+"sharing data."
 msgstr ""
-"Любой клиент (без пользователя), либо общий пользователь. Указывается, что "
-"текущий партнер - это клиент без доступа или с ограниченным доступом, "
-"созданным для совместного использования данных."
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -10233,16 +10440,17 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:627
+#: code:addons/base/models/ir_ui_view.py:641
 #, python-format
 msgid "Element '%s' cannot be located in parent view"
 msgstr "Элемент '%s' не может находится в родительском виде"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_email
-#: model:ir.model.fields,field_description:base.field_res_company_email
-#: model:ir.model.fields,field_description:base.field_res_partner_email
-#: model:ir.model.fields,field_description:base.field_res_users_email
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_email
+#: model:ir.model.fields,field_description:base.field_res_bank__email
+#: model:ir.model.fields,field_description:base.field_res_company__email
+#: model:ir.model.fields,field_description:base.field_res_partner__email
+#: model:ir.model.fields,field_description:base.field_res_users__email
 #: model:ir.ui.menu,name:base.menu_email
 msgid "Email"
 msgstr "Email"
@@ -10269,8 +10477,8 @@ msgid "Email Preferences"
 msgstr "Настройки электронной почты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_employee
-#: model:ir.model.fields,field_description:base.field_res_users_employee
+#: model:ir.model.fields,field_description:base.field_res_partner__employee
+#: model:ir.model.fields,field_description:base.field_res_users__employee
 #: model:res.groups,name:base.group_user
 msgid "Employee"
 msgstr "Сотрудник"
@@ -10320,7 +10528,6 @@ msgstr ""
 #: model:ir.module.module,description:base.module_mrp_workorder
 msgid ""
 "Enterprise extension for MRP\n"
-"\n"
 "* Work order planning.  Check planning by Gantt views grouped by production order / work center\n"
 "* Traceability report\n"
 "* Cost Structure report (mrp_account)"
@@ -10354,7 +10561,7 @@ msgid "Error ! You can not create recursive tags."
 msgstr "Ошибка ! Вы не можете создать рекурсивные теги."
 
 #. module: base
-#: code:addons/base/models/res_company.py:241
+#: code:addons/base/models/res_company.py:234
 #, python-format
 msgid "Error ! You cannot create recursive companies."
 msgstr "Ошибка ! Вы не можете создать рекурсивные теги."
@@ -10366,7 +10573,7 @@ msgid "Error ! You cannot select a format AND specific page width/height."
 msgstr "Ошибка! Нельзя выбрать формат И конкретную страницу ширина/высота."
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:477
+#: code:addons/base/models/ir_ui_view.py:491
 #, python-format
 msgid ""
 "Error context:\n"
@@ -10376,13 +10583,13 @@ msgstr ""
 "Просмотр `%(view_name)s`"
 
 #. module: base
-#: code:addons/models.py:958
+#: code:addons/models.py:974
 #, python-format
 msgid "Error details:"
 msgstr "Детали ошибки:"
 
 #. module: base
-#: code:addons/models.py:971
+#: code:addons/models.py:987
 #, python-format
 msgid "Error while validating constraint"
 msgstr "Ошибка при проверке ограничения"
@@ -10419,7 +10626,7 @@ msgid "Europe"
 msgstr "Европа"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_type
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__type
 msgid "Evaluation Type"
 msgstr "Тип Оценки"
 
@@ -10482,18 +10689,23 @@ msgid "Examples"
 msgstr "Примеры"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_exclusion_id
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Exclude contacts having"
+msgstr "Исключить имеющиеся контакты"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__exclusion_id
 msgid "Exclusion Module"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_ids
+#: model:ir.model.fields,field_description:base.field_ir_module_module__exclusion_ids
 #: model:ir.ui.view,arch_db:base.module_form
 msgid "Exclusions"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_exclusive
+#: model:ir.model.fields,field_description:base.field_ir_module_category__exclusive
 msgid "Exclusive"
 msgstr ""
 
@@ -10523,12 +10735,8 @@ msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
 msgstr "Executive 4 7.5 x 10 дюймов, 190.5 x 254 мм"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_expense
-msgid "Expense Tracker"
-msgstr "Учет расходов"
-
-#. module: base
 #: model:ir.module.category,name:base.module_category_hr_expense
+#: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses"
 msgstr "Расходы"
 
@@ -10538,12 +10746,12 @@ msgid "Expenses Validation, Invoicing"
 msgstr "Утверждение расходов, выставление счетов"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_report_paperformat_report_ids
+#: model:ir.model.fields,help:base.field_report_paperformat__report_ids
 msgid "Explicitly associated reports"
 msgstr "Напрямую связанные отчеты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_export_id
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__export_id
 #: model:ir.ui.view,arch_db:base.wizard_lang_export
 msgid "Export"
 msgstr "Экспорт"
@@ -10554,12 +10762,12 @@ msgid "Export Complete"
 msgstr "Экспорт завершён"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_exports_export_fields
+#: model:ir.model.fields,field_description:base.field_ir_exports__export_fields
 msgid "Export ID"
 msgstr "ID Экспорта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_exports_name
+#: model:ir.model.fields,field_description:base.field_ir_exports__name
 msgid "Export Name"
 msgstr "Экспорт: имя"
 
@@ -10590,7 +10798,7 @@ msgid "Export payments as SEPA Credit Transfer files"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_server_object_lines_value
+#: model:ir.model.fields,help:base.field_ir_server_object_lines__value
 msgid ""
 "Expression containing a value specification. \n"
 "When Formula type is selected, this field may be a Python expression  that can use the same values as for the code field on the server action.\n"
@@ -10608,22 +10816,22 @@ msgid "Extension View"
 msgstr "Вид расширения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_act_server_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_act_url_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_273
-#: model:ir.model.fields,field_description:base.field_ir_cron_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_module_category_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_module_category__xml_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__xml_id
 #: model:ir.ui.view,arch_db:base.view_window_action_form
 msgid "External ID"
 msgstr "Внешний ID"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_name
+#: model:ir.model.fields,field_description:base.field_ir_model_data__name
 #: model:ir.ui.view,arch_db:base.view_model_data_search
 msgid "External Identifier"
 msgstr "Внешние Идентификатор"
@@ -10638,7 +10846,7 @@ msgid "External Identifiers"
 msgstr "Внешние Идентификаторы"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_data_name
+#: model:ir.model.fields,help:base.field_ir_model_data__name
 msgid ""
 "External Key/Identifier that can be used for data integration with third-"
 "party systems"
@@ -10647,7 +10855,7 @@ msgstr ""
 "данных с системами третьих сторон"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_share
+#: model:ir.model.fields,help:base.field_res_users__share
 msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
@@ -10692,8 +10900,8 @@ msgid "Faroe Islands"
 msgstr "Фарерские острова"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_state
-#: model:ir.model.fields,field_description:base.field_res_company_state_id
+#: model:ir.model.fields,field_description:base.field_res_bank__state
+#: model:ir.model.fields,field_description:base.field_res_company__state_id
 msgid "Fed. State"
 msgstr "Область"
 
@@ -10798,9 +11006,9 @@ msgstr ""
 "\n"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_default_field_id
-#: model:ir.model.fields,field_description:base.field_ir_property_fields_id
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_col1
+#: model:ir.model.fields,field_description:base.field_ir_default__field_id
+#: model:ir.model.fields,field_description:base.field_ir_property__fields_id
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__col1
 #: selection:ir.translation,type:0
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
 msgid "Field"
@@ -10825,12 +11033,18 @@ msgid "Field \"Type\" cannot be modified on models."
 msgstr "Поле \"Тип\" не может быть изменено на моделях."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_help
+#: code:addons/base/models/ir_ui_view.py:1047
+#, python-format
+msgid "Field %r used in attributes must be present in view but is missing:"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__help
 msgid "Field Help"
 msgstr "Справка поля"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_field_description
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__field_description
 msgid "Field Label"
 msgstr "Метка поля"
 
@@ -10840,18 +11054,18 @@ msgid "Field Mappings"
 msgstr "Соответствия полей"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_name
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_name
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__name
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__name
 msgid "Field Name"
 msgstr "Имя поля"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_ttype
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__ttype
 msgid "Field Type"
 msgstr "Тип поля"
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:918
+#: code:addons/base/models/ir_ui_view.py:1041
 #, python-format
 msgid "Field `%(field_name)s` does not exist"
 msgstr "Поле `%(field_name)s` не существует"
@@ -10873,7 +11087,7 @@ msgstr "Имена полей должны быть уникальными дл�
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
 #: model:ir.model,name:base.model_ir_model_fields
-#: model:ir.model.fields,field_description:base.field_ir_model_field_id
+#: model:ir.model.fields,field_description:base.field_ir_model__field_id
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
@@ -10900,30 +11114,30 @@ msgstr "Фиджи"
 
 #. module: base
 #: selection:ir.attachment,type:0
-#: model:ir.model.fields,field_description:base.field_base_language_export_data
-#: model:ir.model.fields,field_description:base.field_base_language_import_data
+#: model:ir.model.fields,field_description:base.field_base_language_export__data
+#: model:ir.model.fields,field_description:base.field_base_language_import__data
 msgid "File"
 msgstr "Файл"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_datas
+#: model:ir.model.fields,field_description:base.field_ir_attachment__datas
 msgid "File Content"
 msgstr "Содержимое файла"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_format
+#: model:ir.model.fields,field_description:base.field_base_language_export__format
 msgid "File Format"
 msgstr "Формат файла"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_name
-#: model:ir.model.fields,field_description:base.field_base_language_import_filename
-#: model:ir.model.fields,field_description:base.field_ir_attachment_datas_fname
+#: model:ir.model.fields,field_description:base.field_base_language_export__name
+#: model:ir.model.fields,field_description:base.field_base_language_import__filename
+#: model:ir.model.fields,field_description:base.field_ir_attachment__datas_fname
 msgid "File Name"
 msgstr "Имя файла"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_file_size
+#: model:ir.model.fields,field_description:base.field_ir_attachment__file_size
 msgid "File Size"
 msgstr "Размер файла"
 
@@ -10942,12 +11156,12 @@ msgstr ""
 "%s"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_filter
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__filter
 msgid "Filter"
 msgstr "Фильтр"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_filters_name
+#: model:ir.model.fields,field_description:base.field_ir_filters__name
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
 msgid "Filter Name"
 msgstr "Наименование Фильтра"
@@ -10998,6 +11212,11 @@ msgid "Financial and Analytic Accounting"
 msgstr "Финансовый и аналитический учет"
 
 #. module: base
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Finished"
+msgstr "Завершено"
+
+#. module: base
 #: model:res.country,name:base.fi
 msgid "Finland"
 msgstr "Финляндия"
@@ -11008,6 +11227,11 @@ msgid "Firebase Cloud Messaging"
 msgstr ""
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_res_lang__week_start
+msgid "First Day of Week"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
 msgstr "Транспорт"
@@ -11028,12 +11252,12 @@ msgid "Food"
 msgstr "Пища"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_report_footer
+#: model:ir.model.fields,help:base.field_res_company__report_footer
 msgid "Footer text displayed at the bottom of all reports."
 msgstr "Текст подвала отображается в нижней части всех отчётов."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_name
+#: model:ir.model.fields,help:base.field_ir_actions_report__report_name
 msgid ""
 "For QWeb reports, name of the template used in the rendering. The method "
 "'render_html' of the model 'report.template_name' will be called (if any) to"
@@ -11053,7 +11277,7 @@ msgstr ""
 "обратитесь к"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_relation_field
+#: model:ir.model.fields,help:base.field_ir_model_fields__relation_field
 msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
@@ -11062,18 +11286,28 @@ msgstr ""
 "обратную связь многие-к-одному"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_relation
+#: model:ir.model.fields,help:base.field_ir_model_fields__relation
 msgid "For relationship fields, the technical name of the target model"
 msgstr "Для полей связей. Техническое имя целевой модели"
 
 #. module: base
+#: code:addons/base/wizard/base_partner_merge.py:262
+#, python-format
+msgid ""
+"For safety reasons, you cannot merge more than 3 contacts together. You can "
+"re-open the wizard several times if needed."
+msgstr ""
+"Из соображений безопасности, вы не можете объединить более 3 контактов "
+"вместе. Но Вы можете повторно открыть мастер несколько раз."
+
+#. module: base
 #: code:addons/base/models/ir_model.py:612
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
 msgstr "Для полей выбора должны быть предоставлены варианты выбора!"
 
 #. module: base
-#: code:addons/models.py:2805
+#: code:addons/models.py:2813
 #, python-format
 msgid ""
 "For this kind of document, you may only access records you created yourself.\n"
@@ -11092,14 +11326,14 @@ msgid "Form"
 msgstr "Форма"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_email_formatted
-#: model:ir.model.fields,help:base.field_res_users_email_formatted
+#: model:ir.model.fields,help:base.field_res_partner__email_formatted
+#: model:ir.model.fields,help:base.field_res_users__email_formatted
 msgid "Format email address \"Name <email@domain>\""
 msgstr "Формат адреса электронной почты \"Имя <email@domain>\""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_email_formatted
-#: model:ir.model.fields,field_description:base.field_res_users_email_formatted
+#: model:ir.model.fields,field_description:base.field_res_partner__email_formatted
+#: model:ir.model.fields,field_description:base.field_res_users__email_formatted
 msgid "Formatted Email"
 msgstr "Форматированная электронная почта"
 
@@ -11145,6 +11379,23 @@ msgid "France - FEC"
 msgstr "Франция - FEC"
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_certification
+msgid "France - VAT Anti-Fraud Certification (CGI 286 I-3 bis)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_sale_closing
+msgid ""
+"France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) - Sale Closings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_pos_cert
+msgid ""
+"France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis)"
+msgstr ""
+
+#. module: base
 #: model:res.country,name:base.gf
 msgid "French Guiana"
 msgstr ""
@@ -11165,7 +11416,12 @@ msgid "French Southern Territories"
 msgstr "Францизкие Южные Территории"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_date_from
+#: selection:res.lang,week_start:0
+msgid "Friday"
+msgstr "Пятница"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__date_from
 msgid "From"
 msgstr "От"
 
@@ -11180,12 +11436,12 @@ msgid "Full Access Right"
 msgstr "Полные права доступа"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_full_name
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__full_name
 msgid "Full Name"
 msgstr "Полное Имя"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_complete_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__complete_name
 msgid "Full Path"
 msgstr "Полный путь"
 
@@ -11196,7 +11452,7 @@ msgid "Full Screen"
 msgstr "Полный Экран"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_func
+#: model:ir.model.fields,field_description:base.field_ir_logging__func
 msgid "Function"
 msgstr "Функция"
 
@@ -11226,6 +11482,11 @@ msgid "GPL-3 or later version"
 msgstr "GPL версии 3 или позже"
 
 #. module: base
+#: model:res.country,vat_label:base.sg
+msgid "GST No."
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,description:base.module_l10n_in_purchase
 msgid "GST Purchase Report"
 msgstr ""
@@ -11355,7 +11616,7 @@ msgid "Github Integration with Discuss"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_rule_global
+#: model:ir.model.fields,field_description:base.field_ir_rule__global
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 #: model:ir.ui.view,arch_db:base.view_rule_search
 msgid "Global"
@@ -11377,7 +11638,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_config.py:670
+#: code:addons/base/models/res_config.py:732
 #, python-format
 msgid "Go to the configuration panel"
 msgstr "Перейти к панели конфигурации"
@@ -11440,7 +11701,7 @@ msgid ""
 "Google Calendar\n"
 "---------------\n"
 "\n"
-"With the plugin Google\\_calendar, you can synchronize your Odoo calendar with Google Calendar.\n"
+"With this plugin, you can synchronize your Odoo calendar with Google Calendar.\n"
 "\n"
 msgstr ""
 
@@ -11502,7 +11763,7 @@ msgid "Grid View"
 msgstr "Табличный вид"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_group_id
+#: model:ir.model.fields,field_description:base.field_ir_model_access__group_id
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 #: model:ir.ui.view,arch_db:base.view_groups_search
 msgid "Group"
@@ -11527,12 +11788,12 @@ msgid "Group By"
 msgstr "Группировать"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_full_name
+#: model:ir.model.fields,field_description:base.field_res_groups__full_name
 msgid "Group Name"
 msgstr "Наименование Группы"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_groups_share
+#: model:ir.model.fields,help:base.field_res_groups__share
 msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
 "Создана группа для установки прав доступа для обмена данными с другими "
@@ -11544,19 +11805,24 @@ msgid "Group name"
 msgstr "Наименование группы"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__number_group
+msgid "Group of Contacts"
+msgstr "Группа контактов"
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_rule_form
 msgid "Group-specific rules are combined together with a logical OR operator"
 msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_groups
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_groups_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_groups_id
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_groups
-#: model:ir.model.fields,field_description:base.field_ir_rule_groups
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_groups_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_groups_id
-#: model:ir.model.fields,field_description:base.field_res_users_groups_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__groups_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__groups_id
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__groups
+#: model:ir.model.fields,field_description:base.field_ir_rule__groups
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__groups_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__groups_id
+#: model:ir.model.fields,field_description:base.field_res_users__groups_id
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: model:ir.ui.view,arch_db:base.view_groups_form
 #: model:ir.ui.view,arch_db:base.view_groups_search
@@ -11674,7 +11940,7 @@ msgid "Hardware Proxy"
 msgstr "Прокси Оборудование"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_header_spacing
+#: model:ir.model.fields,field_description:base.field_report_paperformat__header_spacing
 msgid "Header spacing"
 msgstr "Расположение заголовка"
 
@@ -11853,11 +12119,6 @@ msgid "Here is the exported translation file:"
 msgstr "Экспортированный файл перевода:"
 
 #. module: base
-#: model:ir.module.category,name:base.module_category_theme_hidden
-msgid "Hidden"
-msgstr "Скрытый"
-
-#. module: base
 #: model:ir.ui.view,arch_db:base.view_attachment_form
 msgid "History"
 msgstr "История"
@@ -11868,7 +12129,7 @@ msgid "Holy See (Vatican City State)"
 msgstr "Ватикан (Папский Престол)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_action_id
+#: model:ir.model.fields,field_description:base.field_res_users__action_id
 msgid "Home Action"
 msgstr "Начальная страница"
 
@@ -11893,7 +12154,12 @@ msgid "Hong Kong"
 msgstr "Гонконг"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_host
+#: model:ir.module.module,shortdesc:base.module_l10n_hk
+msgid "Hong Kong - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_host
 msgid "Hostname or IP of SMTP server"
 msgstr "Имя хоста или IP адрес SMTP сервера"
 
@@ -11918,7 +12184,7 @@ msgid "Households"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_cron_numbercall
+#: model:ir.model.fields,help:base.field_ir_cron__numbercall
 msgid ""
 "How many times the method is called,\n"
 "a negative number indicates no limit."
@@ -11973,108 +12239,110 @@ msgid "IBAN Bank Accounts"
 msgstr "Банковские Счета IBAN"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field__unknown_id
-#: model:ir.model.fields,field_description:base.field_base_id
-#: model:ir.model.fields,field_description:base.field_base_language_export_id
-#: model:ir.model.fields,field_description:base.field_base_language_import_id
-#: model:ir.model.fields,field_description:base.field_base_language_install_id
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_id
-#: model:ir.model.fields,field_description:base.field_base_module_update_id
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_id
-#: model:ir.model.fields,field_description:base.field_base_update_translations_id
-#: model:ir.model.fields,field_description:base.field_change_password_user_id
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_id
-#: model:ir.model.fields,field_description:base.field_format_address_mixin_id
-#: model:ir.model.fields,field_description:base.field_ir_act_client_id
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_act_server_id
-#: model:ir.model.fields,field_description:base.field_ir_act_url_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_264
-#: model:ir.model.fields,field_description:base.field_ir_actions_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_id_277
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_id
-#: model:ir.model.fields,field_description:base.field_ir_attachment_id
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_id
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_id
-#: model:ir.model.fields,field_description:base.field_ir_default_id
-#: model:ir.model.fields,field_description:base.field_ir_exports_id
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_id
-#: model:ir.model.fields,field_description:base.field_ir_fields_converter_id
-#: model:ir.model.fields,field_description:base.field_ir_filters_id
-#: model:ir.model.fields,field_description:base.field_ir_http_id
-#: model:ir.model.fields,field_description:base.field_ir_logging_id
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_id
-#: model:ir.model.fields,field_description:base.field_ir_model_access_id
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_id
-#: model:ir.model.fields,field_description:base.field_ir_model_data_id
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_id
-#: model:ir.model.fields,field_description:base.field_ir_model_id
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_id
-#: model:ir.model.fields,field_description:base.field_ir_module_category_id
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_id
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_id
-#: model:ir.model.fields,field_description:base.field_ir_module_module_id
-#: model:ir.model.fields,field_description:base.field_ir_property_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_id
-#: model:ir.model.fields,field_description:base.field_ir_rule_id
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_id
-#: model:ir.model.fields,field_description:base.field_ir_sequence_id
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_id
-#: model:ir.model.fields,field_description:base.field_ir_translation_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_id
-#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference_id
-#: model:ir.model.fields,field_description:base.field_report_paperformat_id
-#: model:ir.model.fields,field_description:base.field_res_bank_id
-#: model:ir.model.fields,field_description:base.field_res_company_id
-#: model:ir.model.fields,field_description:base.field_res_config_id
-#: model:ir.model.fields,field_description:base.field_res_config_installer_id
-#: model:ir.model.fields,field_description:base.field_res_config_settings_id
-#: model:ir.model.fields,field_description:base.field_res_country_group_id
-#: model:ir.model.fields,field_description:base.field_res_country_id
-#: model:ir.model.fields,field_description:base.field_res_country_state_id
-#: model:ir.model.fields,field_description:base.field_res_currency_id
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_id
-#: model:ir.model.fields,field_description:base.field_res_groups_id
-#: model:ir.model.fields,field_description:base.field_res_lang_id
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_id
-#: model:ir.model.fields,field_description:base.field_res_partner_category_id
-#: model:ir.model.fields,field_description:base.field_res_partner_id
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_id_881
-#: model:ir.model.fields,field_description:base.field_res_partner_title_id
-#: model:ir.model.fields,field_description:base.field_res_users_id
-#: model:ir.model.fields,field_description:base.field_res_users_log_id
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_id
+#: model:ir.model.fields,field_description:base.field__unknown__id
+#: model:ir.model.fields,field_description:base.field_base__id
+#: model:ir.model.fields,field_description:base.field_base_language_export__id
+#: model:ir.model.fields,field_description:base.field_base_language_import__id
+#: model:ir.model.fields,field_description:base.field_base_language_install__id
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__id
+#: model:ir.model.fields,field_description:base.field_base_module_update__id
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__id
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__id
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__id
+#: model:ir.model.fields,field_description:base.field_base_update_translations__id
+#: model:ir.model.fields,field_description:base.field_change_password_user__id
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__id
+#: model:ir.model.fields,field_description:base.field_format_address_mixin__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__id
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__id
+#: model:ir.model.fields,field_description:base.field_ir_attachment__id
+#: model:ir.model.fields,field_description:base.field_ir_autovacuum__id
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__id
+#: model:ir.model.fields,field_description:base.field_ir_cron__id
+#: model:ir.model.fields,field_description:base.field_ir_default__id
+#: model:ir.model.fields,field_description:base.field_ir_exports__id
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__id
+#: model:ir.model.fields,field_description:base.field_ir_fields_converter__id
+#: model:ir.model.fields,field_description:base.field_ir_filters__id
+#: model:ir.model.fields,field_description:base.field_ir_http__id
+#: model:ir.model.fields,field_description:base.field_ir_logging__id
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__id
+#: model:ir.model.fields,field_description:base.field_ir_model__id
+#: model:ir.model.fields,field_description:base.field_ir_model_access__id
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__id
+#: model:ir.model.fields,field_description:base.field_ir_model_data__id
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__id
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__id
+#: model:ir.model.fields,field_description:base.field_ir_module_category__id
+#: model:ir.model.fields,field_description:base.field_ir_module_module__id
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__id
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__id
+#: model:ir.model.fields,field_description:base.field_ir_property__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection__id
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text__id
+#: model:ir.model.fields,field_description:base.field_ir_rule__id
+#: model:ir.model.fields,field_description:base.field_ir_sequence__id
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__id
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__id
+#: model:ir.model.fields,field_description:base.field_ir_translation__id
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__id
+#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference__id
+#: model:ir.model.fields,field_description:base.field_report_paperformat__id
+#: model:ir.model.fields,field_description:base.field_res_bank__id
+#: model:ir.model.fields,field_description:base.field_res_company__id
+#: model:ir.model.fields,field_description:base.field_res_config__id
+#: model:ir.model.fields,field_description:base.field_res_config_installer__id
+#: model:ir.model.fields,field_description:base.field_res_config_settings__id
+#: model:ir.model.fields,field_description:base.field_res_country__id
+#: model:ir.model.fields,field_description:base.field_res_country_group__id
+#: model:ir.model.fields,field_description:base.field_res_country_state__id
+#: model:ir.model.fields,field_description:base.field_res_currency__id
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__id
+#: model:ir.model.fields,field_description:base.field_res_groups__id
+#: model:ir.model.fields,field_description:base.field_res_lang__id
+#: model:ir.model.fields,field_description:base.field_res_partner__id
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__id
+#: model:ir.model.fields,field_description:base.field_res_partner_category__id
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__id
+#: model:ir.model.fields,field_description:base.field_res_partner_title__id
+#: model:ir.model.fields,field_description:base.field_res_users__id
+#: model:ir.model.fields,field_description:base.field_res_users_log__id
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__id
 msgid "ID"
 msgstr "Номер"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_data_res_id
+#: model:ir.model.fields,help:base.field_ir_model_data__res_id
 msgid "ID of the target record in the database"
 msgstr "ID целевой записи в базе данных"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_ui_view_xml_id
+#: model:ir.model.fields,help:base.field_ir_ui_view__xml_id
 msgid "ID of the view defined in xml file"
 msgstr "ID вида определенного в файле xml."
 
@@ -12084,17 +12352,17 @@ msgid "IM Bus"
 msgstr "Мгновенный обмен сообщениями Bus"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_import_code
+#: model:ir.model.fields,field_description:base.field_base_language_import__code
 msgid "ISO Code"
 msgstr "ISO Код"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_base_language_import_code
+#: model:ir.model.fields,help:base.field_base_language_import__code
 msgid "ISO Language and Country code, e.g. en_US"
 msgstr "ISO язык и код страны, например en_US"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_iso_code
+#: model:ir.model.fields,field_description:base.field_res_lang__iso_code
 msgid "ISO code"
 msgstr "ISO Код"
 
@@ -12109,17 +12377,22 @@ msgid "Iceland"
 msgstr "Исландия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_icon_image
+#: model:ir.model.fields,field_description:base.field_ir_module_module__icon_image
 msgid "Icon"
 msgstr "Иконка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_icon
+#: model:ir.model.fields,field_description:base.field_ir_module_module__icon
 msgid "Icon URL"
 msgstr "URL иконки"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_multi
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__aggr_ids
+msgid "Ids"
+msgstr "Номера"
+
+#. module: base
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__multi
 msgid ""
 "If checked and the action is bound to a model, it will only appear in the "
 "More menu on list views"
@@ -12128,34 +12401,27 @@ msgstr ""
 "появится в меню Больше в виде списка"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_groups_is_portal
-msgid "If checked, this group is usable as a portal."
-msgstr "Если отмечено, эта группа может использоваться в портале."
-
-#. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_debug
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_debug
 msgid ""
 "If enabled, the full output of SMTP sessions will be written to the server "
-"log at DEBUG level(this is very verbose and may include confidential info!)"
+"log at DEBUG level (this is very verbose and may include confidential info!)"
 msgstr ""
-"Если включено, весь журнал SMTP сессий будет записан в лог сервера уровня "
-"отладки (очень подробный и может включать конфиденциальную информацию)"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_rule_global
+#: model:ir.model.fields,help:base.field_ir_rule__global
 msgid "If no group is specified the rule is global and applied to everyone"
 msgstr "Если группа не определена, то правило глобально и применимо ко всем"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_property_res_id
+#: model:ir.model.fields,help:base.field_ir_property__res_id
 msgid "If not set, acts as a default value for new resources"
 msgstr ""
 "Если не установлено, выступает в качестве значения по умолчанию для новых "
 "ресурсов"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_multi
-#: model:ir.model.fields,help:base.field_ir_act_window_view_multi
+#: model:ir.model.fields,help:base.field_ir_actions_act_window_view__multi
+#: model:ir.model.fields,help:base.field_ir_actions_report__multi
 msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
@@ -12164,18 +12430,18 @@ msgstr ""
 "формы."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_default_company_id
+#: model:ir.model.fields,help:base.field_ir_default__company_id
 msgid "If set, action binding only applies for this company"
 msgstr "Если задано, действие применяется только для этой компании"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_default_user_id
+#: model:ir.model.fields,help:base.field_ir_default__user_id
 msgid "If set, action binding only applies for this user."
 msgstr ""
 "Если задан, связанное действие применяется только для этого пользователя."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_default_condition
+#: model:ir.model.fields,help:base.field_ir_default__condition
 msgid "If set, applies the default upon condition."
 msgstr ""
 
@@ -12189,7 +12455,7 @@ msgstr ""
 "                                     Это может произойти с сервера действия исполняемого кода, который возвращает действие, или серверные действия возвращающие действия клиента."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_action_id
+#: model:ir.model.fields,help:base.field_res_users__action_id
 msgid ""
 "If specified, this action will be opened at log on for this user, in "
 "addition to the standard menu."
@@ -12198,8 +12464,8 @@ msgstr ""
 "пользователя, в дополнение к стандартному меню."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_lang
-#: model:ir.model.fields,help:base.field_res_users_lang
+#: model:ir.model.fields,help:base.field_res_partner__lang
+#: model:ir.model.fields,help:base.field_res_users__lang
 msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this contact will be printed in this language. If not, it will be English."
@@ -12208,7 +12474,7 @@ msgstr ""
 "контактом будут печататься на этом языке. Если нет, то будет английский."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_ui_view_groups_id
+#: model:ir.model.fields,help:base.field_ir_ui_view__groups_id
 msgid ""
 "If this field is empty, the view applies to all users. Otherwise, the view "
 "applies to the users of those groups only."
@@ -12217,7 +12483,7 @@ msgstr ""
 "случае , вид относится только к пользователям из этих групп ."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_ui_view_active
+#: model:ir.model.fields,help:base.field_ir_ui_view__active
 msgid ""
 "If this view is inherited,\n"
 "* if True, the view always extends its parent\n"
@@ -12247,14 +12513,14 @@ msgstr ""
 "федеральными штатами отсюда. Каждый штат соотносится с одной страной."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_base_language_install_overwrite
+#: model:ir.model.fields,help:base.field_base_language_install__overwrite
 msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
 msgstr "Если отмечено, ваши переводы будут заменены на официальные."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_attachment_use
+#: model:ir.model.fields,help:base.field_ir_actions_report__attachment_use
 msgid ""
 "If you check this, then the second time the user prints with same attachment"
 " name, it returns the previous report."
@@ -12263,7 +12529,7 @@ msgstr ""
 "точно такое же название вложения, появится предыдущий отчёт."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_base_language_import_overwrite
+#: model:ir.model.fields,help:base.field_base_language_import__overwrite
 msgid ""
 "If you enable this option, existing translations (including custom ones) "
 "will be overwritten and replaced by those in this file"
@@ -12272,7 +12538,7 @@ msgstr ""
 " будут заменены новыми из данного файла"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_ui_menu_groups_id
+#: model:ir.model.fields,help:base.field_ir_ui_menu__groups_id
 msgid ""
 "If you have groups, the visibility of this menu will be based on these "
 "groups. If this field is empty, Odoo will compute visibility based on the "
@@ -12283,7 +12549,7 @@ msgstr ""
 "чтения соответствующего объекта."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_access_active
+#: model:ir.model.fields,help:base.field_ir_model_access__active
 msgid ""
 "If you uncheck the active field, it will disable the ACL without deleting it"
 " (if you delete a native ACL, it will be re-created when you reload the "
@@ -12294,7 +12560,7 @@ msgstr ""
 "модуля)."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_rule_active
+#: model:ir.model.fields,help:base.field_ir_rule__active
 msgid ""
 "If you uncheck the active field, it will disable the record rule without "
 "deleting it (if you delete a native record rule, it may be re-created when "
@@ -12311,9 +12577,9 @@ msgstr ""
 "Если вы хотите отменить действие, нажмите кнопку &quot;отмена&quot; внизу"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_image
-#: model:ir.model.fields,field_description:base.field_res_partner_image
-#: model:ir.model.fields,field_description:base.field_res_users_image
+#: model:ir.model.fields,field_description:base.field_res_country__image
+#: model:ir.model.fields,field_description:base.field_res_partner__image
+#: model:ir.model.fields,field_description:base.field_res_users__image
 msgid "Image"
 msgstr "Изображение"
 
@@ -12323,17 +12589,17 @@ msgid "Impacted Apps"
 msgstr "Приложения, на которые это повлияет"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_model_ids
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__model_ids
 msgid "Impacted data models"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_module_ids
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__module_ids
 msgid "Impacted modules"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_implementation
+#: model:ir.model.fields,field_description:base.field_ir_sequence__implementation
 msgid "Implementation"
 msgstr "Реализация"
 
@@ -12387,8 +12653,8 @@ msgid "Import exchange rates from the Internet.\n"
 msgstr "Импортировать курсы обмена из интернета\n"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_modules
-#: model:ir.model.fields,field_description:base.field_ir_model_modules
+#: model:ir.model.fields,field_description:base.field_ir_model__modules
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__modules
 msgid "In Apps"
 msgstr "В Приложениях"
 
@@ -12409,12 +12675,12 @@ msgid "Inactive Users"
 msgstr "Неактивные Пользователи"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_index
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__index
 msgid "Indexed"
 msgstr "Индексированный"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_index_content
+#: model:ir.model.fields,field_description:base.field_ir_attachment__index_content
 #: model:ir.ui.view,arch_db:base.view_attachment_form
 msgid "Indexed Content"
 msgstr "Индексированное Содержимое"
@@ -12472,15 +12738,15 @@ msgstr "Индонезия"
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_industry_action
 #: model:ir.model,name:base.model_res_partner_industry
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_id
-#: model:ir.model.fields,field_description:base.field_res_users_industry_id
+#: model:ir.model.fields,field_description:base.field_res_partner__industry_id
+#: model:ir.model.fields,field_description:base.field_res_users__industry_id
 #: model:ir.ui.view,arch_db:base.res_partner_industry_view_form
 #: model:ir.ui.view,arch_db:base.res_partner_industry_view_tree
 msgid "Industry"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_info
+#: model:ir.model.fields,field_description:base.field_ir_model__info
 #: model:ir.ui.view,arch_db:base.module_form
 msgid "Information"
 msgstr "Информация"
@@ -12496,7 +12762,7 @@ msgid "Inherited"
 msgstr "Унаследованный"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_inherit_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_id
 msgid "Inherited View"
 msgstr "Унаследованный Вид"
 
@@ -12506,17 +12772,17 @@ msgid "Inherited Views"
 msgstr "Унаследованные Виды"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_inherited_model_ids
+#: model:ir.model.fields,field_description:base.field_ir_model__inherited_model_ids
 msgid "Inherited models"
 msgstr "Унаследованные Модели"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_implied_ids
+#: model:ir.model.fields,field_description:base.field_res_groups__implied_ids
 msgid "Inherits"
 msgstr "Наследует"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_date_init
+#: model:ir.model.fields,field_description:base.field_ir_model_data__date_init
 msgid "Init Date"
 msgstr "Дата инициализации"
 
@@ -12526,8 +12792,8 @@ msgid "Initial Setup Tools"
 msgstr "Инструменты Начальной Настройки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_date_init
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_date_init
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__date_init
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__date_init
 msgid "Initialization Date"
 msgstr "Дата инициализации"
 
@@ -12537,12 +12803,12 @@ msgid "Inline Edit"
 msgstr "Встроенный Редактор"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_address_view_id
+#: model:ir.model.fields,field_description:base.field_res_country__address_view_id
 msgid "Input View"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/ir_module.py:434
+#: code:addons/base/models/ir_module.py:436
 #: model:ir.ui.view,arch_db:base.module_form
 #: model:ir.ui.view,arch_db:base.module_view_kanban
 #, python-format
@@ -12560,6 +12826,11 @@ msgid "Install Language"
 msgstr "Установить язык"
 
 #. module: base
+#: model:ir.actions.server,name:base.action_server_module_immediate_install
+msgid "Install Modules"
+msgstr ""
+
+#. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 #: selection:ir.module.module.exclusion,state:0
@@ -12574,7 +12845,7 @@ msgid "Installed Features"
 msgstr "Установленные элементы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_latest_version
+#: model:ir.model.fields,field_description:base.field_ir_module_module__latest_version
 msgid "Installed Version"
 msgstr "Установленная версия"
 
@@ -12586,13 +12857,13 @@ msgstr ""
 "пользователям в реальном времени."
 
 #. module: base
-#: code:addons/models.py:1194
+#: code:addons/models.py:1210
 #, python-format
 msgid "Insufficient fields for Calendar View!"
 msgstr "Недостаточно полей для Вида Календаря!"
 
 #. module: base
-#: code:addons/models.py:1204
+#: code:addons/models.py:1220
 #, python-format
 msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
@@ -12652,13 +12923,13 @@ msgid "Internal Notes"
 msgstr "Внутренние заметки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_ref
-#: model:ir.model.fields,field_description:base.field_res_users_ref
+#: model:ir.model.fields,field_description:base.field_res_partner__ref
+#: model:ir.model.fields,field_description:base.field_res_users__ref
 msgid "Internal Reference"
 msgstr "Внутренний артикул"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_translation_src
+#: model:ir.model.fields,field_description:base.field_ir_translation__src
 msgid "Internal Source"
 msgstr "Внутренний Источник"
 
@@ -12673,12 +12944,12 @@ msgid "Internal note..."
 msgstr "Внутреннее примечание..."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_interval_number
+#: model:ir.model.fields,field_description:base.field_ir_cron__interval_number
 msgid "Interval Number"
 msgstr "Число Интервалов"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_interval_type
+#: model:ir.model.fields,field_description:base.field_ir_cron__interval_type
 msgid "Interval Unit"
 msgstr "Ед. изм. интервала"
 
@@ -12693,7 +12964,7 @@ msgid "Introspection report on objects"
 msgstr "Отчет о самоанализе объектов"
 
 #. module: base
-#: code:addons/models.py:3480
+#: code:addons/models.py:3521
 #, python-format
 msgid ""
 "Invalid \"order\" specified. A valid \"order\" specification is a comma-"
@@ -12705,7 +12976,7 @@ msgstr ""
 "порядок сортировки (asc или desc)."
 
 #. module: base
-#: code:addons/base/models/res_users.py:311
+#: code:addons/base/models/res_users.py:319
 #, python-format
 msgid "Invalid 'group by' parameter"
 msgstr "Ошибочный параметр «Группировать»"
@@ -12717,7 +12988,7 @@ msgid "Invalid database id '%s' for the field '%%(field)s'"
 msgstr "Неверный id базы данных '%s' для поля '%%(field)s'"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:61
+#: code:addons/base/models/res_lang.py:68
 #, python-format
 msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
@@ -12742,14 +13013,14 @@ msgstr ""
 "расширять другое представление"
 
 #. module: base
-#: code:addons/base/models/ir_actions.py:125
-#: code:addons/base/models/ir_actions.py:127
+#: code:addons/base/models/ir_actions.py:128
+#: code:addons/base/models/ir_actions.py:130
 #, python-format
 msgid "Invalid model name %r in action definition."
 msgstr "Недопустимое имя модели %r в определении действия."
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:618
+#: code:addons/base/models/ir_ui_view.py:632
 #, python-format
 msgid "Invalid position attribute: '%s'"
 msgstr "Неверное расположение символа: '%s'"
@@ -12761,7 +13032,7 @@ msgid "Invalid prefix or suffix for sequence '%s'"
 msgstr "Неверный префикс или суффикс для последовательности '%s'"
 
 #. module: base
-#: code:addons/base/models/res_users.py:319
+#: code:addons/base/models/res_users.py:327
 #, python-format
 msgid "Invalid search criterion"
 msgstr "Недопустимый критерий поиска."
@@ -12779,7 +13050,7 @@ msgid "Invalid value for %s.%s: %s"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:329
+#: code:addons/base/models/ir_ui_view.py:343
 #, python-format
 msgid "Invalid view definition"
 msgstr "Неверное определение вида"
@@ -12841,25 +13112,30 @@ msgid "Ireland"
 msgstr "Ирландия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_is_company
-#: model:ir.model.fields,field_description:base.field_res_users_is_company
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_is_company
+msgid "Is Company"
+msgstr "Это компания"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_partner__is_company
+#: model:ir.model.fields,field_description:base.field_res_users__is_company
 msgid "Is a Company"
 msgstr "Это Компания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_customer
-#: model:ir.model.fields,field_description:base.field_res_users_customer
+#: model:ir.model.fields,field_description:base.field_res_partner__customer
+#: model:ir.model.fields,field_description:base.field_res_users__customer
 msgid "Is a Customer"
 msgstr "Это клиент"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_supplier
-#: model:ir.model.fields,field_description:base.field_res_users_supplier
+#: model:ir.model.fields,field_description:base.field_res_partner__supplier
+#: model:ir.model.fields,field_description:base.field_res_users__supplier
 msgid "Is a Vendor"
 msgstr "Это поставщик"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_public
+#: model:ir.model.fields,field_description:base.field_ir_attachment__public
 msgid "Is public document"
 msgstr "Является ли документ публичным"
 
@@ -12919,8 +13195,8 @@ msgid "Job Descriptions And Application Forms"
 msgstr "Описание Работы и Заявление-анкета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_function
-#: model:ir.model.fields,field_description:base.field_res_users_function
+#: model:ir.model.fields,field_description:base.field_res_partner__function
+#: model:ir.model.fields,field_description:base.field_res_users__function
 msgid "Job Position"
 msgstr "Должность"
 
@@ -12940,6 +13216,11 @@ msgid "Jordan"
 msgstr "Иордания"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__exclude_journal_item
+msgid "Journal Items associated to the contact"
+msgstr "Позиции журнала, связанные с контактом"
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement_jit
 msgid "Just In Time Scheduling"
 msgstr "Своевременное Планирование"
@@ -12961,7 +13242,7 @@ msgid "Kazakhstan"
 msgstr "Казахстан"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_password
+#: model:ir.model.fields,help:base.field_res_users__password
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
@@ -12974,8 +13255,8 @@ msgid "Kenya"
 msgstr "Кения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_key
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_key
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__key
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__key
 #: model:ir.ui.view,arch_db:base.view_ir_config_search
 msgid "Key"
 msgstr "Ключ"
@@ -13031,12 +13312,12 @@ msgid "Landscape"
 msgstr "Альбом"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_lang
-#: model:ir.model.fields,field_description:base.field_base_language_install_lang
-#: model:ir.model.fields,field_description:base.field_base_update_translations_lang
-#: model:ir.model.fields,field_description:base.field_ir_translation_lang
-#: model:ir.model.fields,field_description:base.field_res_partner_lang
-#: model:ir.model.fields,field_description:base.field_res_users_lang
+#: model:ir.model.fields,field_description:base.field_base_language_export__lang
+#: model:ir.model.fields,field_description:base.field_base_language_install__lang
+#: model:ir.model.fields,field_description:base.field_base_update_translations__lang
+#: model:ir.model.fields,field_description:base.field_ir_translation__lang
+#: model:ir.model.fields,field_description:base.field_res_partner__lang
+#: model:ir.model.fields,field_description:base.field_res_users__lang
 #: model:ir.ui.view,arch_db:base.res_lang_search
 msgid "Language"
 msgstr "Язык"
@@ -13047,7 +13328,7 @@ msgid "Language Import"
 msgstr "Импорт языка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_import_name
+#: model:ir.model.fields,field_description:base.field_base_language_import__name
 msgid "Language Name"
 msgstr "Наименование Языка"
 
@@ -13058,7 +13339,7 @@ msgid "Language Pack"
 msgstr "Языковой Пакет"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:218
+#: code:addons/base/models/res_lang.py:225
 #, python-format
 msgid "Language code cannot be modified."
 msgstr "Код языка не может быть изменен."
@@ -13084,252 +13365,258 @@ msgid "Laos"
 msgstr "Лаос"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_write_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__write_date
 msgid "Last Modification Date"
 msgstr "Дата последнего изменения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field__unknown___last_update
-#: model:ir.model.fields,field_description:base.field_base___last_update
-#: model:ir.model.fields,field_description:base.field_base_language_export___last_update
-#: model:ir.model.fields,field_description:base.field_base_language_import___last_update
-#: model:ir.model.fields,field_description:base.field_base_language_install___last_update
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall___last_update
-#: model:ir.model.fields,field_description:base.field_base_module_update___last_update
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade___last_update
-#: model:ir.model.fields,field_description:base.field_base_update_translations___last_update
-#: model:ir.model.fields,field_description:base.field_change_password_user___last_update
-#: model:ir.model.fields,field_description:base.field_change_password_wizard___last_update
-#: model:ir.model.fields,field_description:base.field_format_address_mixin___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_client___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_server___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_url___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_window___last_update
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view___last_update
-#: model:ir.model.fields,field_description:base.field_ir_actions___last_update
-#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_283
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo___last_update
-#: model:ir.model.fields,field_description:base.field_ir_attachment___last_update
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum___last_update
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter___last_update
-#: model:ir.model.fields,field_description:base.field_ir_cron___last_update
-#: model:ir.model.fields,field_description:base.field_ir_default___last_update
-#: model:ir.model.fields,field_description:base.field_ir_exports___last_update
-#: model:ir.model.fields,field_description:base.field_ir_exports_line___last_update
-#: model:ir.model.fields,field_description:base.field_ir_fields_converter___last_update
-#: model:ir.model.fields,field_description:base.field_ir_filters___last_update
-#: model:ir.model.fields,field_description:base.field_ir_http___last_update
-#: model:ir.model.fields,field_description:base.field_ir_logging___last_update
-#: model:ir.model.fields,field_description:base.field_ir_mail_server___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model_access___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model_data___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model_fields___last_update
-#: model:ir.model.fields,field_description:base.field_ir_model_relation___last_update
-#: model:ir.model.fields,field_description:base.field_ir_module_category___last_update
-#: model:ir.model.fields,field_description:base.field_ir_module_module___last_update
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency___last_update
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion___last_update
-#: model:ir.model.fields,field_description:base.field_ir_property___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text___last_update
-#: model:ir.model.fields,field_description:base.field_ir_rule___last_update
-#: model:ir.model.fields,field_description:base.field_ir_sequence___last_update
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range___last_update
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines___last_update
-#: model:ir.model.fields,field_description:base.field_ir_translation___last_update
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu___last_update
-#: model:ir.model.fields,field_description:base.field_ir_ui_view___last_update
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom___last_update
-#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference___last_update
-#: model:ir.model.fields,field_description:base.field_report_paperformat___last_update
-#: model:ir.model.fields,field_description:base.field_res_bank___last_update
-#: model:ir.model.fields,field_description:base.field_res_company___last_update
-#: model:ir.model.fields,field_description:base.field_res_config___last_update
-#: model:ir.model.fields,field_description:base.field_res_config_installer___last_update
-#: model:ir.model.fields,field_description:base.field_res_config_settings___last_update
-#: model:ir.model.fields,field_description:base.field_res_country___last_update
-#: model:ir.model.fields,field_description:base.field_res_country_group___last_update
-#: model:ir.model.fields,field_description:base.field_res_country_state___last_update
-#: model:ir.model.fields,field_description:base.field_res_currency___last_update
-#: model:ir.model.fields,field_description:base.field_res_currency_rate___last_update
-#: model:ir.model.fields,field_description:base.field_res_groups___last_update
-#: model:ir.model.fields,field_description:base.field_res_lang___last_update
-#: model:ir.model.fields,field_description:base.field_res_partner___last_update
-#: model:ir.model.fields,field_description:base.field_res_partner_bank___last_update
-#: model:ir.model.fields,field_description:base.field_res_partner_category___last_update
-#: model:ir.model.fields,field_description:base.field_res_partner_industry___last_update
-#: model:ir.model.fields,field_description:base.field_res_partner_title___last_update
-#: model:ir.model.fields,field_description:base.field_res_users___last_update
-#: model:ir.model.fields,field_description:base.field_res_users_log___last_update
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create___last_update
+#: model:ir.model.fields,field_description:base.field__unknown____last_update
+#: model:ir.model.fields,field_description:base.field_base____last_update
+#: model:ir.model.fields,field_description:base.field_base_language_export____last_update
+#: model:ir.model.fields,field_description:base.field_base_language_import____last_update
+#: model:ir.model.fields,field_description:base.field_base_language_install____last_update
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall____last_update
+#: model:ir.model.fields,field_description:base.field_base_module_update____last_update
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade____last_update
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard____last_update
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line____last_update
+#: model:ir.model.fields,field_description:base.field_base_update_translations____last_update
+#: model:ir.model.fields,field_description:base.field_change_password_user____last_update
+#: model:ir.model.fields,field_description:base.field_change_password_wizard____last_update
+#: model:ir.model.fields,field_description:base.field_format_address_mixin____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_client____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_report____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_server____last_update
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo____last_update
+#: model:ir.model.fields,field_description:base.field_ir_attachment____last_update
+#: model:ir.model.fields,field_description:base.field_ir_autovacuum____last_update
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter____last_update
+#: model:ir.model.fields,field_description:base.field_ir_cron____last_update
+#: model:ir.model.fields,field_description:base.field_ir_default____last_update
+#: model:ir.model.fields,field_description:base.field_ir_exports____last_update
+#: model:ir.model.fields,field_description:base.field_ir_exports_line____last_update
+#: model:ir.model.fields,field_description:base.field_ir_fields_converter____last_update
+#: model:ir.model.fields,field_description:base.field_ir_filters____last_update
+#: model:ir.model.fields,field_description:base.field_ir_http____last_update
+#: model:ir.model.fields,field_description:base.field_ir_logging____last_update
+#: model:ir.model.fields,field_description:base.field_ir_mail_server____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model_access____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model_data____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model_fields____last_update
+#: model:ir.model.fields,field_description:base.field_ir_model_relation____last_update
+#: model:ir.model.fields,field_description:base.field_ir_module_category____last_update
+#: model:ir.model.fields,field_description:base.field_ir_module_module____last_update
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency____last_update
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion____last_update
+#: model:ir.model.fields,field_description:base.field_ir_property____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_barcode____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_contact____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_date____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_datetime____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_duration____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_float_time____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_html____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_image____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_integer____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_many2one____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_monetary____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_qweb____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection____last_update
+#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text____last_update
+#: model:ir.model.fields,field_description:base.field_ir_rule____last_update
+#: model:ir.model.fields,field_description:base.field_ir_sequence____last_update
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range____last_update
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines____last_update
+#: model:ir.model.fields,field_description:base.field_ir_translation____last_update
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu____last_update
+#: model:ir.model.fields,field_description:base.field_ir_ui_view____last_update
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom____last_update
+#: model:ir.model.fields,field_description:base.field_report_base_report_irmodulereference____last_update
+#: model:ir.model.fields,field_description:base.field_report_paperformat____last_update
+#: model:ir.model.fields,field_description:base.field_res_bank____last_update
+#: model:ir.model.fields,field_description:base.field_res_company____last_update
+#: model:ir.model.fields,field_description:base.field_res_config____last_update
+#: model:ir.model.fields,field_description:base.field_res_config_installer____last_update
+#: model:ir.model.fields,field_description:base.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:base.field_res_country____last_update
+#: model:ir.model.fields,field_description:base.field_res_country_group____last_update
+#: model:ir.model.fields,field_description:base.field_res_country_state____last_update
+#: model:ir.model.fields,field_description:base.field_res_currency____last_update
+#: model:ir.model.fields,field_description:base.field_res_currency_rate____last_update
+#: model:ir.model.fields,field_description:base.field_res_groups____last_update
+#: model:ir.model.fields,field_description:base.field_res_lang____last_update
+#: model:ir.model.fields,field_description:base.field_res_partner____last_update
+#: model:ir.model.fields,field_description:base.field_res_partner_bank____last_update
+#: model:ir.model.fields,field_description:base.field_res_partner_category____last_update
+#: model:ir.model.fields,field_description:base.field_res_partner_industry____last_update
+#: model:ir.model.fields,field_description:base.field_res_partner_title____last_update
+#: model:ir.model.fields,field_description:base.field_res_users____last_update
+#: model:ir.model.fields,field_description:base.field_res_users_log____last_update
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create____last_update
 msgid "Last Modified on"
 msgstr "Последнее изменение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_write_uid
-#: model:ir.model.fields,field_description:base.field_base_language_import_write_uid
-#: model:ir.model.fields,field_description:base.field_base_language_install_write_uid
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_write_uid
-#: model:ir.model.fields,field_description:base.field_base_module_update_write_uid
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_write_uid
-#: model:ir.model.fields,field_description:base.field_base_update_translations_write_uid
-#: model:ir.model.fields,field_description:base.field_change_password_user_write_uid
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_client_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_server_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_url_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_act_window_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_281
-#: model:ir.model.fields,field_description:base.field_ir_attachment_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_cron_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_default_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_exports_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_filters_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_logging_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_access_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_data_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_model_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_category_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_module_module_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_property_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_rule_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_sequence_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_write_uid
-#: model:ir.model.fields,field_description:base.field_report_paperformat_write_uid
-#: model:ir.model.fields,field_description:base.field_res_bank_write_uid
-#: model:ir.model.fields,field_description:base.field_res_company_write_uid
-#: model:ir.model.fields,field_description:base.field_res_config_installer_write_uid
-#: model:ir.model.fields,field_description:base.field_res_config_settings_write_uid
-#: model:ir.model.fields,field_description:base.field_res_config_write_uid
-#: model:ir.model.fields,field_description:base.field_res_country_group_write_uid
-#: model:ir.model.fields,field_description:base.field_res_country_state_write_uid
-#: model:ir.model.fields,field_description:base.field_res_country_write_uid
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_write_uid
-#: model:ir.model.fields,field_description:base.field_res_currency_write_uid
-#: model:ir.model.fields,field_description:base.field_res_groups_write_uid
-#: model:ir.model.fields,field_description:base.field_res_lang_write_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_write_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_category_write_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_write_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_title_write_uid
-#: model:ir.model.fields,field_description:base.field_res_partner_write_uid
-#: model:ir.model.fields,field_description:base.field_res_users_log_write_uid
-#: model:ir.model.fields,field_description:base.field_res_users_write_uid
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_write_uid
+#: model:ir.model.fields,field_description:base.field_base_language_export__write_uid
+#: model:ir.model.fields,field_description:base.field_base_language_import__write_uid
+#: model:ir.model.fields,field_description:base.field_base_language_install__write_uid
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__write_uid
+#: model:ir.model.fields,field_description:base.field_base_module_update__write_uid
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__write_uid
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__write_uid
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__write_uid
+#: model:ir.model.fields,field_description:base.field_base_update_translations__write_uid
+#: model:ir.model.fields,field_description:base.field_change_password_user__write_uid
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_attachment__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_cron__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_default__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_exports__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_filters__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_logging__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_access__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_data__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_category__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_property__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_rule__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_sequence__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__write_uid
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__write_uid
+#: model:ir.model.fields,field_description:base.field_report_paperformat__write_uid
+#: model:ir.model.fields,field_description:base.field_res_bank__write_uid
+#: model:ir.model.fields,field_description:base.field_res_company__write_uid
+#: model:ir.model.fields,field_description:base.field_res_config__write_uid
+#: model:ir.model.fields,field_description:base.field_res_config_installer__write_uid
+#: model:ir.model.fields,field_description:base.field_res_config_settings__write_uid
+#: model:ir.model.fields,field_description:base.field_res_country__write_uid
+#: model:ir.model.fields,field_description:base.field_res_country_group__write_uid
+#: model:ir.model.fields,field_description:base.field_res_country_state__write_uid
+#: model:ir.model.fields,field_description:base.field_res_currency__write_uid
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__write_uid
+#: model:ir.model.fields,field_description:base.field_res_groups__write_uid
+#: model:ir.model.fields,field_description:base.field_res_lang__write_uid
+#: model:ir.model.fields,field_description:base.field_res_partner__write_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__write_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_category__write_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__write_uid
+#: model:ir.model.fields,field_description:base.field_res_partner_title__write_uid
+#: model:ir.model.fields,field_description:base.field_res_users__write_uid
+#: model:ir.model.fields,field_description:base.field_res_users_log__write_uid
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__write_uid
 msgid "Last Updated by"
 msgstr "Последний раз обновил"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_write_date
-#: model:ir.model.fields,field_description:base.field_base_language_import_write_date
-#: model:ir.model.fields,field_description:base.field_base_language_install_write_date
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_write_date
-#: model:ir.model.fields,field_description:base.field_base_module_update_write_date
-#: model:ir.model.fields,field_description:base.field_base_module_upgrade_write_date
-#: model:ir.model.fields,field_description:base.field_base_update_translations_write_date
-#: model:ir.model.fields,field_description:base.field_change_password_user_write_date
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_client_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_server_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_url_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_write_date
-#: model:ir.model.fields,field_description:base.field_ir_act_window_write_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_282
-#: model:ir.model.fields,field_description:base.field_ir_attachment_write_date
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_date
-#: model:ir.model.fields,field_description:base.field_ir_cron_write_date
-#: model:ir.model.fields,field_description:base.field_ir_default_write_date
-#: model:ir.model.fields,field_description:base.field_ir_exports_line_write_date
-#: model:ir.model.fields,field_description:base.field_ir_exports_write_date
-#: model:ir.model.fields,field_description:base.field_ir_filters_write_date
-#: model:ir.model.fields,field_description:base.field_ir_logging_write_date
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_access_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_data_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_write_date
-#: model:ir.model.fields,field_description:base.field_ir_model_write_date
-#: model:ir.model.fields,field_description:base.field_ir_module_category_write_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_write_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_write_date
-#: model:ir.model.fields,field_description:base.field_ir_module_module_write_date
-#: model:ir.model.fields,field_description:base.field_ir_property_write_date
-#: model:ir.model.fields,field_description:base.field_ir_rule_write_date
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_write_date
-#: model:ir.model.fields,field_description:base.field_ir_sequence_write_date
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_write_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_write_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_write_date
-#: model:ir.model.fields,field_description:base.field_report_paperformat_write_date
-#: model:ir.model.fields,field_description:base.field_res_bank_write_date
-#: model:ir.model.fields,field_description:base.field_res_company_write_date
-#: model:ir.model.fields,field_description:base.field_res_config_installer_write_date
-#: model:ir.model.fields,field_description:base.field_res_config_settings_write_date
-#: model:ir.model.fields,field_description:base.field_res_config_write_date
-#: model:ir.model.fields,field_description:base.field_res_country_group_write_date
-#: model:ir.model.fields,field_description:base.field_res_country_state_write_date
-#: model:ir.model.fields,field_description:base.field_res_country_write_date
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_write_date
-#: model:ir.model.fields,field_description:base.field_res_currency_write_date
-#: model:ir.model.fields,field_description:base.field_res_groups_write_date
-#: model:ir.model.fields,field_description:base.field_res_lang_write_date
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_write_date
-#: model:ir.model.fields,field_description:base.field_res_partner_category_write_date
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_write_date
-#: model:ir.model.fields,field_description:base.field_res_partner_title_write_date
-#: model:ir.model.fields,field_description:base.field_res_partner_write_date
-#: model:ir.model.fields,field_description:base.field_res_users_log_write_date
-#: model:ir.model.fields,field_description:base.field_res_users_write_date
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_write_date
+#: model:ir.model.fields,field_description:base.field_base_language_export__write_date
+#: model:ir.model.fields,field_description:base.field_base_language_import__write_date
+#: model:ir.model.fields,field_description:base.field_base_language_install__write_date
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__write_date
+#: model:ir.model.fields,field_description:base.field_base_module_update__write_date
+#: model:ir.model.fields,field_description:base.field_base_module_upgrade__write_date
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__write_date
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__write_date
+#: model:ir.model.fields,field_description:base.field_base_update_translations__write_date
+#: model:ir.model.fields,field_description:base.field_change_password_user__write_date
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_url__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__write_date
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__write_date
+#: model:ir.model.fields,field_description:base.field_ir_attachment__write_date
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__write_date
+#: model:ir.model.fields,field_description:base.field_ir_cron__write_date
+#: model:ir.model.fields,field_description:base.field_ir_default__write_date
+#: model:ir.model.fields,field_description:base.field_ir_exports__write_date
+#: model:ir.model.fields,field_description:base.field_ir_exports_line__write_date
+#: model:ir.model.fields,field_description:base.field_ir_filters__write_date
+#: model:ir.model.fields,field_description:base.field_ir_logging__write_date
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model_access__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model_data__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__write_date
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__write_date
+#: model:ir.model.fields,field_description:base.field_ir_module_category__write_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module__write_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__write_date
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__write_date
+#: model:ir.model.fields,field_description:base.field_ir_property__write_date
+#: model:ir.model.fields,field_description:base.field_ir_rule__write_date
+#: model:ir.model.fields,field_description:base.field_ir_sequence__write_date
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__write_date
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__write_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__write_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__write_date
+#: model:ir.model.fields,field_description:base.field_report_paperformat__write_date
+#: model:ir.model.fields,field_description:base.field_res_bank__write_date
+#: model:ir.model.fields,field_description:base.field_res_company__write_date
+#: model:ir.model.fields,field_description:base.field_res_config__write_date
+#: model:ir.model.fields,field_description:base.field_res_config_installer__write_date
+#: model:ir.model.fields,field_description:base.field_res_config_settings__write_date
+#: model:ir.model.fields,field_description:base.field_res_country__write_date
+#: model:ir.model.fields,field_description:base.field_res_country_group__write_date
+#: model:ir.model.fields,field_description:base.field_res_country_state__write_date
+#: model:ir.model.fields,field_description:base.field_res_currency__write_date
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__write_date
+#: model:ir.model.fields,field_description:base.field_res_groups__write_date
+#: model:ir.model.fields,field_description:base.field_res_lang__write_date
+#: model:ir.model.fields,field_description:base.field_res_partner__write_date
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__write_date
+#: model:ir.model.fields,field_description:base.field_res_partner_category__write_date
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__write_date
+#: model:ir.model.fields,field_description:base.field_res_partner_title__write_date
+#: model:ir.model.fields,field_description:base.field_res_users__write_date
+#: model:ir.model.fields,field_description:base.field_res_users_log__write_date
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__write_date
 msgid "Last Updated on"
 msgstr "Последнее обновление"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_installed_version
+#: model:ir.model.fields,field_description:base.field_ir_module_module__installed_version
 msgid "Latest Version"
 msgstr "Последняя версия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_login_date
+#: model:ir.model.fields,field_description:base.field_res_users__login_date
 msgid "Latest connection"
 msgstr "Последнее подключение"
 
@@ -13356,7 +13643,7 @@ msgid "Launchpad"
 msgstr "Launchpad"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_address_format
+#: model:ir.model.fields,field_description:base.field_res_country__address_format
 msgid "Layout in Reports"
 msgstr ""
 
@@ -13411,12 +13698,12 @@ msgid "Ledger  28  431.8 x 279.4 mm"
 msgstr "Ledger  28  431.8 x 279.4 мм"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_left
+#: model:ir.model.fields,field_description:base.field_report_paperformat__margin_left
 msgid "Left Margin (mm)"
 msgstr "Левое поле (мм)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_parent_left
+#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_left
 msgid "Left parent"
 msgstr "Родитель слева"
 
@@ -13456,7 +13743,7 @@ msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
 msgstr "Letter 2 8.5 x 11 дюймов, 215.9 x 279.4 мм"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_level
+#: model:ir.model.fields,field_description:base.field_ir_logging__level
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
 msgid "Level"
 msgstr "Уровень"
@@ -13472,7 +13759,7 @@ msgid "Libya"
 msgstr "Ливия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_license
+#: model:ir.model.fields,field_description:base.field_ir_module_module__license
 msgid "License"
 msgstr "Лицензия"
 
@@ -13482,16 +13769,21 @@ msgid "Liechtenstein"
 msgstr "Лихтенштейн"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_limit
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__limit
 msgid "Limit"
 msgstr "Лимит"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_line
+#: model:ir.model.fields,field_description:base.field_ir_logging__line
 msgid "Line"
 msgstr "Строка"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__line_ids
+msgid "Lines"
+msgstr "Строки"
+
+#. module: base
 #: model:ir.module.module,description:base.module_account_payment
 msgid ""
 "Link Account and Payment and add Portal Payment\n"
@@ -13536,23 +13828,23 @@ msgid "Link module between project_forecast and sale(_timesheet)"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_link_field_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_link_field_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__link_field_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__link_field_id
 msgid "Link using field"
 msgstr "Поле для используемой ссылки"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_modules
+#: model:ir.model.fields,help:base.field_ir_model_fields__modules
 msgid "List of modules in which the field is defined"
 msgstr "Список модулей, в которых используется данное поле"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_modules
+#: model:ir.model.fields,help:base.field_ir_model__modules
 msgid "List of modules in which the object is defined or inherited"
 msgstr "Список модулей, в котором объект декларируется или наследуется"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_selection
+#: model:ir.model.fields,help:base.field_ir_model_fields__selection
 msgid ""
 "List of options for a selection field, specified as a Python expression "
 "defining a list of (key, label) pairs. For example: "
@@ -13595,7 +13887,7 @@ msgid "Load a Translation"
 msgstr "Загрузить перевод"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_code
+#: model:ir.model.fields,field_description:base.field_res_lang__code
 msgid "Locale Code"
 msgstr "Код Локализации"
 
@@ -13617,12 +13909,12 @@ msgid "Logging"
 msgstr "Логирование"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_login
+#: model:ir.model.fields,field_description:base.field_res_users__login
 msgid "Login"
 msgstr "Логин"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_logo_web
+#: model:ir.model.fields,field_description:base.field_res_company__logo_web
 msgid "Logo Web"
 msgstr "Web Логотип"
 
@@ -13679,6 +13971,7 @@ msgstr "MRP Субпродукты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_quality_mrp
+#: model:ir.module.module,shortdesc:base.module_quality_mrp_workorder
 msgid "MRP features for Quality Control"
 msgstr ""
 
@@ -13734,7 +14027,7 @@ msgid "Mailing List Archive"
 msgstr "Архивированный список рассылки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_sequence_id
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__sequence_id
 msgid "Main Sequence"
 msgstr "Основная Последовательность"
 
@@ -13745,7 +14038,7 @@ msgid "Main action of Current Window"
 msgstr "Основное действие текущего окна"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_maintainer
+#: model:ir.model.fields,field_description:base.field_ir_module_module__maintainer
 msgid "Maintainer"
 msgstr "Координатор"
 
@@ -13859,18 +14152,16 @@ msgstr ""
 "Управление банковскими записями, которые вы хотите использовать в системе."
 
 #. module: base
-#: model:ir.module.module,summary:base.module_hr_attendance
-msgid "Manage employee attendances"
-msgstr "Управление посещаемостью сотрудников"
-
-#. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
 msgid ""
-"Manage partner tags to better classify them for tracking and analysis purposes.\n"
-"                    A partner may have several categories and categories have a hierarchical structure: a partner with a category has also the parent category."
+"Manage contact tags to better classify them for tracking and analysis "
+"purposes."
 msgstr ""
-"Управляйте тегами партнеров, чтобы лучше классифицировать их для целей отслеживания и анализа.\n"
-"                     Партнер может иметь несколько категорий и категорий, имеющих иерархическую структуру: партнер с категорией также имеет родительскую категорию."
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_attendance
+msgid "Manage employee attendances"
+msgstr "Управление посещаемостью сотрудников"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.res_partner_industry_action
@@ -13949,6 +14240,11 @@ msgstr "Маркетинг"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_marketing_automation
 msgid "Marketing Automation"
+msgstr "Marketing Automation"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_test_marketing_automation
+msgid "Marketing Automation Tests"
 msgstr ""
 
 #. module: base
@@ -14008,19 +14304,24 @@ msgid "Mauritius"
 msgstr "Маврикий"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__maximum_group
+msgid "Maximum of Group of Contacts"
+msgstr "Максимум групп контактов"
+
+#. module: base
 #: model:res.country,name:base.yt
 msgid "Mayotte"
 msgstr "Майотта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_image_medium
-#: model:ir.model.fields,field_description:base.field_res_users_image_medium
+#: model:ir.model.fields,field_description:base.field_res_partner__image_medium
+#: model:ir.model.fields,field_description:base.field_res_users__image_medium
 msgid "Medium-sized image"
 msgstr "Изображение средних размеров"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_image_medium
-#: model:ir.model.fields,help:base.field_res_users_image_medium
+#: model:ir.model.fields,help:base.field_res_partner__image_medium
+#: model:ir.model.fields,help:base.field_res_users__image_medium
 msgid ""
 "Medium-sized image of this contact. It is automatically resized as a "
 "128x128px image, with aspect ratio preserved. Use this field in form views "
@@ -14041,7 +14342,7 @@ msgid "Memos pad"
 msgstr "Планшет заметок"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__name
 #: model:ir.ui.view,arch_db:base.edit_menu
 #: model:ir.ui.view,arch_db:base.edit_menu_access
 #: model:ir.ui.view,arch_db:base.edit_menu_access_search
@@ -14056,12 +14357,12 @@ msgid "Menu Items"
 msgstr "Пункты Меню"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_name
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__name
 msgid "Menu Name"
 msgstr "Наименование Меню"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_menus_by_module
+#: model:ir.model.fields,field_description:base.field_ir_module_module__menus_by_module
 #: model:ir.ui.view,arch_db:base.view_groups_form
 msgid "Menus"
 msgstr "Меню"
@@ -14077,7 +14378,37 @@ msgid "Mercury Payment Services"
 msgstr "Платежный сервис Mercury"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_message
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Merge Automatically"
+msgstr "Объединить автоматически"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Merge Automatically all process"
+msgstr "Объединить автоматически все процессы"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Merge Contacts"
+msgstr "Объединить контакты"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_merge
+msgid "Merge Selected Contacts"
+msgstr "Объединить выделенные контакты"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Merge the following contacts"
+msgstr "Объединить следующие контакты"
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Merge with Manual Check"
+msgstr "Объединить с ручным выбором"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_logging__message
 msgid "Message"
 msgstr "Сообщение"
 
@@ -14087,7 +14418,7 @@ msgid "Messaging and Social"
 msgstr "Сообщения и Социальные сети"
 
 #. module: base
-#: code:addons/base/models/res_config.py:499
+#: code:addons/base/models/res_config.py:545
 #, python-format
 msgid ""
 "Methods that start with `get_default_` are deprecated. Override `get_values`"
@@ -14095,7 +14426,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_config.py:543
+#: code:addons/base/models/res_config.py:605
 #, python-format
 msgid ""
 "Methods that start with `set_` are deprecated. Override `set_values` instead"
@@ -14123,11 +14454,16 @@ msgid "Micronesia"
 msgstr "Микронезия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_mimetype
+#: model:ir.model.fields,field_description:base.field_ir_attachment__mimetype
 msgid "Mime Type"
 msgstr "Тип Mime"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__min_id
+msgid "MinID"
+msgstr "MinID"
+
+#. module: base
 #: model:res.partner.industry,name:base.res_partner_industry_B
 msgid "Mining"
 msgstr ""
@@ -14166,19 +14502,19 @@ msgid "Missing SMTP Server"
 msgstr "Отсутствует SMTP сервер"
 
 #. module: base
-#: code:addons/models.py:2774
+#: code:addons/models.py:2782
 #, python-format
 msgid "Missing document(s)"
 msgstr "Отсутствует документ(ы)"
 
 #. module: base
-#: code:addons/models.py:5132
+#: code:addons/models.py:5176
 #, python-format
 msgid "Missing required value for the field '%s' (%s)"
 msgstr "Отсутствует требуемое значение для поля '%s'  (%s)"
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:373
+#: code:addons/base/models/ir_ui_view.py:387
 #, python-format
 msgid "Missing view architecture."
 msgstr ""
@@ -14189,8 +14525,8 @@ msgid "Mister"
 msgstr "Господин"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_mobile
-#: model:ir.model.fields,field_description:base.field_res_users_mobile
+#: model:ir.model.fields,field_description:base.field_res_partner__mobile
+#: model:ir.model.fields,field_description:base.field_res_users__mobile
 #: model:ir.module.category,name:base.module_category_mobile
 #: model:ir.module.module,shortdesc:base.module_web_mobile
 msgid "Mobile"
@@ -14202,18 +14538,15 @@ msgid "Mobile:"
 msgstr "Мобильный:"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_model
-#: model:ir.model.fields,field_description:base.field_ir_act_server_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_server_model_name
-#: model:ir.model.fields,field_description:base.field_ir_cron_model_id
-#: model:ir.model.fields,field_description:base.field_ir_cron_model_name
-#: model:ir.model.fields,field_description:base.field_ir_filters_model_id
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_model
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_model_id
-#: model:ir.model.fields,field_description:base.field_ir_model_model
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_model
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_model
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_model_ids
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__model
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__model_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__model_id
+#: model:ir.model.fields,field_description:base.field_ir_filters__model_id
+#: model:ir.model.fields,field_description:base.field_ir_model__model
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__model
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__model_id
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__model
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__model
 #: model:ir.ui.view,arch_db:base.act_report_xml_search_view
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
 #: model:ir.ui.view,arch_db:base.view_model_search
@@ -14243,14 +14576,14 @@ msgid "Model Constraints"
 msgstr "Ограничения Модели"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_model_data_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__model_data_id
 msgid "Model Data"
 msgstr "Данные Модели"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_crud_model_name
-#: model:ir.model.fields,field_description:base.field_ir_cron_crud_model_name
-#: model:ir.model.fields,field_description:base.field_ir_model_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__crud_model_name
+#: model:ir.model.fields,field_description:base.field_ir_cron__crud_model_name
+#: model:ir.model.fields,field_description:base.field_ir_model__name
 #: model:ir.ui.view,arch_db:base.view_model_form
 #: model:ir.ui.view,arch_db:base.view_model_search
 #: model:ir.ui.view,arch_db:base.view_model_tree
@@ -14258,7 +14591,9 @@ msgid "Model Description"
 msgstr "Описание Модели"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_model
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__model_name
+#: model:ir.model.fields,field_description:base.field_ir_cron__model_name
+#: model:ir.model.fields,field_description:base.field_ir_model_data__model
 msgid "Model Name"
 msgstr "Название модели"
 
@@ -14268,8 +14603,8 @@ msgid "Model Overview"
 msgstr "Обзор Модели"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_crud_model_id
-#: model:ir.model.fields,help:base.field_ir_cron_crud_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_server__crud_model_id
+#: model:ir.model.fields,help:base.field_ir_cron__crud_model_id
 msgid ""
 "Model for record creation / update. Set this field only to specify a "
 "different model than the base model."
@@ -14278,26 +14613,27 @@ msgstr ""
 "указания другой модели, чем базовая модель."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_res_model
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__res_model
 msgid "Model name of the object to open in the view window"
 msgstr "Название модели объекта, отображаемой в окне представления"
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:757
-#: code:addons/base/models/ir_ui_view.py:870
+#: code:addons/base/models/ir_ui_view.py:771
+#: code:addons/base/models/ir_ui_view.py:987
 #, python-format
 msgid "Model not found: %(model)s"
 msgstr "Модель не найдена: %(model)s"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_model_id
-#: model:ir.model.fields,help:base.field_ir_cron_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_server__model_id
+#: model:ir.model.fields,help:base.field_ir_cron__model_id
 msgid "Model on which the server action runs."
 msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
 #: model:ir.model,name:base.model_ir_model
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__model_ids
 #: model:ir.ui.menu,name:base.ir_model_model_menu
 #: model:ir.ui.view,arch_db:base.view_base_module_uninstall
 msgid "Models"
@@ -14305,13 +14641,13 @@ msgstr "Модели"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_module_id
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_module
-#: model:ir.model.fields,field_description:base.field_ir_model_data_module
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_module
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_module_id
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_module_id
-#: model:ir.model.fields,field_description:base.field_ir_translation_module
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__module_id
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__module
+#: model:ir.model.fields,field_description:base.field_ir_model_data__module
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__module
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__module_id
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__module_id
+#: model:ir.model.fields,field_description:base.field_ir_translation__module
 #: model:ir.ui.view,arch_db:base.module_form
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
 #: model:ir.ui.view,arch_db:base.view_model_data_search
@@ -14326,7 +14662,7 @@ msgid "Module Category"
 msgstr "Категория Модуля"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_shortdesc
+#: model:ir.model.fields,field_description:base.field_ir_module_module__shortdesc
 #: model:ir.ui.view,arch_db:base.module_form
 msgid "Module Name"
 msgstr "Наименование Модуля"
@@ -14334,7 +14670,7 @@ msgstr "Наименование Модуля"
 #. module: base
 #: model:ir.model,name:base.model_base_module_uninstall
 msgid "Module Uninstallation"
-msgstr ""
+msgstr "Деинсталляция модуля"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_update
@@ -14375,12 +14711,12 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_translation_module
+#: model:ir.model.fields,help:base.field_ir_translation__module
 msgid "Module this term belongs to"
 msgstr "Модуль к которому относится термин"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_module_ids
+#: model:ir.model.fields,field_description:base.field_ir_module_category__module_ids
 msgid "Modules"
 msgstr "Модули"
 
@@ -14401,6 +14737,11 @@ msgid "Monaco"
 msgstr "Монако"
 
 #. module: base
+#: selection:res.lang,week_start:0
+msgid "Monday"
+msgstr "Понедельник"
+
+#. module: base
 #: model:res.country,name:base.mn
 msgid "Mongolia"
 msgstr "Монголия"
@@ -14497,28 +14838,29 @@ msgid "N ADMINISTRATIVE AND SUPPORT SERVICE ACTIVITIES"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_name_272
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_name
-#: model:ir.model.fields,field_description:base.field_ir_cron_cron_name
-#: model:ir.model.fields,field_description:base.field_ir_logging_name
-#: model:ir.model.fields,field_description:base.field_ir_model_access_name
-#: model:ir.model.fields,field_description:base.field_ir_module_category_name
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_name
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_name
-#: model:ir.model.fields,field_description:base.field_ir_property_name
-#: model:ir.model.fields,field_description:base.field_ir_rule_name
-#: model:ir.model.fields,field_description:base.field_ir_sequence_name
-#: model:ir.model.fields,field_description:base.field_report_paperformat_name
-#: model:ir.model.fields,field_description:base.field_res_bank_name
-#: model:ir.model.fields,field_description:base.field_res_country_group_name
-#: model:ir.model.fields,field_description:base.field_res_groups_name
-#: model:ir.model.fields,field_description:base.field_res_lang_name
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_bank_name
-#: model:ir.model.fields,field_description:base.field_res_partner_industry_name
-#: model:ir.model.fields,field_description:base.field_res_partner_name
-#: model:ir.model.fields,field_description:base.field_res_users_name
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_close__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_actions__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__name
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__name
+#: model:ir.model.fields,field_description:base.field_ir_cron__cron_name
+#: model:ir.model.fields,field_description:base.field_ir_logging__name
+#: model:ir.model.fields,field_description:base.field_ir_model_access__name
+#: model:ir.model.fields,field_description:base.field_ir_module_category__name
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__name
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__name
+#: model:ir.model.fields,field_description:base.field_ir_property__name
+#: model:ir.model.fields,field_description:base.field_ir_rule__name
+#: model:ir.model.fields,field_description:base.field_ir_sequence__name
+#: model:ir.model.fields,field_description:base.field_report_paperformat__name
+#: model:ir.model.fields,field_description:base.field_res_bank__name
+#: model:ir.model.fields,field_description:base.field_res_country_group__name
+#: model:ir.model.fields,field_description:base.field_res_groups__name
+#: model:ir.model.fields,field_description:base.field_res_lang__name
+#: model:ir.model.fields,field_description:base.field_res_partner__name
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__bank_name
+#: model:ir.model.fields,field_description:base.field_res_partner_industry__name
+#: model:ir.model.fields,field_description:base.field_res_users__name
 #: model:ir.ui.view,arch_db:base.ir_property_view_search
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
 #: model:ir.ui.view,arch_db:base.view_partner_form
@@ -14575,7 +14917,7 @@ msgid "New Language (Empty translation template)"
 msgstr "Новый Язык (Шаблон пустого перевода)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_change_password_user_new_passwd
+#: model:ir.model.fields,field_description:base.field_change_password_user__new_passwd
 msgid "New Password"
 msgstr "Новый Пароль"
 
@@ -14602,27 +14944,27 @@ msgid "News, Blogs, Announces, Discussions"
 msgstr "Новости, блоги, анонсы, беседы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_nextcall
+#: model:ir.model.fields,field_description:base.field_ir_cron__nextcall
 msgid "Next Execution Date"
 msgstr "Дата следующего исполнения"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_number_next
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_number_next_actual
-#: model:ir.model.fields,field_description:base.field_ir_sequence_number_next
-#: model:ir.model.fields,field_description:base.field_ir_sequence_number_next_actual
+#: model:ir.model.fields,field_description:base.field_ir_sequence__number_next
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__number_next
+#: model:ir.ui.view,arch_db:base.sequence_view
+#: model:ir.ui.view,arch_db:base.sequence_view_tree
 msgid "Next Number"
 msgstr "Следующее Число"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_date_range_number_next
-#: model:ir.model.fields,help:base.field_ir_sequence_number_next
+#: model:ir.model.fields,help:base.field_ir_sequence__number_next
+#: model:ir.model.fields,help:base.field_ir_sequence_date_range__number_next
 msgid "Next number of this sequence"
 msgstr "Следующее число в этой последовательности"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_date_range_number_next_actual
-#: model:ir.model.fields,help:base.field_ir_sequence_number_next_actual
+#: model:ir.model.fields,help:base.field_ir_sequence__number_next_actual
+#: model:ir.model.fields,help:base.field_ir_sequence_date_range__number_next_actual
 msgid ""
 "Next number that will be used. This number can be incremented frequently so "
 "the displayed value might already be obsolete"
@@ -14632,7 +14974,7 @@ msgstr ""
 "быть устаревшим."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_cron_nextcall
+#: model:ir.model.fields,help:base.field_ir_cron__nextcall
 msgid "Next planned execution date for this job."
 msgstr "Следующая дата выполнения этой задачи планировщиком."
 
@@ -14662,7 +15004,7 @@ msgid "No Record Found"
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:1283
+#: code:addons/models.py:1299
 #, python-format
 msgid "No default view of type '%s' could be found !"
 msgstr "Не может быть найдено представление по умолчанию для типа '%s' !"
@@ -14673,7 +15015,7 @@ msgid "No gap"
 msgstr "Без пропусков"
 
 #. module: base
-#: code:addons/fields.py:2228
+#: code:addons/fields.py:2255
 #, python-format
 msgid "No inverse field %r found for %r"
 msgstr "Не найдено обратного поля %r для %r"
@@ -14694,14 +15036,19 @@ msgstr ""
 "Не найдено записей для  %(field_type)s '%(value)s' в поле '%%(field)s'"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_noupdate
-msgid "Non Updatable"
-msgstr "Не Обновляемый"
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__view_ids
+msgid "No of Views"
+msgstr "Nº de visitas"
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_groups_search
-msgid "Non-Portal Groups"
-msgstr "Группы не связанные с порталом"
+#: model:ir.actions.act_window,help:base.open_module_tree
+msgid "No website module found!"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_data__noupdate
+msgid "Non Updatable"
+msgstr "Не Обновляемый"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:439
@@ -14769,41 +15116,41 @@ msgid "Not Installed"
 msgstr "Не установлен"
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1361
+#: code:addons/base/models/ir_model.py:1365
 #, python-format
 msgid "Not enough access rights on the external ID:"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_comment
-#: model:ir.model.fields,field_description:base.field_res_users_comment
+#: model:ir.model.fields,field_description:base.field_res_partner__comment
+#: model:ir.model.fields,field_description:base.field_res_users__comment
 #: model:ir.ui.view,arch_db:base.view_groups_form
 #: model:ir.ui.view,arch_db:base.view_model_form
 msgid "Notes"
 msgstr "Заметки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_module_nr
+#: model:ir.model.fields,field_description:base.field_ir_module_category__module_nr
 msgid "Number of Apps"
 msgstr "Количество приложений"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_numbercall
+#: model:ir.model.fields,field_description:base.field_ir_cron__numbercall
 msgid "Number of Calls"
 msgstr "Количество запусков"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_companies_count
+#: model:ir.model.fields,field_description:base.field_res_users__companies_count
 msgid "Number of Companies"
 msgstr "Количество компаний"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_update_added
+#: model:ir.model.fields,field_description:base.field_base_module_update__added
 msgid "Number of modules added"
 msgstr "Количество добавленных модулей"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_update_updated
+#: model:ir.model.fields,field_description:base.field_base_module_update__updated
 msgid "Number of modules updated"
 msgstr "Количество обновленных модулей"
 
@@ -14823,8 +15170,8 @@ msgid "OHADA - Accounting"
 msgstr "OHADA - Бухгалтерия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_model_id
-#: model:ir.model.fields,field_description:base.field_ir_rule_model_id
+#: model:ir.model.fields,field_description:base.field_ir_model_access__model_id
+#: model:ir.model.fields,field_description:base.field_ir_rule__model_id
 #: selection:ir.translation,type:0
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 #: model:ir.ui.view,arch_db:base.view_model_data_search
@@ -14841,12 +15188,12 @@ msgid "Object %s doesn't exist"
 msgstr "Объект %s не существует !"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_model
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__model
 msgid "Object Name"
 msgstr "Название Объекта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__relation
 msgid "Object Relation"
 msgstr "Отношение Объекта"
 
@@ -15514,7 +15861,7 @@ msgid ""
 "\n"
 "### Designed for Productivity\n"
 "\n"
-"Whether it's for a restaurant or a shop, you can activate the multiple tickets\n"
+"Whether it's for a restaurant or a shop, you can activate the multiple orders\n"
 "in parallel to not make your customers wait.\n"
 "\n"
 "### Blazing fast search\n"
@@ -15938,28 +16285,16 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_customer_form
 #: model:ir.actions.act_window,help:base.action_partner_form
-msgid ""
-"Odoo helps you easily track all activities related to\n"
-"                a customer: discussions, history of business opportunities,\n"
-"                documents, etc."
+msgid "Odoo helps you easily track all activities related to a customer."
 msgstr ""
-"Odoo помогает легко отслеживать все мероприятия,\n"
-"связанные с заказчиком: обсуждения, историю деловых\n"
-"возможностей. документы и т. п."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
-msgid ""
-"Odoo helps you easily track all activities related to\n"
-"                a supplier: discussions, history of purchases,\n"
-"                documents, etc."
+msgid "Odoo helps you easily track all activities related to a vendor."
 msgstr ""
-"Odoo помогает легко отслеживать все мероприятия,\n"
-"связанные с поставщиком: обсуждения, историю запросов,\n"
-"документы и т. п."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_padding
+#: model:ir.model.fields,help:base.field_ir_sequence__padding
 msgid ""
 "Odoo will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
@@ -15979,23 +16314,23 @@ msgid "Oman"
 msgstr "Оман"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_on_delete
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__on_delete
 msgid "On Delete"
 msgstr "При удалении"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_multi
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_multi
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__multi
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__multi
 msgid "On Multiple Doc."
 msgstr "На множестве док."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_on_delete
+#: model:ir.model.fields,help:base.field_ir_model_fields__on_delete
 msgid "On delete property for many2one fields"
 msgstr "При удалении свояства для полей many2one"
 
 #. module: base
-#: code:addons/models.py:2774
+#: code:addons/models.py:2782
 #, python-format
 msgid ""
 "One of the documents you are trying to access has been deleted, please try "
@@ -16005,7 +16340,7 @@ msgstr ""
 "еще раз после обновления ."
 
 #. module: base
-#: code:addons/models.py:3098
+#: code:addons/models.py:3122
 #, python-format
 msgid ""
 "One of the records you are trying to modify has already been deleted "
@@ -16015,7 +16350,7 @@ msgstr ""
 "%s)."
 
 #. module: base
-#: code:addons/base/models/res_partner.py:392
+#: code:addons/base/models/res_partner.py:391
 #, python-format
 msgid ""
 "One2Many fields cannot be synchronized as part of `commercial_fields` or "
@@ -16050,19 +16385,19 @@ msgid "Online Subscription Quotes"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_config.py:514
+#: code:addons/base/models/res_config.py:560
 #, python-format
 msgid "Only administrators can change the settings"
 msgstr "Только администраторы могут изменять настройки"
 
 #. module: base
-#: code:addons/base/models/ir_attachment.py:56
+#: code:addons/base/models/ir_attachment.py:57
 #, python-format
 msgid "Only administrators can execute this action."
 msgstr "Только администраторы могут выполнить это действие."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_ui_view_mode
+#: model:ir.model.fields,help:base.field_ir_ui_view__mode
 msgid ""
 "Only applies if this view inherits from an other one (inherit_id is not False/Null).\n"
 "\n"
@@ -16090,7 +16425,19 @@ msgid "Only one currency rate per day allowed!"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1175
+#: code:addons/base/wizard/base_partner_merge.py:286
+#, python-format
+msgid ""
+"Only the destination contact may be linked to existing Journal Items. Please"
+" ask the Administrator if you need to merge several contacts linked to "
+"existing Journal Items."
+msgstr ""
+"Только контакт адресата может быть связан с существующими элементами "
+"журнала. Попросите администратора, если вам нужно объединить несколько "
+"контактов, связанных с существующими элементами журнала."
+
+#. module: base
+#: code:addons/base/models/ir_model.py:1179
 #, python-format
 msgid ""
 "Only users with the following access level are currently allowed to do that"
@@ -16198,20 +16545,25 @@ msgid "Opportunity to Quotation"
 msgstr "Возможность в Запрос цен"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_domain
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Option"
+msgstr "Параметр"
+
+#. module: base
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__domain
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
 msgstr "Дополнительная фильтрация выходных данных, в виде выражения на Python"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_help
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_help
-#: model:ir.model.fields,help:base.field_ir_act_server_help
-#: model:ir.model.fields,help:base.field_ir_act_url_help
-#: model:ir.model.fields,help:base.field_ir_act_window_help
-#: model:ir.model.fields,help:base.field_ir_actions_help
-#: model:ir.model.fields,help:base.field_ir_actions_help_274
-#: model:ir.model.fields,help:base.field_ir_cron_help
+#: model:ir.model.fields,help:base.field_ir_actions_act_url__help
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__help
+#: model:ir.model.fields,help:base.field_ir_actions_act_window_close__help
+#: model:ir.model.fields,help:base.field_ir_actions_actions__help
+#: model:ir.model.fields,help:base.field_ir_actions_client__help
+#: model:ir.model.fields,help:base.field_ir_actions_report__help
+#: model:ir.model.fields,help:base.field_ir_actions_server__help
+#: model:ir.model.fields,help:base.field_ir_cron__help
 msgid ""
 "Optional help text for the users with a description of the target view, such"
 " as its usage and purpose."
@@ -16220,28 +16572,33 @@ msgstr ""
 "представления, например его использования или предназначения."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_src_model
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__src_model
 msgid ""
 "Optional model name of the objects on which this action should be visible"
 msgstr ""
 "Необязательное имя модели объектов, для которых действие должно быть видимым"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_res_model
+#: model:ir.model.fields,help:base.field_ir_actions_client__res_model
 msgid "Optional model, mostly used for needactions."
 msgstr "Дополнительная модель, в основном используется для needactions."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_pass
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_pass
 msgid "Optional password for SMTP authentication"
 msgstr "Пароль для SMTP авторизации (опционально)"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_user
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_user
 msgid "Optional username for SMTP authentication"
 msgstr "Необязательное имя пользователя для аутентификации SMTP"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Options"
+msgstr "Параметры"
+
+#. module: base
 #: model:ir.module.module,description:base.module_website_event_track
 msgid ""
 "Organize Events, Trainings & Webinars\n"
@@ -16361,7 +16718,7 @@ msgid ""
 "-   Calendar of Events\n"
 "-   Publish related documents\n"
 "-   Ressources allocation\n"
-"-   Automate purchases (cathering...)\n"
+"-   Automate purchases (catering...)\n"
 "-   Multiple locations and organizers\n"
 "-   Mobile Interface\n"
 "\n"
@@ -16405,18 +16762,18 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_orientation
+#: model:ir.model.fields,field_description:base.field_report_paperformat__orientation
 msgid "Orientation"
 msgstr "Ориентация"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_ref_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__ref_id
 msgid "Original View"
 msgstr "Исходный вид"
 
 #. module: base
-#: code:addons/base/models/res_users.py:734
-#: code:addons/base/models/res_users.py:895
+#: code:addons/base/models/res_users.py:773
+#: code:addons/base/models/res_users.py:938
 #, python-format
 msgid "Other"
 msgstr "Другое"
@@ -16485,18 +16842,18 @@ msgid "Outgoing Mail Servers"
 msgstr "Сервера отправки почты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_dpi
+#: model:ir.model.fields,field_description:base.field_report_paperformat__dpi
 msgid "Output DPI"
 msgstr "Разрешение вывода (точек на дюйм)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_import_overwrite
-#: model:ir.model.fields,field_description:base.field_base_language_install_overwrite
+#: model:ir.model.fields,field_description:base.field_base_language_import__overwrite
+#: model:ir.model.fields,field_description:base.field_base_language_install__overwrite
 msgid "Overwrite Existing Terms"
 msgstr "Заменить существующие термины"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_create_uid
+#: model:ir.model.fields,field_description:base.field_ir_attachment__create_uid
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 msgid "Owner"
 msgstr "Владелец"
@@ -16533,12 +16890,12 @@ msgid "Pad on tasks"
 msgstr "Планшет по задачам"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_page_height
+#: model:ir.model.fields,field_description:base.field_report_paperformat__page_height
 msgid "Page height (mm)"
 msgstr "Высота страницы (мм)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_page_width
+#: model:ir.model.fields,field_description:base.field_report_paperformat__page_width
 msgid "Page width (mm)"
 msgstr "Ширина страницы (мм)"
 
@@ -16573,8 +16930,8 @@ msgid "Paper Format General Configuration"
 msgstr "Общая конфигурация размера бумаги"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_paperformat_id
-#: model:ir.model.fields,field_description:base.field_res_company_paperformat_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__paperformat_id
+#: model:ir.model.fields,field_description:base.field_res_company__paperformat_id
 msgid "Paper format"
 msgstr "Размер бумаги"
 
@@ -16585,7 +16942,7 @@ msgid "Paper format configuration"
 msgstr "Конфигурация размера бумаги"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_format
+#: model:ir.model.fields,field_description:base.field_report_paperformat__format
 msgid "Paper size"
 msgstr "Размер бумаги"
 
@@ -16613,49 +16970,50 @@ msgid "Parameters that are used by all resources."
 msgstr "Параметры, используемые всеми ресурсами"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_params_store
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__params_store
 msgid "Params storage"
 msgstr "Хранилище параметров"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_parent_id
+#: model:ir.model.fields,field_description:base.field_ir_module_category__parent_id
 msgid "Parent Application"
 msgstr "Родительское Приложение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_parent_id
+#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_id
 msgid "Parent Category"
 msgstr "Категория предка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_parent_id
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_parent_id
+#: model:ir.model.fields,field_description:base.field_res_company__parent_id
 msgid "Parent Company"
 msgstr "Родительская компания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_left
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_left
 msgid "Parent Left"
 msgstr "Левый родительский элемент"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_id
-#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_menu_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_id
+#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__menu_id
 msgid "Parent Menu"
 msgstr "Родительское Меню"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_right
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_right
 msgid "Parent Right"
 msgstr "Правый родительский элемент"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_parent_name
-#: model:ir.model.fields,field_description:base.field_res_users_parent_name
+#: model:ir.model.fields,field_description:base.field_res_partner__parent_name
+#: model:ir.model.fields,field_description:base.field_res_users__parent_name
 msgid "Parent name"
 msgstr "Наименование родительского элемента"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_partner_id
+#: model:ir.model.fields,field_description:base.field_res_company__partner_id
 #: model:ir.ui.view,arch_db:base.view_partner_address_form
 msgid "Partner"
 msgstr "Партнёр"
@@ -16677,12 +17035,13 @@ msgid "Partner Titles"
 msgstr "Заголовок Партнера"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_partner_id
+#: model:ir.model.fields,help:base.field_res_users__partner_id
 msgid "Partner-related data of the user"
 msgstr "Данные пользователя, относящиеся к партнеру"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_partner_ids
+#: model:ir.model.fields,field_description:base.field_res_partner_category__partner_ids
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
 #: model:ir.ui.view,arch_db:base.view_partner_form
 #: model:ir.ui.view,arch_db:base.view_partner_short_form
 msgid "Partners"
@@ -16696,14 +17055,14 @@ msgstr ""
 "    "
 
 #. module: base
-#: code:addons/base/models/res_partner.py:765
+#: code:addons/base/models/res_partner.py:764
 #, python-format
 msgid "Partners: "
 msgstr "Партнеры:"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_pass
-#: model:ir.model.fields,field_description:base.field_res_users_password
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_pass
+#: model:ir.model.fields,field_description:base.field_res_users__password
 msgid "Password"
 msgstr "Пароль"
 
@@ -16713,7 +17072,7 @@ msgid "Password Encryption"
 msgstr "Шифрование пароля"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_path
+#: model:ir.model.fields,field_description:base.field_ir_logging__path
 msgid "Path"
 msgstr "Путь"
 
@@ -16843,10 +17202,10 @@ msgid "Philippines"
 msgstr "Филиппины"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_phone
-#: model:ir.model.fields,field_description:base.field_res_company_phone
-#: model:ir.model.fields,field_description:base.field_res_partner_phone
-#: model:ir.model.fields,field_description:base.field_res_users_phone
+#: model:ir.model.fields,field_description:base.field_res_bank__phone
+#: model:ir.model.fields,field_description:base.field_res_company__phone
+#: model:ir.model.fields,field_description:base.field_res_partner__phone
+#: model:ir.model.fields,field_description:base.field_res_users__phone
 msgid "Phone"
 msgstr "Телефон"
 
@@ -16877,7 +17236,7 @@ msgid "Plano de contas SNC para Portugal"
 msgstr "План SNC счетов для Португалии"
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1178
+#: code:addons/base/models/ir_model.py:1182
 #, python-format
 msgid ""
 "Please contact your system administrator if you think this is an error."
@@ -16901,7 +17260,7 @@ msgid "Please set the Model to Create before choosing values"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_users.py:250
+#: code:addons/base/models/res_users.py:251
 #, python-format
 msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
@@ -16947,17 +17306,11 @@ msgid "Poland - Accounting Reports"
 msgstr "Польша - Бухгалтерские отчёты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_is_portal
 #: model:res.groups,name:base.group_portal
 msgid "Portal"
 msgstr "Портал"
 
 #. module: base
-#: model:ir.ui.view,arch_db:base.view_groups_search
-msgid "Portal Groups"
-msgstr "Группы портала"
-
-#. module: base
 #: model:res.groups,comment:base.group_portal
 msgid ""
 "Portal members have specific access rights (such as record rules and restricted menus).\n"
@@ -16992,17 +17345,17 @@ msgid "PosBox Software Upgrader"
 msgstr "Модернизация программного обеспечения PosBox"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_constraint_definition
+#: model:ir.model.fields,help:base.field_ir_model_constraint__definition
 msgid "PostgreSQL constraint definition"
 msgstr "Определение ограничения PostgreSQL"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_constraint_name
+#: model:ir.model.fields,help:base.field_ir_model_constraint__name
 msgid "PostgreSQL constraint or foreign key name."
 msgstr "Ограничение PostgreSQL или имя внешнего ключа."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_relation_name
+#: model:ir.model.fields,help:base.field_ir_model_relation__name
 msgid "PostgreSQL table name implementing a many2many relation."
 msgstr "Название таблицы PostgreSQL реализующее связь many2many."
 
@@ -17012,12 +17365,12 @@ msgid "Preferences"
 msgstr "Параметры"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_prefix
+#: model:ir.model.fields,field_description:base.field_ir_sequence__prefix
 msgid "Prefix"
 msgstr "Префикс"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_prefix
+#: model:ir.model.fields,help:base.field_ir_sequence__prefix
 msgid "Prefix value of the record for the sequence"
 msgstr "Префикс для нумерации"
 
@@ -17032,6 +17385,11 @@ msgid "Price Accuracy"
 msgstr "Точность цены"
 
 #. module: base
+#: model:ir.module.module,summary:base.module_l10n_ca_check_printing
+msgid "Print CA Checks"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_print
 msgid "Print Invoice"
 msgstr "Печать Счета-фактуры"
@@ -17084,18 +17442,18 @@ msgid "Print and Send your Sales Order by Post"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_print_report_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__print_report_name
 msgid "Printed Report Name"
 msgstr "Название печатного отчета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_priority
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_sequence
+#: model:ir.model.fields,field_description:base.field_ir_cron__priority
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__sequence
 msgid "Priority"
 msgstr "Приоритет"
 
 #. module: base
-#: code:addons/models.py:110
+#: code:addons/models.py:111
 #, python-format
 msgid "Private methods (such as %s) cannot be called remotely."
 msgstr "Частные методы (такие как %s) не могут быть вызваны удаленно."
@@ -17118,7 +17476,7 @@ msgstr "Шаблон письма о товаре"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_plm
 msgid "Product Lifecycle Management (PLM)"
-msgstr ""
+msgstr "Управление жизненным циклом продукта (ЖЦП)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_extended
@@ -17274,11 +17632,11 @@ msgid "Propose to install a theme on website installation"
 msgstr "Предложить установить тему при установке веб-сайта"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_link_field_id
-#: model:ir.model.fields,help:base.field_ir_cron_link_field_id
+#: model:ir.model.fields,help:base.field_ir_actions_server__link_field_id
+#: model:ir.model.fields,help:base.field_ir_cron__link_field_id
 msgid ""
-"Provide the field used to link the newly created recordon the record on used"
-" by the server action."
+"Provide the field used to link the newly created record on the record on "
+"used by the server action."
 msgstr ""
 
 #. module: base
@@ -17326,7 +17684,7 @@ msgid "Publish Your Customer References"
 msgstr "Опубликуйте ваши отзывы клиентов"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_published_version
+#: model:ir.model.fields,field_description:base.field_ir_module_module__published_version
 msgid "Published Version"
 msgstr "Опубликованная версия"
 
@@ -17372,8 +17730,8 @@ msgid "Push notification for mobile app"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_code
-#: model:ir.model.fields,field_description:base.field_ir_cron_code
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__code
+#: model:ir.model.fields,field_description:base.field_ir_cron__code
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "Python Code"
 msgstr "Код на Python"
@@ -17404,17 +17762,23 @@ msgid "Qatar"
 msgstr "Катар"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_quality
+#: model:ir.module.module,summary:base.module_quality_control
 msgid "Quality Alerts and Control Points"
 msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_quality
+msgid "Quality Base"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_quality_control
 msgid "Quality Control"
 msgstr "Контроль качества"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_quality_mrp
+#: model:ir.module.module,summary:base.module_quality_mrp_workorder
 msgid "Quality Management with MRP"
 msgstr ""
 
@@ -17441,7 +17805,7 @@ msgid "Quotations, Sales Orders, Invoicing"
 msgstr "Предложения, заказы, счета"
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:336
+#: code:addons/base/models/ir_ui_view.py:350
 #, python-format
 msgid ""
 "Qweb view cannot have 'Groups' define on the record. Use 'groups' attributes"
@@ -17456,18 +17820,18 @@ msgid "R ARTS, ENTERTAINMENT AND RECREATION"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_rate
+#: model:ir.model.fields,field_description:base.field_res_currency_rate__rate
 msgid "Rate"
 msgstr "Курс"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_rate_ids
+#: model:ir.model.fields,field_description:base.field_res_currency__rate_ids
 #: model:ir.ui.view,arch_db:base.view_currency_form
 msgid "Rates"
 msgstr "Курсы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_perm_read
+#: model:ir.model.fields,field_description:base.field_ir_model_access__perm_read
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 msgid "Read Access"
 msgstr "Доступ на чтение"
@@ -17478,7 +17842,7 @@ msgid "Read Access Right"
 msgstr "Право доступа на чтение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_readonly
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__readonly
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
 msgid "Readonly"
 msgstr "Только чтение"
@@ -17494,9 +17858,9 @@ msgid "Record"
 msgstr "Запись"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_res_id
-#: model:ir.model.fields,field_description:base.field_ir_model_data_res_id
-#: model:ir.model.fields,field_description:base.field_ir_translation_res_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__res_id
+#: model:ir.model.fields,field_description:base.field_ir_model_data__res_id
+#: model:ir.model.fields,field_description:base.field_ir_translation__res_id
 msgid "Record ID"
 msgstr "ID записи"
 
@@ -17507,7 +17871,7 @@ msgstr "Ограничение доступа"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
-#: model:ir.model.fields,field_description:base.field_ir_model_rule_ids
+#: model:ir.model.fields,field_description:base.field_ir_model__rule_ids
 #: model:ir.ui.menu,name:base.menu_action_rule
 #: model:ir.ui.view,arch_db:base.view_groups_form
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -17517,7 +17881,7 @@ msgid "Record Rules"
 msgstr "Правила доступа"
 
 #. module: base
-#: code:addons/base/models/ir_cron.py:282
+#: code:addons/base/models/ir_cron.py:283
 #, python-format
 msgid ""
 "Record cannot be modified right now: This cron task is currently being "
@@ -17528,7 +17892,7 @@ msgstr ""
 "несколько минут."
 
 #. module: base
-#: code:addons/base/models/ir_actions.py:230 code:addons/models.py:3873
+#: code:addons/base/models/ir_actions.py:238 code:addons/models.py:3915
 #, python-format
 msgid "Record does not exist or has been deleted."
 msgstr "Запись не существует или была удалена."
@@ -17540,15 +17904,11 @@ msgstr "Ограничение доступа"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_hr_recruitment
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment"
 msgstr "Найм"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_recruitment
-msgid "Recruitment Process"
-msgstr "Подбор персонала"
-
-#. module: base
 #: model:ir.module.module,summary:base.module_sale_subscription
 msgid "Recurring invoicing, renewals"
 msgstr ""
@@ -17560,40 +17920,40 @@ msgid "Recursion error in modules dependencies !"
 msgstr "Ошибка рекурсии в зависимостях модулей!"
 
 #. module: base
-#: code:addons/base/models/ir_actions.py:389
+#: code:addons/base/models/ir_actions.py:397
 #, python-format
 msgid "Recursion found in child server actions"
 msgstr "Ошибка рекурсии в подчиненных действиях сервера"
 
 #. module: base
-#: code:addons/models.py:3204
+#: code:addons/models.py:3452
 #, python-format
 msgid "Recursivity Detected."
 msgstr "Обнаружена рекурсия."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_data_reference
+#: model:ir.model.fields,field_description:base.field_ir_model_data__reference
 msgid "Reference"
 msgstr "Ссылка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_parent_id
-#: model:ir.model.fields,field_description:base.field_res_users_parent_id
+#: model:ir.model.fields,field_description:base.field_res_partner__parent_id
+#: model:ir.model.fields,field_description:base.field_res_users__parent_id
 msgid "Related Company"
 msgstr "Связанная компания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_related
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__related
 msgid "Related Field"
 msgstr "Связанное поле"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_partner_id
+#: model:ir.model.fields,field_description:base.field_res_users__partner_id
 msgid "Related Partner"
 msgstr "Связанный партнер"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_server_id
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__server_id
 msgid "Related Server Action"
 msgstr "Связанное действие сервера"
 
@@ -17610,22 +17970,22 @@ msgid "Related field '%s' does not have type '%s'"
 msgstr "Связанное поле '%s' не имеет тип '%s'"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation_field
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__relation_field
 msgid "Relation Field"
 msgstr "Связанное поле"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_name
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__name
 msgid "Relation Name"
 msgstr "Название связи"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation_table
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__relation_table
 msgid "Relation Table"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_attachment_use
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__attachment_use
 msgid "Reload from Attachment"
 msgstr "Перезагрузить из Вложения"
 
@@ -17650,22 +18010,22 @@ msgid "Remove the contextual action related this report"
 msgstr "Удалить контекстное действие, связанное с этим отчетом"
 
 #. module: base
-#: model:ir.module.module,summary:base.module_mrp_repair
+#: model:ir.module.module,summary:base.module_repair
 msgid "Repair broken or damaged products"
 msgstr "Ремонт сломанных или поврежденных продуктов"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_mrp_repair
+#: model:ir.module.module,shortdesc:base.module_repair
 msgid "Repairs Management"
 msgstr "Управление ремонтом"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_doall
+#: model:ir.model.fields,field_description:base.field_ir_cron__doall
 msgid "Repeat Missed"
 msgstr "Повторить Пропущенные"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_cron_interval_number
+#: model:ir.model.fields,help:base.field_ir_cron__interval_number
 msgid "Repeat every x."
 msgstr "Повторять каждые x."
 
@@ -17683,12 +18043,12 @@ msgid "Report"
 msgstr "Отчёт"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_file
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__report_file
 msgid "Report File"
 msgstr "Файл отчета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_report_footer
+#: model:ir.model.fields,field_description:base.field_res_company__report_footer
 msgid "Report Footer"
 msgstr "Подпись в отчётах"
 
@@ -17698,7 +18058,7 @@ msgid "Report Model"
 msgstr "Модель отчета"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__report_type
 #: model:ir.ui.view,arch_db:base.act_report_xml_search_view
 msgid "Report Type"
 msgstr "Тип отчета"
@@ -17727,13 +18087,13 @@ msgstr "Отчетность"
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report
 #: model:ir.actions.act_window,name:base.reports_action
-#: model:ir.model.fields,field_description:base.field_ir_module_module_reports_by_module
+#: model:ir.model.fields,field_description:base.field_ir_module_module__reports_by_module
 #: model:ir.ui.menu,name:base.menu_ir_action_report
 msgid "Reports"
 msgstr "Отчёты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_required
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__required
 #: model:ir.ui.view,arch_db:base.view_model_fields_search
 msgid "Required"
 msgstr "Требуемое"
@@ -17744,35 +18104,35 @@ msgid "Resellers"
 msgstr "Посредники"
 
 #. module: base
-#: code:addons/models.py:787
+#: code:addons/models.py:803
 #, python-format
 msgid "Resolve other errors first"
 msgstr "Сначала разрешите другие ошибки"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_exports_resource
-#: model:ir.model.fields,field_description:base.field_ir_property_res_id
+#: model:ir.model.fields,field_description:base.field_ir_exports__resource
+#: model:ir.model.fields,field_description:base.field_ir_property__res_id
 #: model:ir.module.module,shortdesc:base.module_resource
 msgid "Resource"
 msgstr "Ресурс"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_res_field
+#: model:ir.model.fields,field_description:base.field_ir_attachment__res_field
 msgid "Resource Field"
 msgstr "Поле ресурсов"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_res_id
+#: model:ir.model.fields,field_description:base.field_ir_attachment__res_id
 msgid "Resource ID"
 msgstr "ID объекта"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_res_model
+#: model:ir.model.fields,field_description:base.field_ir_attachment__res_model
 msgid "Resource Model"
 msgstr "Модель ресурса"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_res_name
+#: model:ir.model.fields,field_description:base.field_ir_attachment__res_name
 msgid "Resource Name"
 msgstr "Название объекта"
 
@@ -17797,7 +18157,7 @@ msgid "Restrict"
 msgstr "Ограничить"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_multi
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__multi
 msgid "Restrict to lists"
 msgstr "Органичить списками"
 
@@ -17807,12 +18167,12 @@ msgid "Review and approve employees time reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_right
+#: model:ir.model.fields,field_description:base.field_report_paperformat__margin_right
 msgid "Right Margin (mm)"
 msgstr "Правое поле (мм)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_parent_right
+#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_right
 msgid "Right parent"
 msgstr "Родитель справа"
 
@@ -17837,7 +18197,7 @@ msgid "Romania - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_rounding
+#: model:ir.model.fields,field_description:base.field_res_currency__rounding
 msgid "Rounding Factor"
 msgstr "Множитель округления"
 
@@ -17852,7 +18212,7 @@ msgid "Rule must have at least one checked access right !"
 msgstr "Правило должно иметь хотя бы одно проверенное право доступа !"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_rule_groups
+#: model:ir.model.fields,field_description:base.field_res_groups__rule_groups
 msgid "Rules"
 msgstr "Правила"
 
@@ -17919,17 +18279,17 @@ msgid "SMS gateway"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_port
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_port
 msgid "SMTP Port"
 msgstr "SMTP Порт"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_smtp_port
+#: model:ir.model.fields,help:base.field_ir_mail_server__smtp_port
 msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
 msgstr "Порт SMTP. Обычно 465 для SSL, и 25 или 587 для других случаев."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_host
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_host
 msgid "SMTP Server"
 msgstr "SMTP Сервер"
 
@@ -18025,7 +18385,7 @@ msgstr "Продажи и закупки"
 #: model:ir.module.module,shortdesc:base.module_sales_team
 #: model:ir.module.module,summary:base.module_sales_team
 msgid "Sales Channels"
-msgstr ""
+msgstr "Каналы продаж"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_expense
@@ -18063,8 +18423,8 @@ msgid "Sales internal machinery"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_user_id
-#: model:ir.model.fields,field_description:base.field_res_users_user_id
+#: model:ir.model.fields,field_description:base.field_res_partner__user_id
+#: model:ir.model.fields,field_description:base.field_res_users__user_id
 #: model:ir.ui.view,arch_db:base.view_res_partner_filter
 msgid "Salesperson"
 msgstr "Продавец"
@@ -18080,11 +18440,16 @@ msgid "San Marino"
 msgstr "Сан-Марино"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_sanitized_acc_number
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__sanitized_acc_number
 msgid "Sanitized Account Number"
 msgstr "Номер дебетовой карты"
 
 #. module: base
+#: selection:res.lang,week_start:0
+msgid "Saturday"
+msgstr "Суббота"
+
+#. module: base
 #: model:res.country,name:base.sa
 msgid "Saudi Arabia"
 msgstr "Саудовская Аравия"
@@ -18107,7 +18472,7 @@ msgid "Save and Print"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_attachment
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__attachment
 msgid "Save as Attachment Prefix"
 msgstr "Сохранить как Префикс Вложения"
 
@@ -18143,7 +18508,7 @@ msgid "Scheduled Actions"
 msgstr "Запланированные действия"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_user_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__user_id
 msgid "Scheduler User"
 msgstr ""
 
@@ -18173,16 +18538,21 @@ msgid "Search Partner"
 msgstr "Найти партнера"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_search_view
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__search_view
 msgid "Search View"
 msgstr "Поиск обзора"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_search_view_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__search_view_id
 msgid "Search View Ref."
 msgstr "Ссылка на поиск представления"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Search duplicates based on duplicated data in"
+msgstr "Поиск дубликатов на основе дублированных данных в"
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.view_module_filter
 msgid "Search modules"
 msgstr "Искать модули"
@@ -18222,16 +18592,41 @@ msgid "See http://openerp.com"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_report_paperformat_format
+#: model:ir.model.fields,help:base.field_report_paperformat__format
 msgid "Select Proper Paper size"
 msgstr "Выберите подходящий размер бумаги"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_selectable
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid ""
+"Select the list of fields used to search for\n"
+"                            duplicated records. If you select several fields,\n"
+"                            Odoo will propose you to merge only those having\n"
+"                            all these fields in common. (not one of the fields)."
+msgstr ""
+"Выберите список полей, используемых для поиска дублирующихся записей. Если "
+"указать несколько полей, Odoo предложит вам объединять только те, которые "
+"имеют все эти общие поля. (не одно из полей)."
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__selectable
 msgid "Selectable"
 msgstr "Выделяемый"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid ""
+"Selected contacts will be merged together.\n"
+"                                All documents linked to one of these contacts\n"
+"                                will be redirected to the destination contact.\n"
+"                                You can remove contacts from this list to avoid merging them."
+msgstr ""
+"Выбранные контакты будут объединены вместе.\n"
+"                                Все документы, связанные с одним из этих контактов\n"
+"                                будут перенаправлены на контакт назначения.\n"
+"                                Контакты можно удалить из этого списка, чтобы избежать их слияния."
+
+#. module: base
 #: code:addons/base/models/res_partner.py:28
 #, python-format
 msgid ""
@@ -18244,18 +18639,19 @@ msgstr ""
 "процесс. Текст сообщения должен быть записан в следующее поле."
 
 #. module: base
+#: selection:base.partner.merge.automatic.wizard,state:0
 #: selection:ir.property,type:0 selection:ir.translation,type:0
 msgid "Selection"
 msgstr "Выбор"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_selection
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__selection
 msgid "Selection Options"
 msgstr "Варианты Выбора"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_self
-#: model:ir.model.fields,field_description:base.field_res_users_self
+#: model:ir.model.fields,field_description:base.field_res_partner__self
+#: model:ir.model.fields,field_description:base.field_res_users__self
 msgid "Self"
 msgstr "Сам"
 
@@ -18344,21 +18740,21 @@ msgid "Senegal"
 msgstr "Сенегал"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_grouping
+#: model:ir.model.fields,field_description:base.field_res_lang__grouping
 msgid "Separator Format"
 msgstr "Формат разделителя"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_sequence
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_sequence
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_sequence
-#: model:ir.model.fields,field_description:base.field_ir_cron_sequence
-#: model:ir.model.fields,field_description:base.field_ir_module_category_sequence
-#: model:ir.model.fields,field_description:base.field_ir_module_module_sequence
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_sequence
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_priority
-#: model:ir.model.fields,field_description:base.field_res_company_sequence
-#: model:ir.model.fields,field_description:base.field_res_partner_bank_sequence
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__sequence
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__sequence
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__sequence
+#: model:ir.model.fields,field_description:base.field_ir_cron__sequence
+#: model:ir.model.fields,field_description:base.field_ir_module_category__sequence
+#: model:ir.model.fields,field_description:base.field_ir_module_module__sequence
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__sequence
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__priority
+#: model:ir.model.fields,field_description:base.field_res_company__sequence
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__sequence
 #: model:ir.ui.view,arch_db:base.sequence_view
 #: model:ir.ui.view,arch_db:base.view_sequence_search
 #: model:ir.ui.view,arch_db:base.view_view_tree
@@ -18366,12 +18762,12 @@ msgid "Sequence"
 msgstr "Нумерация"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_code
+#: model:ir.model.fields,field_description:base.field_ir_sequence__code
 msgid "Sequence Code"
 msgstr "Код последовательности"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_padding
+#: model:ir.model.fields,field_description:base.field_ir_sequence__padding
 msgid "Sequence Size"
 msgstr "Размер последовательности"
 
@@ -18420,7 +18816,7 @@ msgid "Server Actions"
 msgstr "Действия сервера"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_ir_actions_server_id
+#: model:ir.model.fields,field_description:base.field_ir_cron__ir_actions_server_id
 msgid "Server action"
 msgstr "Действие сервера"
 
@@ -18430,7 +18826,7 @@ msgid "Set NULL"
 msgstr "Установить в NULL"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_new_password
+#: model:ir.model.fields,field_description:base.field_res_users__new_password
 msgid "Set Password"
 msgstr "Установить Пароль"
 
@@ -18441,21 +18837,21 @@ msgid "Set as Todo"
 msgstr "Установить как Выполнить"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_client_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_act_server_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_act_url_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_act_window_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_actions_binding_model_id
-#: model:ir.model.fields,help:base.field_ir_actions_binding_model_id_275
-#: model:ir.model.fields,help:base.field_ir_cron_binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_act_url__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_act_window_close__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_actions__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_client__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_report__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_actions_server__binding_model_id
+#: model:ir.model.fields,help:base.field_ir_cron__binding_model_id
 msgid ""
 "Setting a value makes this action available in the sidebar for the given "
 "model."
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_users.py:520
+#: code:addons/base/models/res_users.py:559
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
@@ -18475,18 +18871,18 @@ msgid "Seychelles"
 msgstr "Сейшельские острова"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_share
+#: model:ir.model.fields,field_description:base.field_res_groups__share
 msgid "Share Group"
 msgstr "Группа Совместного Доступа"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_partner_share
-#: model:ir.model.fields,field_description:base.field_res_users_partner_share
+#: model:ir.model.fields,field_description:base.field_res_partner__partner_share
+#: model:ir.model.fields,field_description:base.field_res_users__partner_share
 msgid "Share Partner"
 msgstr "Доля партнера"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_share
+#: model:ir.model.fields,field_description:base.field_res_users__share
 msgid "Share User"
 msgstr "Совместный доступ с Пользователем"
 
@@ -18506,7 +18902,7 @@ msgid "Shipping address"
 msgstr "Адрес получателя"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_module_uninstall_show_all
+#: model:ir.model.fields,field_description:base.field_base_module_uninstall__show_all
 msgid "Show All"
 msgstr ""
 
@@ -18536,7 +18932,7 @@ msgid "Sign"
 msgstr "Подпись"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_signature
+#: model:ir.model.fields,field_description:base.field_res_users__signature
 msgid "Signature"
 msgstr "Подпись"
 
@@ -18571,7 +18967,7 @@ msgid "Sint Maarten (Dutch part)"
 msgstr "Синт-Мартен (голландская часть)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_size
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__size
 msgid "Size"
 msgstr "Размер"
 
@@ -18586,6 +18982,11 @@ msgid "Skip"
 msgstr "Пропустить"
 
 #. module: base
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "Skip these contacts"
+msgstr "Пропустить эти контакты"
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_website_slides
 msgid "Slides"
 msgstr "Слайды"
@@ -18611,14 +19012,14 @@ msgid "Slovenian - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_image_small
-#: model:ir.model.fields,field_description:base.field_res_users_image_small
+#: model:ir.model.fields,field_description:base.field_res_partner__image_small
+#: model:ir.model.fields,field_description:base.field_res_users__image_small
 msgid "Small-sized image"
 msgstr "Маленькое изображение"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_image_small
-#: model:ir.model.fields,help:base.field_res_users_image_small
+#: model:ir.model.fields,help:base.field_res_partner__image_small
+#: model:ir.model.fields,help:base.field_res_users__image_small
 msgid ""
 "Small-sized image of this contact. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is"
@@ -18639,49 +19040,49 @@ msgid "Somalia"
 msgstr "Сомали"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_bank_bic
-#: model:ir.model.fields,help:base.field_res_partner_bank_bank_bic
+#: model:ir.model.fields,help:base.field_res_bank__bic
+#: model:ir.model.fields,help:base.field_res_partner_bank__bank_bic
 msgid "Sometimes called BIC or Swift."
 msgstr "Иногда называемый БИК или Swift."
 
 #. module: base
-#: code:addons/base/models/ir_attachment.py:341
-#: code:addons/base/models/ir_model.py:1169
+#: code:addons/base/models/ir_attachment.py:342
+#: code:addons/base/models/ir_model.py:1173
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
 msgstr "Извините, вы не можете получить доступ к этому документу."
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1171
+#: code:addons/base/models/ir_model.py:1175
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
 msgstr "К сожалению, вы не можете создать такой документ."
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1172
+#: code:addons/base/models/ir_model.py:1176
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
 msgstr "Извините, вы не можете удалить этот документ."
 
 #. module: base
-#: code:addons/base/models/ir_model.py:1170
+#: code:addons/base/models/ir_model.py:1174
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
 msgstr "К сожалению, вы не можете изменить этот документ ."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_filters_sort
+#: model:ir.model.fields,field_description:base.field_ir_filters__sort
 msgid "Sort"
 msgstr "Сортировать"
 
 #. module: base
-#: code:addons/models.py:3613
+#: code:addons/models.py:3653
 #, python-format
 msgid "Sorting field %s not found on model %s"
 msgstr "Поле сортировки %s не найдено в модели %s"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_src_model
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__src_model
 msgid "Source Model"
 msgstr "Модель - источник"
 
@@ -18696,7 +19097,7 @@ msgid "Source Term"
 msgstr "Исходный термин"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_translation_source
+#: model:ir.model.fields,field_description:base.field_ir_translation__source
 msgid "Source term"
 msgstr "Исходный термин"
 
@@ -18751,7 +19152,7 @@ msgid "Specific Industry Applications"
 msgstr "Приложения Специфической Отрасли"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_new_password
+#: model:ir.model.fields,help:base.field_res_users__new_password
 msgid ""
 "Specify a value only when creating a user or if you're changing the user's "
 "password, otherwise leave empty. After a change of password, the user has to"
@@ -18762,7 +19163,7 @@ msgstr ""
 "необходимо войти в систему заново."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_cron_doall
+#: model:ir.model.fields,help:base.field_ir_cron__doall
 msgid ""
 "Specify if missed occurrences should be executed when the server restarts."
 msgstr ""
@@ -18791,9 +19192,10 @@ msgid "Start configuration"
 msgstr "Начать конфигурирование"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_state
-#: model:ir.model.fields,field_description:base.field_res_partner_state_id
-#: model:ir.model.fields,field_description:base.field_res_users_state_id
+#: model:ir.model.fields,field_description:base.field_base_language_export__state
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__state
+#: model:ir.model.fields,field_description:base.field_res_partner__state_id
+#: model:ir.model.fields,field_description:base.field_res_users__state_id
 #: model:ir.ui.view,arch_db:base.view_company_form
 #: model:ir.ui.view,arch_db:base.view_country_state_form
 #: model:ir.ui.view,arch_db:base.view_country_state_tree
@@ -18805,12 +19207,12 @@ msgid "State"
 msgstr "Регион"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_state_code
+#: model:ir.model.fields,field_description:base.field_res_country_state__code
 msgid "State Code"
 msgstr "Код Региона"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_state_name
+#: model:ir.model.fields,field_description:base.field_res_country_state__name
 msgid "State Name"
 msgstr "Название Региона"
 
@@ -18820,23 +19222,23 @@ msgid "State of Palestine"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_state_ids
+#: model:ir.model.fields,field_description:base.field_res_country__state_ids
 msgid "States"
 msgstr "Регионы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_install_state
-#: model:ir.model.fields,field_description:base.field_base_module_update_state
-#: model:ir.model.fields,field_description:base.field_ir_actions_todo_state
-#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency_state
-#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion_state
-#: model:ir.model.fields,field_description:base.field_ir_module_module_state
-#: model:ir.model.fields,field_description:base.field_ir_translation_state
+#: model:ir.model.fields,field_description:base.field_base_language_install__state
+#: model:ir.model.fields,field_description:base.field_base_module_update__state
+#: model:ir.model.fields,field_description:base.field_ir_actions_todo__state
+#: model:ir.model.fields,field_description:base.field_ir_module_module__state
+#: model:ir.model.fields,field_description:base.field_ir_module_module_dependency__state
+#: model:ir.model.fields,field_description:base.field_ir_module_module_exclusion__state
+#: model:ir.model.fields,field_description:base.field_ir_translation__state
 msgid "Status"
 msgstr "Статус"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_number_increment
+#: model:ir.model.fields,field_description:base.field_ir_sequence__number_increment
 msgid "Step"
 msgstr "Шаг"
 
@@ -18873,20 +19275,20 @@ msgid "Stock Barcode scan in Mobile"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_store
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__store
 msgid "Stored"
 msgstr "Запасенный"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_store_fname
+#: model:ir.model.fields,field_description:base.field_ir_attachment__store_fname
 msgid "Stored Filename"
 msgstr "Сохраненное Имя файла"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_street
-#: model:ir.model.fields,field_description:base.field_res_company_street
-#: model:ir.model.fields,field_description:base.field_res_partner_street
-#: model:ir.model.fields,field_description:base.field_res_users_street
+#: model:ir.model.fields,field_description:base.field_res_bank__street
+#: model:ir.model.fields,field_description:base.field_res_company__street
+#: model:ir.model.fields,field_description:base.field_res_partner__street
+#: model:ir.model.fields,field_description:base.field_res_users__street
 msgid "Street"
 msgstr "Улица"
 
@@ -18909,10 +19311,10 @@ msgid "Street..."
 msgstr "Улица..."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_street2
-#: model:ir.model.fields,field_description:base.field_res_company_street2
-#: model:ir.model.fields,field_description:base.field_res_partner_street2
-#: model:ir.model.fields,field_description:base.field_res_users_street2
+#: model:ir.model.fields,field_description:base.field_res_bank__street2
+#: model:ir.model.fields,field_description:base.field_res_company__street2
+#: model:ir.model.fields,field_description:base.field_res_partner__street2
+#: model:ir.model.fields,field_description:base.field_res_users__street2
 msgid "Street2"
 msgstr "Улица2"
 
@@ -18938,7 +19340,7 @@ msgid "Subscription Management"
 msgstr "Управление подписками"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_ids
+#: model:ir.model.fields,field_description:base.field_ir_sequence__date_range_ids
 msgid "Subsequences"
 msgstr "Подпоследовательности"
 
@@ -18948,22 +19350,27 @@ msgid "Sudan"
 msgstr "Судан"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_suffix
+#: model:ir.model.fields,field_description:base.field_ir_sequence__suffix
 msgid "Suffix"
 msgstr "Суффикс"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_suffix
+#: model:ir.model.fields,help:base.field_ir_sequence__suffix
 msgid "Suffix value of the record for the sequence"
 msgstr "Суффикс записи для нумерации"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_summary
+#: model:ir.model.fields,field_description:base.field_ir_module_module__summary
 msgid "Summary"
 msgstr "Описание"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_params
+#: selection:res.lang,week_start:0
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__params
 msgid "Supplementary arguments"
 msgstr "Дополнительные аргументы"
 
@@ -19024,12 +19431,12 @@ msgid "Switzerland - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_symbol
+#: model:ir.model.fields,field_description:base.field_res_currency__symbol
 msgid "Symbol"
 msgstr "Символ"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_currency_position
+#: model:ir.model.fields,field_description:base.field_res_currency__position
 msgid "Symbol Position"
 msgstr "Позиция символа"
 
@@ -19088,9 +19495,9 @@ msgstr ""
 "для загрузки в платформу переводов Odoo,"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_vat
-#: model:ir.model.fields,field_description:base.field_res_partner_vat
-#: model:ir.model.fields,field_description:base.field_res_users_vat
+#: model:ir.model.fields,field_description:base.field_res_company__vat
+#: model:ir.model.fields,field_description:base.field_res_partner__vat
+#: model:ir.model.fields,field_description:base.field_res_users__vat
 msgid "TIN"
 msgstr "TIN"
 
@@ -19110,13 +19517,13 @@ msgid "Tag"
 msgstr "Тег"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_name
+#: model:ir.model.fields,field_description:base.field_res_partner_category__name
 msgid "Tag Name"
 msgstr "Название тега"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_id_837
-#: model:ir.model.fields,field_description:base.field_res_users_category_id
+#: model:ir.model.fields,field_description:base.field_res_partner__category_id
+#: model:ir.model.fields,field_description:base.field_res_users__category_id
 msgid "Tags"
 msgstr "Теги"
 
@@ -19141,15 +19548,15 @@ msgid "Tanzania"
 msgstr "Танзания"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_target
-#: model:ir.model.fields,field_description:base.field_ir_act_window_target
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__target
+#: model:ir.model.fields,field_description:base.field_ir_actions_client__target
 msgid "Target Window"
 msgstr "Целевой вид"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_vat
-#: model:ir.model.fields,help:base.field_res_partner_vat
-#: model:ir.model.fields,help:base.field_res_users_vat
+#: model:ir.model.fields,help:base.field_res_company__vat
+#: model:ir.model.fields,help:base.field_res_partner__vat
+#: model:ir.model.fields,help:base.field_res_users__vat
 msgid ""
 "Tax Identification Number. Fill it if the company is subjected to taxes. "
 "Used by the some of the legal statements."
@@ -19183,7 +19590,7 @@ msgid "Technical Features"
 msgstr "Технические детали"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_name
+#: model:ir.model.fields,field_description:base.field_ir_module_module__name
 #: model:ir.ui.view,arch_db:base.view_model_search
 msgid "Technical Name"
 msgstr "Техническое название"
@@ -19195,7 +19602,7 @@ msgid "Technical Settings"
 msgstr "Технические параметры"
 
 #. module: base
-#: code:addons/base/models/ir_translation.py:757
+#: code:addons/base/models/ir_translation.py:753
 #, python-format
 msgid "Technical Translations"
 msgstr "Технические переводы"
@@ -19206,7 +19613,7 @@ msgid "Technical guide"
 msgstr "Техническое руководство"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_name
+#: model:ir.model.fields,field_description:base.field_ir_actions_report__report_name
 msgid "Template Name"
 msgstr "Название шаблона"
 
@@ -19231,6 +19638,11 @@ msgid "Test Performance"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,summary:base.module_test_marketing_automation
+msgid "Test Suits for Automated Marketing Campaigns"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_test_testing_utilities
 msgid "Test testing utilities"
 msgstr ""
@@ -19277,7 +19689,13 @@ msgid "Thailand - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_code
+#: code:addons/base/models/res_users.py:291
+#, python-format
+msgid "The \"App Switcher\" action cannot be selected as home action."
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,help:base.field_res_country__code
 msgid ""
 "The ISO country code in two chars. \n"
 "You can use this field for quick search."
@@ -19289,14 +19707,12 @@ msgstr ""
 #: code:addons/base/models/ir_model.py:367
 #, python-format
 msgid ""
-"The Selection Options expression is not a valid Pythonic expression.Please "
+"The Selection Options expression is not a valid Pythonic expression. Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
-"Выражение для вариантов выбора указано не в формате выражений Python. "
-"Выражение должно быть в формате [('ключ','Надпись'), ...]"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_lang_grouping
+#: model:ir.model.fields,help:base.field_res_lang__grouping
 msgid ""
 "The Separator Format should be like [,n] where 0 < n :starting from Unit "
 "digit. -1 will end the separation. e.g. [3,2,-1] will represent 106500 to be"
@@ -19310,7 +19726,7 @@ msgstr ""
 "разделитель тысяч в каждом случае."
 
 #. module: base
-#: code:addons/base/models/res_lang.py:67
+#: code:addons/base/models/res_lang.py:74
 #, python-format
 msgid ""
 "The Separator Format should be like [,n] where 0 < n :starting from Unit "
@@ -19325,7 +19741,7 @@ msgstr ""
 "разделитель тысяч в каждом случае."
 
 #. module: base
-#: code:addons/base/models/ir_module.py:756
+#: code:addons/base/models/ir_module.py:758
 #, python-format
 msgid ""
 "The `%s` module appears to be unavailable at the moment, please try again "
@@ -19334,18 +19750,18 @@ msgstr ""
 "Похоже, что модуль '%s' не доступен сейчас, пожалуйста, попробуйте позже."
 
 #. module: base
-#: code:addons/base/models/ir_module.py:570
+#: code:addons/base/models/ir_module.py:572
 #, python-format
 msgid "The `base` module cannot be uninstalled"
 msgstr "Базовый модуль нельзя удалить"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_category_active
+#: model:ir.model.fields,help:base.field_res_partner_category__active
 msgid "The active field allows you to hide the category without removing it."
 msgstr "Поле активность позволяем скрыть категорию без её удаления"
 
 #. module: base
-#: code:addons/base/models/res_users.py:283
+#: code:addons/base/models/res_users.py:284
 #, python-format
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr "Выбранной компании нет в разрешенных компаниях для этого пользователя"
@@ -19371,7 +19787,7 @@ msgid "The company name must be unique !"
 msgstr "Название компании должно быть уникальным!"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_company_id
+#: model:ir.model.fields,help:base.field_res_users__company_id
 msgid "The company this user is currently working for."
 msgstr "Компания для которой сейчас работает этот пользователь."
 
@@ -19387,7 +19803,7 @@ msgstr ""
 " перезапустить некоторые мастера из этого меню."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_related
+#: model:ir.model.fields,help:base.field_ir_model_fields__related
 msgid ""
 "The corresponding related field, if any. This must be a dot-separated list "
 "of field names."
@@ -19406,7 +19822,7 @@ msgid "The currency rate must be strictly positive."
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_attachment_res_model
+#: model:ir.model.fields,help:base.field_ir_attachment__res_model
 msgid "The database object this attachment will be attached to."
 msgstr "Объект базы данных, к которому будет прикреплено это вложение."
 
@@ -19490,13 +19906,13 @@ msgid "The following modules are not installed or unknown: %s"
 msgstr "Следующие модули не установлены или неизвестны: %s"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_name
+#: model:ir.model.fields,help:base.field_res_country__name
 msgid "The full name of the country."
 msgstr "Полное наименование страны."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_user_id
-#: model:ir.model.fields,help:base.field_res_users_user_id
+#: model:ir.model.fields,help:base.field_res_partner__user_id
+#: model:ir.model.fields,help:base.field_res_users__user_id
 msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
@@ -19505,12 +19921,12 @@ msgstr ""
 "таковые имеются."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_inherited_model_ids
+#: model:ir.model.fields,help:base.field_ir_model__inherited_model_ids
 msgid "The list of models that extends the current model."
 msgstr "Список моделей, расширяющих текущую модель."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_filters_action_id
+#: model:ir.model.fields,help:base.field_ir_filters__action_id
 msgid ""
 "The menu action this filter applies to. When left empty the filter applies "
 "to all menus for this model."
@@ -19535,7 +19951,7 @@ msgid "The model name must start with 'x_'."
 msgstr "Название модели должно начинаться с 'x_'."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_model_id
+#: model:ir.model.fields,help:base.field_ir_model_fields__model_id
 msgid "The model this field belongs to"
 msgstr "Модель к которой принадлежит это поле"
 
@@ -19545,7 +19961,7 @@ msgid "The name of the country must be unique !"
 msgstr "Наименование страны должно быть уникальным !"
 
 #. module: base
-#: code:addons/base/models/res_users.py:152
+#: code:addons/base/models/res_users.py:153
 #, python-format
 msgid "The name of the group can not start with \"-\""
 msgstr "Название группы не может начинаться с \"-\""
@@ -19566,7 +19982,7 @@ msgid "The name of the module must be unique!"
 msgstr "Имя модуля должно быть уникальным!"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_number_increment
+#: model:ir.model.fields,help:base.field_ir_sequence__number_increment
 msgid "The next number of the sequence will be incremented by this number"
 msgstr "Следующее число в нумерации будет увеличено на это число"
 
@@ -19591,7 +20007,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_domain
+#: model:ir.model.fields,help:base.field_ir_model_fields__domain
 msgid ""
 "The optional domain to restrict possible values for relationship fields, "
 "specified as a Python expression defining a list of triplets. For example: "
@@ -19602,8 +20018,8 @@ msgstr ""
 "конструкций. Например: [('color','=','red')]"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_tz
-#: model:ir.model.fields,help:base.field_res_users_tz
+#: model:ir.model.fields,help:base.field_res_partner__tz
+#: model:ir.model.fields,help:base.field_res_users__tz
 msgid ""
 "The partner's timezone, used to output proper date and time values inside "
 "printed reports. It is important to set a value for this field. You should "
@@ -19617,7 +20033,7 @@ msgstr ""
 "установленного на компьютере."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_file
+#: model:ir.model.fields,help:base.field_ir_actions_report__report_file
 msgid ""
 "The path to the main report file (depending on Report Type) or empty if the "
 "content is in another field"
@@ -19626,7 +20042,7 @@ msgstr ""
 "если содержимое находится в другом поле"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_cron_priority
+#: model:ir.model.fields,help:base.field_ir_cron__priority
 msgid ""
 "The priority of the job, as an integer: 0 means higher priority, 10 means "
 "lower priority."
@@ -19635,22 +20051,22 @@ msgstr ""
 "приоритет."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_rate_rate
+#: model:ir.model.fields,help:base.field_res_currency_rate__rate
 msgid "The rate of the currency to the currency of rate 1"
 msgstr "Курс валюты к валюте с курсом 1"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_currency_rate
+#: model:ir.model.fields,help:base.field_res_currency__rate
 msgid "The rate of the currency to the currency of rate 1."
 msgstr "Курс валюты к валюте с курсом 1."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_attachment_res_id
+#: model:ir.model.fields,help:base.field_ir_attachment__res_id
 msgid "The record id this is attached to."
 msgstr "Идентификатор записи прикреплен."
 
 #. module: base
-#: code:addons/models.py:2675
+#: code:addons/models.py:2683
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to record rules: Document "
@@ -19658,8 +20074,8 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:2470 code:addons/models.py:2679
-#: code:addons/models.py:2764
+#: code:addons/models.py:2478 code:addons/models.py:2687
+#: code:addons/models.py:2772
 #, python-format
 msgid ""
 "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -19688,7 +20104,7 @@ msgid "The selected modules have been updated / installed !"
 msgstr "Выбранные модули будут обновлены / установлены !"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_state_code
+#: model:ir.model.fields,help:base.field_res_country_state__code
 msgid "The state code."
 msgstr "Код состояния."
 
@@ -19701,12 +20117,12 @@ msgstr ""
 "полями."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_model
+#: model:ir.model.fields,help:base.field_ir_model_fields__model
 msgid "The technical name of the model this field belongs to"
 msgstr "Техническое название модели к которой относится это поле"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_report_type
+#: model:ir.model.fields,help:base.field_ir_actions_report__report_type
 msgid ""
 "The type of the report that will be rendered, each one having its own "
 "rendering method.HTML means the report will be opened directly in your "
@@ -19715,7 +20131,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_filters_user_id
+#: model:ir.model.fields,help:base.field_ir_filters__user_id
 msgid ""
 "The user this filter is private to. When left empty the filter is public and"
 " available to all users."
@@ -19723,7 +20139,7 @@ msgstr ""
 "Пользователь фильтра. Если оставить пустым, то фильтр будет доступен всем."
 
 #. module: base
-#: code:addons/models.py:5164
+#: code:addons/models.py:5208
 #, python-format
 msgid ""
 "The value for the field '%s' already exists (this is probably '%s' in the "
@@ -19731,7 +20147,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: code:addons/models.py:5170
+#: code:addons/models.py:5214
 #, python-format
 msgid ""
 "The values for the fields '%s' already exist (they are probably '%s' in the "
@@ -19754,7 +20170,12 @@ msgstr ""
 " его прежде чем устанавливать новый по умолчанию"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_lang_iso_code
+#: model:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form
+msgid "There is no more contacts to merge for this request..."
+msgstr "Контакты для слияния по этому запросу отсутствуют..."
+
+#. module: base
+#: model:ir.model.fields,help:base.field_res_lang__iso_code
 msgid "This ISO code is the name of po files to use for translations"
 msgstr "Этот код ISO является именем файлов перевода в формате po"
 
@@ -19770,9 +20191,9 @@ msgid "This column contains module data and cannot be removed!"
 msgstr "Этот столбец содержит данные модуля и не может быть удален!"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_logo
-#: model:ir.model.fields,help:base.field_res_partner_image
-#: model:ir.model.fields,help:base.field_res_users_image
+#: model:ir.model.fields,help:base.field_res_company__logo
+#: model:ir.model.fields,help:base.field_res_partner__image
+#: model:ir.model.fields,help:base.field_res_users__image
 msgid ""
 "This field holds the image used as avatar for this contact, limited to "
 "1024x1024px"
@@ -19781,7 +20202,7 @@ msgstr ""
 "контакта, ограничено 1024x1024px"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_lang_code
+#: model:ir.model.fields,help:base.field_res_lang__code
 msgid "This field is used to set/get locales for user"
 msgstr "Это поле используется для установки/получения локалий пользователя"
 
@@ -19796,7 +20217,7 @@ msgstr ""
 " убедитесь, что используете эту кодировку."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_views
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__views
 msgid ""
 "This function field computes the ordered list of views that should be "
 "enabled when displaying the result of an action, federating view mode, views"
@@ -19809,7 +20230,7 @@ msgstr ""
 "список пар (view_id,view_mode)."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_attachment
+#: model:ir.model.fields,help:base.field_ir_actions_report__attachment
 msgid ""
 "This is the filename of the attachment used to store the printing result. "
 "Keep empty to not save the printed reports. You can use a python expression "
@@ -19820,15 +20241,12 @@ msgstr ""
 "использовать Python выражения с объектом и временным переменным."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_report_xml_print_report_name
+#: model:ir.model.fields,help:base.field_ir_actions_report__print_report_name
 msgid ""
 "This is the filename of the report going to download. Keep empty to not "
-"change the report filename. You can use a python expression with the object "
-"and time variables."
+"change the report filename. You can use a python expression with the "
+"'object' and 'time' variables."
 msgstr ""
-"Это имя файла отчета, который нужно загрузить. Оставьте поле пустым, чтобы "
-"не изменять имя файла отчета. Вы можете использовать выражение python с "
-"переменными объекта и времени."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_no
@@ -19865,11 +20283,16 @@ msgstr ""
 "версии 8.0."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_thousands_sep
+#: model:ir.model.fields,field_description:base.field_res_lang__thousands_sep
 msgid "Thousands Separator"
 msgstr "Разделитель тысяч"
 
 #. module: base
+#: selection:res.lang,week_start:0
+msgid "Thursday"
+msgstr "Четверг"
+
+#. module: base
 #: model:ir.module.module,summary:base.module_helpdesk
 msgid "Ticketing, Support, Issues"
 msgstr ""
@@ -19885,7 +20308,7 @@ msgid "Ticketing, Support, Slides"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_lang_time_format
+#: model:ir.model.fields,field_description:base.field_res_lang__time_format
 msgid "Time Format"
 msgstr "Формат времени"
 
@@ -19916,14 +20339,14 @@ msgid "Timesheets/attendances reporting"
 msgstr "Отчёты по табелям / посещаемости"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_tz
-#: model:ir.model.fields,field_description:base.field_res_users_tz
+#: model:ir.model.fields,field_description:base.field_res_partner__tz
+#: model:ir.model.fields,field_description:base.field_res_users__tz
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_tz_offset
-#: model:ir.model.fields,field_description:base.field_res_users_tz_offset
+#: model:ir.model.fields,field_description:base.field_res_partner__tz_offset
+#: model:ir.model.fields,field_description:base.field_res_users__tz_offset
 msgid "Timezone offset"
 msgstr "Смещение часового пояса"
 
@@ -19933,14 +20356,14 @@ msgid "Timor-Leste"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_title
-#: model:ir.model.fields,field_description:base.field_res_partner_title_name
-#: model:ir.model.fields,field_description:base.field_res_users_title
+#: model:ir.model.fields,field_description:base.field_res_partner__title
+#: model:ir.model.fields,field_description:base.field_res_partner_title__name
+#: model:ir.model.fields,field_description:base.field_res_users__title
 msgid "Title"
 msgstr "Заголовок"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_date_to
+#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range__date_to
 msgid "To"
 msgstr "До"
 
@@ -19977,7 +20400,7 @@ msgid "To be upgraded"
 msgstr "Для обновления"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:729
+#: code:addons/base/models/ir_module.py:731
 #, python-format
 msgid ""
 "To enable it, make sure this directory exists and is writable on the server:"
@@ -20016,12 +20439,12 @@ msgid "Tools"
 msgstr "Инструменты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_report_paperformat_margin_top
+#: model:ir.model.fields,field_description:base.field_report_paperformat__margin_top
 msgid "Top Margin (mm)"
 msgstr "Верхнее поле (мм)"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_count
+#: model:ir.model.fields,help:base.field_ir_model__count
 msgid "Total number of records in this model"
 msgstr ""
 
@@ -20052,7 +20475,7 @@ msgid "Transient"
 msgstr "Переходный процесс"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_transient
+#: model:ir.model.fields,field_description:base.field_ir_model__transient
 msgid "Transient Model"
 msgstr "Временная модель"
 
@@ -20072,13 +20495,13 @@ msgid "Transifex integration"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_groups_trans_implied_ids
+#: model:ir.model.fields,field_description:base.field_res_groups__trans_implied_ids
 msgid "Transitively inherits"
 msgstr "Переходящие наследования"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_translate
-#: model:ir.model.fields,field_description:base.field_res_lang_translatable
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__translate
+#: model:ir.model.fields,field_description:base.field_res_lang__translatable
 #: model:ir.ui.view,arch_db:base.res_lang_search
 msgid "Translatable"
 msgstr "Переводимый"
@@ -20100,7 +20523,7 @@ msgid "Translated Terms"
 msgstr "Переведенные термины"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_translation_name
+#: model:ir.model.fields,field_description:base.field_ir_translation__name
 msgid "Translated field"
 msgstr "Переведенное Поле"
 
@@ -20110,17 +20533,17 @@ msgid "Translation"
 msgstr "Перевод"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_translation_value
+#: model:ir.model.fields,field_description:base.field_ir_translation__value
 msgid "Translation Value"
 msgstr "Значение Перевода"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_translation_comments
+#: model:ir.model.fields,field_description:base.field_ir_translation__comments
 msgid "Translation comments"
 msgstr "Комментарии перевода"
 
 #. module: base
-#: code:addons/base/models/ir_translation.py:635
+#: code:addons/base/models/ir_translation.py:631
 #, python-format
 msgid ""
 "Translation features are unavailable until you install an extra translation."
@@ -20134,7 +20557,7 @@ msgid "Translation in Progress"
 msgstr "Перевод в Процессе"
 
 #. module: base
-#: code:addons/base/models/ir_translation.py:556
+#: code:addons/base/models/ir_translation.py:552
 #, python-format
 msgid ""
 "Translation is not valid:\n"
@@ -20170,6 +20593,11 @@ msgid "Trinidad and Tobago"
 msgstr "Тринидад и Тобаго"
 
 #. module: base
+#: selection:res.lang,week_start:0
+msgid "Tuesday"
+msgstr "Вторник"
+
+#. module: base
 #: model:res.country,name:base.tn
 msgid "Tunisia"
 msgstr "Тунис"
@@ -20205,23 +20633,20 @@ msgid "Twitter Roller"
 msgstr "Ролик Твиттера"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_sequence_implementation
+#: model:ir.model.fields,help:base.field_ir_sequence__implementation
 msgid ""
 "Two sequence object implementations are offered: Standard and 'No gap'. The "
-"later is slower than the former but forbids anygap in the sequence (while "
+"later is slower than the former but forbids any gap in the sequence (while "
 "they are possible in the former)."
 msgstr ""
-"Предлагаются две реализации объектов последовательности: Стандартная и 'Без "
-"пробела'. Позднее медленнее, чем первый, но запрещает любой разрыв в "
-"последовательности (в то время как это возможно в первом)."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_type
-#: model:ir.model.fields,field_description:base.field_ir_logging_type
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_state
-#: model:ir.model.fields,field_description:base.field_ir_model_state
-#: model:ir.model.fields,field_description:base.field_ir_property_type
-#: model:ir.model.fields,field_description:base.field_ir_translation_type
+#: model:ir.model.fields,field_description:base.field_ir_attachment__type
+#: model:ir.model.fields,field_description:base.field_ir_logging__type
+#: model:ir.model.fields,field_description:base.field_ir_model__state
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__state
+#: model:ir.model.fields,field_description:base.field_ir_property__type
+#: model:ir.model.fields,field_description:base.field_ir_translation__type
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 #: model:ir.ui.view,arch_db:base.view_view_search
@@ -20229,8 +20654,8 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_state
-#: model:ir.model.fields,help:base.field_ir_cron_state
+#: model:ir.model.fields,help:base.field_ir_actions_server__state
+#: model:ir.model.fields,help:base.field_ir_cron__state
 msgid ""
 "Type of server action. The following values are available:\n"
 "- 'Execute Python Code': a block of python code that will be executed\n"
@@ -20242,7 +20667,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_constraint_type
+#: model:ir.model.fields,help:base.field_ir_model_constraint__type
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
@@ -20285,7 +20710,7 @@ msgstr ""
 
 #. module: base
 #: selection:ir.attachment,type:0
-#: model:ir.model.fields,field_description:base.field_ir_module_module_url
+#: model:ir.model.fields,field_description:base.field_ir_module_module__url
 #: model:ir.ui.view,arch_db:base.view_attachment_search
 msgid "URL"
 msgstr "URL ссылки"
@@ -20297,8 +20722,8 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_us_check_printing
-msgid "US Check Printing"
-msgstr "Американская печать чека"
+msgid "US Checks Layout"
+msgstr ""
 
 #. module: base
 #: model:res.country,name:base.um
@@ -20316,7 +20741,7 @@ msgid "Uganda"
 msgstr "Уганда"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_create_uid
+#: model:ir.model.fields,field_description:base.field_ir_logging__create_uid
 msgid "Uid"
 msgstr "Uid"
 
@@ -20326,7 +20751,7 @@ msgid "Ukraine"
 msgstr "Украина"
 
 #. module: base
-#: code:addons/models.py:2840
+#: code:addons/models.py:2848
 #, python-format
 msgid ""
 "Unable to delete this document because it is used as a default property"
@@ -20376,14 +20801,14 @@ msgid "Uncategorized"
 msgstr "Без категории"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:573
+#: code:addons/base/models/ir_module.py:575
 #: model:ir.ui.view,arch_db:base.module_form
 #, python-format
 msgid "Uninstall"
 msgstr "Удалить"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:582
+#: code:addons/base/models/ir_module.py:584
 #: model:ir.ui.view,arch_db:base.view_base_module_uninstall
 #, python-format
 msgid "Uninstall module"
@@ -20428,13 +20853,13 @@ msgid "Unknown"
 msgstr "Неизвестный"
 
 #. module: base
-#: code:addons/models.py:925
+#: code:addons/models.py:941
 #, python-format
 msgid "Unknown database identifier '%s'"
 msgstr "Неизвестные идентификаторы базы данных '%s'"
 
 #. module: base
-#: code:addons/models.py:786
+#: code:addons/models.py:802
 #, python-format
 msgid "Unknown error during import:"
 msgstr "Неизвестная ошибка при импорте:"
@@ -20494,9 +20919,9 @@ msgid "Update Apps List"
 msgstr "Обновить список приложений"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_constraint_date_update
-#: model:ir.model.fields,field_description:base.field_ir_model_data_date_update
-#: model:ir.model.fields,field_description:base.field_ir_model_relation_date_update
+#: model:ir.model.fields,field_description:base.field_ir_model_constraint__date_update
+#: model:ir.model.fields,field_description:base.field_ir_model_data__date_update
+#: model:ir.model.fields,field_description:base.field_ir_model_relation__date_update
 msgid "Update Date"
 msgstr "Дата Обновления"
 
@@ -20544,7 +20969,7 @@ msgid "Upgrade"
 msgstr "Обновить"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_attachment_url
+#: model:ir.model.fields,field_description:base.field_ir_attachment__url
 msgid "Url"
 msgstr "Url"
 
@@ -20564,8 +20989,8 @@ msgid "Uruguay - Chart of Accounts"
 msgstr "Уругвай - Бухгалтерский учет"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_usage
-#: model:ir.model.fields,field_description:base.field_ir_cron_usage
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__usage
+#: model:ir.model.fields,field_description:base.field_ir_cron__usage
 #: model:ir.ui.view,arch_db:base.view_server_action_search
 msgid "Usage"
 msgstr "Использование"
@@ -20577,7 +21002,7 @@ msgid "Use '1' for yes and '0' for no"
 msgstr "Используйте '1 ' - да, и '0' для не"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_sequence_use_date_range
+#: model:ir.model.fields,field_description:base.field_ir_sequence__use_date_range
 msgid "Use subsequences per date_range"
 msgstr "Использовать подпоследовательности для date_range"
 
@@ -20604,12 +21029,12 @@ msgid "Use the format '%s'"
 msgstr "Используйте формат '%s'"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_vat_label
+#: model:ir.model.fields,help:base.field_res_country__vat_label
 msgid "Use this field if you want to change vat label."
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_country_address_view_id
+#: model:ir.model.fields,help:base.field_res_country__address_view_id
 msgid ""
 "Use this field if you want to replace the usual way to encode a complete "
 "address. Note that the address_format field is used to modify the way to "
@@ -20618,7 +21043,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_relation_table
+#: model:ir.model.fields,help:base.field_ir_model_fields__relation_table
 msgid ""
 "Used for custom many2many fields to define a custom relation table name"
 msgstr ""
@@ -20626,25 +21051,25 @@ msgstr ""
 "собственного имени таблицы отношений"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_usage
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__usage
 msgid "Used to filter menu and home actions from the user form."
 msgstr ""
 "Используется для фильтрации действий меню и домашней страницы из формы "
 "пользователя."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_users_login
+#: model:ir.model.fields,help:base.field_res_users__login
 msgid "Used to log into the system"
 msgstr "Используется для входа в систему"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_sequence
+#: model:ir.model.fields,help:base.field_res_company__sequence
 msgid "Used to order Companies in the company switcher"
 msgstr "Используется для заказа компаний в коммутаторе компании"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_partner_type
-#: model:ir.model.fields,help:base.field_res_users_type
+#: model:ir.model.fields,help:base.field_res_partner__type
+#: model:ir.model.fields,help:base.field_res_users__type
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
@@ -20653,10 +21078,10 @@ msgstr ""
 " документах  продажи или покупки."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_change_password_user_user_id
-#: model:ir.model.fields,field_description:base.field_ir_default_user_id
-#: model:ir.model.fields,field_description:base.field_ir_filters_user_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_user_id
+#: model:ir.model.fields,field_description:base.field_change_password_user__user_id
+#: model:ir.model.fields,field_description:base.field_ir_default__user_id
+#: model:ir.model.fields,field_description:base.field_ir_filters__user_id
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__user_id
 #: model:ir.ui.view,arch_db:base.ir_cron_view_search
 #: model:ir.ui.view,arch_db:base.ir_default_search_view
 #: model:ir.ui.view,arch_db:base.ir_filters_view_search
@@ -20670,12 +21095,12 @@ msgid "User Interface"
 msgstr "Интерфейс пользователя"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_change_password_user_user_login
+#: model:ir.model.fields,field_description:base.field_change_password_user__user_login
 msgid "User Login"
 msgstr "Логин пользователя"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_users_log_ids
+#: model:ir.model.fields,field_description:base.field_res_users__log_ids
 msgid "User log entries"
 msgstr "Записи в журнале пользователя"
 
@@ -20694,17 +21119,17 @@ msgid "User-defined Filters"
 msgstr "Пользовательские Фильтры"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_mail_server_smtp_user
+#: model:ir.model.fields,field_description:base.field_ir_mail_server__smtp_user
 msgid "Username"
 msgstr "Имя пользователя"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users
 #: model:ir.model,name:base.model_res_users
-#: model:ir.model.fields,field_description:base.field_change_password_wizard_user_ids
-#: model:ir.model.fields,field_description:base.field_res_groups_users
-#: model:ir.model.fields,field_description:base.field_res_partner_user_ids
-#: model:ir.model.fields,field_description:base.field_res_users_user_ids
+#: model:ir.model.fields,field_description:base.field_change_password_wizard__user_ids
+#: model:ir.model.fields,field_description:base.field_res_groups__users
+#: model:ir.model.fields,field_description:base.field_res_partner__user_ids
+#: model:ir.model.fields,field_description:base.field_res_users__user_ids
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.view,arch_db:base.change_password_wizard_user_tree_view
 #: model:ir.ui.view,arch_db:base.view_groups_form
@@ -20730,7 +21155,7 @@ msgstr ""
 "группы."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_groups_implied_ids
+#: model:ir.model.fields,help:base.field_res_groups__implied_ids
 msgid "Users of this group automatically inherit those groups"
 msgstr "Пользователи этой группы автоматически наследуют эти группы"
 
@@ -20740,6 +21165,7 @@ msgid "Uzbekistan"
 msgstr "Узбекистан"
 
 #. module: base
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_vat
 #: model:res.country,vat_label:base.at model:res.country,vat_label:base.be
 #: model:res.country,vat_label:base.bg model:res.country,vat_label:base.cy
 #: model:res.country,vat_label:base.cz model:res.country,vat_label:base.de
@@ -20793,8 +21219,8 @@ msgid "Validate and format phone numbers for leads and contacts"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_config_parameter_value
-#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_value
+#: model:ir.model.fields,field_description:base.field_ir_config_parameter__value
+#: model:ir.model.fields,field_description:base.field_ir_server_object_lines__value
 #: selection:ir.server.object.lines,type:0
 #: model:ir.ui.view,arch_db:base.ir_property_view
 msgid "Value"
@@ -20807,38 +21233,38 @@ msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr "Значение '%s' не найдено в поле выбора '%%(field)s'"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_binary
+#: model:ir.model.fields,field_description:base.field_ir_property__value_binary
 msgid "Value Binary"
 msgstr "Двоичное значение"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_datetime
+#: model:ir.model.fields,field_description:base.field_ir_property__value_datetime
 msgid "Value Datetime"
 msgstr "Дата/время"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_float
+#: model:ir.model.fields,field_description:base.field_ir_property__value_float
 msgid "Value Float"
 msgstr "Число с плавающей точкой"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_integer
+#: model:ir.model.fields,field_description:base.field_ir_property__value_integer
 msgid "Value Integer"
 msgstr "Целое число"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_fields_lines
-#: model:ir.model.fields,field_description:base.field_ir_cron_fields_lines
+#: model:ir.model.fields,field_description:base.field_ir_actions_server__fields_lines
+#: model:ir.model.fields,field_description:base.field_ir_cron__fields_lines
 msgid "Value Mapping"
 msgstr "Структура значений"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_reference
+#: model:ir.model.fields,field_description:base.field_ir_property__value_reference
 msgid "Value Reference"
 msgstr "Ссылка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_property_value_text
+#: model:ir.model.fields,field_description:base.field_ir_property__value_text
 msgid "Value Text"
 msgstr "Текст"
 
@@ -20857,7 +21283,7 @@ msgstr ""
 "использоваться следующие переменные:"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_country_vat_label
+#: model:ir.model.fields,field_description:base.field_res_country__vat_label
 msgid "Vat Label"
 msgstr ""
 
@@ -20908,17 +21334,17 @@ msgid "Vietnam - Accounting Reports"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_view_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__view_id
 #: selection:ir.translation,type:0
 #: model:ir.ui.view,arch_db:base.view_view_search
 msgid "View"
 msgstr "Вид"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_arch
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_arch_base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom_arch
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__arch
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_custom__arch
 #: model:ir.ui.view,arch_db:base.view_view_custom_form
+#: model:ir.ui.view,arch_db:base.view_view_form
 #: model:ir.ui.view,arch_db:base.view_view_search
 msgid "View Architecture"
 msgstr "Архитектура представления"
@@ -20929,24 +21355,24 @@ msgid "View ID"
 msgstr "Вид ID"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_mode
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__view_mode
 msgid "View Mode"
 msgstr "Режим представления"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_name
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__name
 msgid "View Name"
 msgstr "Название представления"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__view_id
 msgid "View Ref."
 msgstr "Ссылка на представление"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_type
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_view_mode
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__view_type
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__view_mode
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__type
 #: model:ir.ui.view,arch_db:base.view_window_action_search
 msgid "View Type"
 msgstr "Тип представления"
@@ -20957,12 +21383,12 @@ msgid "View and create reports"
 msgstr "Создать и просмотреть отчёты"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_mode
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__mode
 msgid "View inheritance mode"
 msgstr "Просмотр режима наследования"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_view_type
+#: model:ir.model.fields,help:base.field_ir_actions_act_window__view_type
 msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
@@ -20979,11 +21405,10 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_ids
-#: model:ir.model.fields,field_description:base.field_ir_act_window_views
-#: model:ir.model.fields,field_description:base.field_ir_model_view_ids
-#: model:ir.model.fields,field_description:base.field_ir_module_module_views_by_module
-#: model:ir.model.fields,field_description:base.field_res_groups_view_access
+#: model:ir.model.fields,field_description:base.field_ir_actions_act_window__views
+#: model:ir.model.fields,field_description:base.field_ir_model__view_ids
+#: model:ir.model.fields,field_description:base.field_ir_module_module__views_by_module
+#: model:ir.model.fields,field_description:base.field_res_groups__view_access
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: model:ir.ui.view,arch_db:base.view_groups_form
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -21005,7 +21430,7 @@ msgstr ""
 "которые вам не нужны."
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_inherit_children_ids
+#: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_children_ids
 msgid "Views which inherit from this one"
 msgstr "Представления, которые наследуются от данного"
 
@@ -21020,7 +21445,7 @@ msgid "Virgin Islands (USA)"
 msgstr "Виргинские острова (США)"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_category_visible
+#: model:ir.model.fields,field_description:base.field_ir_module_category__visible
 msgid "Visible"
 msgstr "Видимый"
 
@@ -21058,19 +21483,19 @@ msgstr ""
 #: code:addons/base/models/ir_mail_server.py:476
 #: code:addons/base/models/ir_model.py:416
 #: code:addons/base/models/ir_model.py:491
-#: code:addons/base/models/res_partner.py:337
+#: code:addons/base/models/res_partner.py:336
 #, python-format
 msgid "Warning"
 msgstr "Предупреждение"
 
 #. module: base
-#: code:addons/base/models/res_config.py:427
+#: code:addons/base/models/res_config.py:430
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: base
-#: code:addons/models.py:4882
+#: code:addons/models.py:4924
 #, python-format
 msgid "Warnings"
 msgstr "Предупреждения"
@@ -21115,12 +21540,12 @@ msgid "Web Gantt"
 msgstr "Веб Гант"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_web_icon
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__web_icon
 msgid "Web Icon File"
 msgstr "Файл веб-значка"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_web_icon_data
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__web_icon_data
 msgid "Web Icon Image"
 msgstr "Изображение веб-иконки"
 
@@ -21136,10 +21561,10 @@ msgid "Web-only translations"
 msgstr "Веб переводы"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_module_module_website
-#: model:ir.model.fields,field_description:base.field_res_company_website
-#: model:ir.model.fields,field_description:base.field_res_partner_website
-#: model:ir.model.fields,field_description:base.field_res_users_website
+#: model:ir.model.fields,field_description:base.field_ir_module_module__website
+#: model:ir.model.fields,field_description:base.field_res_company__website
+#: model:ir.model.fields,field_description:base.field_res_partner__website
+#: model:ir.model.fields,field_description:base.field_res_users__website
 #: model:ir.module.category,name:base.module_category_website
 msgid "Website"
 msgstr "Вебсайт"
@@ -21275,13 +21700,18 @@ msgid "Website Wishlist"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_res_company_website
-#: model:ir.model.fields,help:base.field_res_partner_website
-#: model:ir.model.fields,help:base.field_res_users_website
+#: model:ir.model.fields,help:base.field_res_company__website
+#: model:ir.model.fields,help:base.field_res_partner__website
+#: model:ir.model.fields,help:base.field_res_users__website
 msgid "Website of Partner or Company"
 msgstr "Сайт партнера или компании"
 
 #. module: base
+#: selection:res.lang,week_start:0
+msgid "Wednesday"
+msgstr "Среда"
+
+#. module: base
 #: model:ir.ui.view,arch_db:base.sequence_view
 msgid "Week of the Year: %(woy)s"
 msgstr "Неделя года: %(woy)s"
@@ -21302,8 +21732,8 @@ msgid "Western Sahara"
 msgstr "Западная Сахара"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_sequence
-#: model:ir.model.fields,help:base.field_ir_cron_sequence
+#: model:ir.model.fields,help:base.field_ir_actions_server__sequence
+#: model:ir.model.fields,help:base.field_ir_cron__sequence
 msgid ""
 "When dealing with multiple actions, the execution order is based on the "
 "sequence. Low number means high priority."
@@ -21312,7 +21742,7 @@ msgstr ""
 "последовательности. Низкое значение означает высокий приоритет."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_mail_server_sequence
+#: model:ir.model.fields,help:base.field_ir_mail_server__sequence
 msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
@@ -21331,17 +21761,17 @@ msgstr ""
 "                                 использовать начало диапазона вместо текущей даты, например. %(range_year)s instead of %(year)s."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_copy
+#: model:ir.model.fields,help:base.field_ir_model_fields__copy
 msgid "Whether the value is copied when duplicating a record."
 msgstr "Будет ли значение скопировано при дублировании записи."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_store
+#: model:ir.model.fields,help:base.field_ir_model_fields__store
 msgid "Whether the value is stored in the database."
 msgstr "Значение хранится в базе данных."
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_model_fields_translate
+#: model:ir.model.fields,help:base.field_ir_model_fields__translate
 msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
@@ -21361,7 +21791,8 @@ msgid "Window Actions"
 msgstr "Действия форм"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_change_password_user_wizard_id
+#: model:ir.model.fields,field_description:base.field_base_partner_merge_line__wizard_id
+#: model:ir.model.fields,field_description:base.field_change_password_user__wizard_id
 msgid "Wizard"
 msgstr "Мастер"
 
@@ -21397,7 +21828,7 @@ msgid "Worldline SIPS"
 msgstr "Worldline SIPS"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_ir_model_access_perm_write
+#: model:ir.model.fields,field_description:base.field_ir_model_access__perm_write
 #: model:ir.ui.view,arch_db:base.ir_access_view_search
 msgid "Write Access"
 msgstr "Доступ на запись"
@@ -21408,8 +21839,8 @@ msgid "Write Access Right"
 msgstr "Право доступа на запись"
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_act_server_code
-#: model:ir.model.fields,help:base.field_ir_cron_code
+#: model:ir.model.fields,help:base.field_ir_actions_server__code
+#: model:ir.model.fields,help:base.field_ir_cron__code
 msgid ""
 "Write Python code that the action will execute. Some variables are available"
 " for use; help about pyhon expression is given in the help tab."
@@ -21444,13 +21875,13 @@ msgstr ""
 "нового пароля."
 
 #. module: base
-#: code:addons/base/models/ir_module.py:427
+#: code:addons/base/models/ir_module.py:429
 #, python-format
 msgid "You are trying to install incompatible modules in category \"%s\":"
 msgstr ""
 
 #. module: base
-#: model:ir.model.fields,help:base.field_ir_attachment_type
+#: model:ir.model.fields,help:base.field_ir_attachment__type
 msgid ""
 "You can either upload a file from your computer or copy/paste an internet "
 "link to your file."
@@ -21459,7 +21890,7 @@ msgstr ""
 " на свой файл в Интернете."
 
 #. module: base
-#: code:addons/base/models/res_partner.py:506
+#: code:addons/base/models/res_partner.py:505
 #, python-format
 msgid ""
 "You can not change the company as the partner/user has multiple user linked "
@@ -21474,7 +21905,7 @@ msgid "You can not have two users with the same login !"
 msgstr "Вы не можете иметь двух одинаковых пользователей !"
 
 #. module: base
-#: code:addons/base/models/res_users.py:377
+#: code:addons/base/models/res_users.py:387
 #, python-format
 msgid ""
 "You can not remove the admin user as it is used internally for resources "
@@ -21485,25 +21916,25 @@ msgstr ""
 "модулей, ...)"
 
 #. module: base
-#: code:addons/base/models/res_partner.py:320
+#: code:addons/base/models/res_partner.py:319
 #, python-format
 msgid "You cannot create recursive Partner hierarchies."
 msgstr "Вы не можете создавать рекурсивные иерархии контрагентов."
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:343
+#: code:addons/base/models/ir_ui_view.py:357
 #, python-format
 msgid "You cannot create recursive inherited views."
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/res_users.py:336
+#: code:addons/base/models/res_users.py:344
 #, python-format
 msgid "You cannot deactivate the admin user."
 msgstr "Вы не можете деактивировать пользователя администратора."
 
 #. module: base
-#: code:addons/base/models/res_users.py:338
+#: code:addons/base/models/res_users.py:346
 #, python-format
 msgid "You cannot deactivate the user you're currently logged in as."
 msgstr ""
@@ -21511,7 +21942,7 @@ msgstr ""
 "систему."
 
 #. module: base
-#: code:addons/base/models/res_lang.py:238
+#: code:addons/base/models/res_lang.py:245
 #, python-format
 msgid ""
 "You cannot delete the language which is Active!\n"
@@ -21521,13 +21952,25 @@ msgstr ""
 "Пожалуйста, сначала деактивируйте его."
 
 #. module: base
-#: code:addons/base/models/res_lang.py:236
+#: code:addons/base/models/res_lang.py:243
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language!"
 msgstr ""
 "Вы не можете удалить язык, который является предпочитаемым для пользователя!"
 
 #. module: base
+#: code:addons/base/wizard/base_partner_merge.py:269
+#, python-format
+msgid "You cannot merge a contact with one of his parent."
+msgstr "Нельзя объединить контакт со своим родителем."
+
+#. module: base
+#: code:addons/base/wizard/base_partner_merge.py:364
+#, python-format
+msgid "You have to specify a filter for your selection"
+msgstr "Вы должны задать фильтр для вашего выбора"
+
+#. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
 msgid "You should try other search criteria."
 msgstr "Вы должны попробовать другие критерии поиска."
@@ -21550,7 +21993,7 @@ msgstr ""
 "Вы пытаетесь удалить модуль, который установлен или отмечен для установки"
 
 #. module: base
-#: code:addons/base/models/ir_module.py:626
+#: code:addons/base/models/ir_module.py:628
 #, python-format
 msgid ""
 "You try to upgrade the module %s that depends on the module: %s.\n"
@@ -21592,13 +22035,10 @@ msgstr ""
 #: code:addons/base/models/ir_mail_server.py:224
 #, python-format
 msgid ""
-"Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
-"instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should"
-" do the trick."
+"Your Odoo Server does not support SMTP-over-SSL. You could use STARTTLS "
+"instead. If SSL is needed, an upgrade to Python 2.6 on the server-side "
+"should do the trick."
 msgstr ""
-"Ваш сервер OpenERP не поддерживает SMTP-через-SSL. Вы можете использовать "
-"STARTTLS вместо него. Если SSL необходим, должно помочь обновление до Python"
-" 2.6 на стороне сервера."
 
 #. module: base
 #: code:addons/base/models/ir_mail_server.py:477
@@ -21630,10 +22070,10 @@ msgid "Zimbabwe"
 msgstr "Зимбабве"
 
 #. module: base
-#: model:ir.model.fields,field_description:base.field_res_bank_zip
-#: model:ir.model.fields,field_description:base.field_res_company_zip
-#: model:ir.model.fields,field_description:base.field_res_partner_zip
-#: model:ir.model.fields,field_description:base.field_res_users_zip
+#: model:ir.model.fields,field_description:base.field_res_bank__zip
+#: model:ir.model.fields,field_description:base.field_res_company__zip
+#: model:ir.model.fields,field_description:base.field_res_partner__zip
+#: model:ir.model.fields,field_description:base.field_res_users__zip
 msgid "Zip"
 msgstr "Индекс"
 
@@ -21685,6 +22125,16 @@ msgid "base.language.export"
 msgstr "base.language.export"
 
 #. module: base
+#: model:ir.model,name:base.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: base
+#: model:ir.model,name:base.model_base_partner_merge_line
+msgid "base.partner.merge.line"
+msgstr "base.partner.merge.line"
+
+#. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
 msgstr "base.update.translations"
@@ -21854,7 +22304,7 @@ msgstr ""
 "        record['size'] = len(record.name)"
 
 #. module: base
-#: code:addons/base/models/res_lang.py:248
+#: code:addons/base/models/res_lang.py:255
 #, python-format
 msgid "format() must be given exactly one %char format specifier"
 msgstr "format() должен быть указан ровно один %char спецификатор формата"
@@ -22146,7 +22596,7 @@ msgid "monetary"
 msgstr ""
 
 #. module: base
-#: code:addons/base/models/ir_ui_view.py:474
+#: code:addons/base/models/ir_ui_view.py:488
 #, python-format
 msgid "n/a"
 msgstr "Недоступно"
@@ -22224,6 +22674,11 @@ msgid "selection"
 msgstr ""
 
 #. module: base
+#: model:ir.module.module,shortdesc:base.module_social_media
+msgid "social_media"
+msgstr ""
+
+#. module: base
 #: model:ir.module.module,shortdesc:base.module_test_mimetypes
 msgid "test mimetypes-guessing"
 msgstr "тест mimetypes-guessing"
@@ -22319,18 +22774,3 @@ msgstr "да"
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
 msgstr "Аландские острова"
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_cn
-msgid "中国会计科目表"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_cn_small_business
-msgid "中国小企业会计科目表"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_l10n_cn_standard
-msgid "会计科目表 - 中国企业会计准则"
-msgstr ""