summaryrefslogtreecommitdiff
path: root/addons/base_import
diff options
context:
space:
mode:
Diffstat (limited to 'addons/base_import')
-rw-r--r--addons/base_import/i18n/ar.po693
-rw-r--r--addons/base_import/i18n/base_import.pot297
-rw-r--r--addons/base_import/i18n/cs.po598
-rw-r--r--addons/base_import/i18n/de.po337
-rw-r--r--addons/base_import/i18n/es.po342
-rw-r--r--addons/base_import/i18n/fr.po338
-rw-r--r--addons/base_import/i18n/gu.po828
-rw-r--r--addons/base_import/i18n/mn.po327
-rw-r--r--addons/base_import/i18n/nb.po327
-rw-r--r--addons/base_import/i18n/nl.po333
-rw-r--r--addons/base_import/i18n/ro.po328
-rw-r--r--addons/base_import/i18n/ru.po334
-rw-r--r--addons/base_import/i18n/uk.po331
-rw-r--r--addons/base_import/i18n/zh_CN.po333
-rw-r--r--addons/base_import/i18n/zh_TW.po327
15 files changed, 4625 insertions, 1448 deletions
diff --git a/addons/base_import/i18n/ar.po b/addons/base_import/i18n/ar.po
index 20669afc457..7388ddbda2d 100644
--- a/addons/base_import/i18n/ar.po
+++ b/addons/base_import/i18n/ar.po
@@ -2,22 +2,12 @@
# This file contains the translation of the following modules:
# * base_import
#
-# Translators:
-# Mustafa Rawi <mustafa@cubexco.com>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
-# hoxhe Aits <hoxhe0@gmail.com>, 2017
-# Shaima Safar <shaima.safar@open-inside.com>, 2017
-# amrnegm <amrnegm.01@gmail.com>, 2017
-# Akram Alfusayal <akram_ma@hotmail.com>, 2017
-# Osama Ahmaro <osamaahmaro@gmail.com>, 2017
-# Islam Eldeeb <islameldeb@gmail.com>, 2017
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:53+0000\n"
-"PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Islam Eldeeb <islameldeb@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,256 +17,356 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:535
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "%d records were successfully imported"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
-msgstr "(%d إضافي)"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:309
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
"is incorrect"
msgstr ""
-"تم العثور على عمود وحيد في الملف. هذا عادة يعني أنك اخترت فاصل غير صحيح."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:89
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
-msgstr "إلغاء"
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:596
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:618
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:176
-#: code:addons/base_import/static/src/js/import_action.js:187
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:206
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
-msgstr "فاصلة"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_create_uid
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_uid
msgid "Created by"
-msgstr "أنشئ بواسطة"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_create_date
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_date
msgid "Created on"
-msgstr "أنشئ في"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
-msgstr "معرف قاعدة البيانات"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_display_name
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:56
+#, python-format
+msgid "Defer parent/child computation"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__display_name
msgid "Display Name"
-msgstr "الاسم المعروض"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:353
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
-msgstr "لا تستورد"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:195
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
-msgstr "الترميز:"
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:620
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:512
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
-msgstr "كل شيء يبدو صالحاً."
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
-msgstr "المعرف الخارجي"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
-msgstr "الملف"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_name
msgid "File Name"
-msgstr "اسم الملف"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file_type
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_type
msgid "File Type"
-msgstr "نوع الملف"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,help:base_import.field_base_import_import_file
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
-msgstr "File to check and/or import, raw binary (not base64)"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:115
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:559
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "الحصول على كل القيم المحتملة"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "المساعدة"
+msgid "Get all possible values"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:546
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
-msgstr "إليك القيم المتاحة:"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:116
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
-msgstr "إليك بداية الملف الذي لم يمكن استيراده:"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_id
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__id
msgid "ID"
-msgstr "المعرف"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:73
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -284,233 +374,281 @@ msgid ""
" field corresponding to the column. This makes imports\n"
" simpler especially when the file has many columns."
msgstr ""
-"If the file contains\n"
-" the column names, Odoo can try auto-detecting the\n"
-" field corresponding to the column. This makes imports\n"
-" simpler especially when the file has many columns."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:60
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
"will set up subscriptions and send notifications"
" during the import, but lead to a slower import."
msgstr ""
-"If the model uses openchatter, history tracking "
-"will set up subscriptions and send notifications"
-" during the import, but lead to a slower import."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:88
-#: code:addons/base_import/static/src/xml/base_import.xml:147
+#: code:addons/base_import/static/src/xml/base_import.xml:54
+#, python-format
+msgid ""
+"If the model uses parent/child relations, computing the "
+"parent / child relation occurs on every line, and lead to a slower import."
+" Defering it can speed up import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
-msgstr "استيراد"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
-msgstr "استيراد ملف"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:114
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
-msgstr "فشلت عملية معاينة الاستيراد للأسباب التالية:"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview___last_update
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview____last_update
msgid "Last Modified on"
-msgstr "آخر تعديل في"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_write_uid
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_uid
msgid "Last Updated by"
-msgstr "آخر تحديث بواسطة"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_write_date
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_date
msgid "Last Updated on"
-msgstr "آخر تحديث في"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:56
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_res_model
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__res_model
msgid "Model"
-msgstr "النموذج"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__name
msgid "Name"
-msgstr "الاسم"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
+msgid "Need Help?"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:418
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Normal Fields"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:30
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
+msgid "Normal Fields"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_othervalue
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
msgid "Other Variable"
-msgstr "Other Variable"
+msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_parent_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__parent_id
msgid "Parent"
-msgstr "الأصل"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:419
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
-msgstr "Relation Fields"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:177
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
-msgstr "Semicolon"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
-msgstr "الفاصل:"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:72
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__somevalue
msgid "Some Value"
-msgstr "Some Value"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:179
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
-msgstr "Space"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:178
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
-msgstr "Tab"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:68
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -519,64 +657,93 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:62
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
-msgstr "Track history during import"
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_value
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__value
msgid "Value"
-msgstr "القيمة"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
-msgstr "You must configure at least one field to import"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:529
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
-msgstr "at row %d"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
-msgstr "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
@@ -609,6 +776,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr ""
@@ -645,7 +822,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:531
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
-msgstr "between rows %d and %d"
+msgstr ""
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index a2273031a9b..fecaa0546b1 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,62 +17,88 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid "A single column was found in the file, this often means the file separator is incorrect"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid "An unknown issue occurred during import (possibly lost connection, data limit exceeded or memory limits exceeded). Please retry in case the issue is transient. If the issue still occurs, try to split the file rather than import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr ""
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid "Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: %(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -85,12 +111,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -102,48 +131,64 @@ msgid "Created on"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid "Creates new records if they can't be found (instead of failing to import). Note that the value in the column will be used as the new record's 'name', and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -156,53 +201,76 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr ""
@@ -218,53 +286,63 @@ msgid "File Type"
msgstr ""
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
+msgid "Formatting Options…"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
+msgid "Get all possible values"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -277,7 +355,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid "If the file contains\n"
" the column names, Odoo can try auto-detecting the\n"
@@ -287,48 +365,72 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid "If the model uses openchatter, history tracking will set up subscriptions and send notifications during the import, but lead to a slower import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid "If the model uses parent/child relations, computing the parent / child relation occurs on every line, and lead to a slower import. Defering it can speed up import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr ""
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid "Import timed out. Please retry. If you still encounter this issue, the file may be too big for the system's configuration, try to split it (import less records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -341,12 +443,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -359,12 +464,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -377,14 +485,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr ""
@@ -401,23 +516,23 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
+msgid "Need Help?"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
+msgid "No Separator"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
+msgid "Normal Fields"
msgstr ""
#. module: base_import
@@ -432,42 +547,47 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr ""
@@ -479,35 +599,35 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid "The first row\n"
" contains the label of the column"
@@ -515,37 +635,43 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -556,24 +682,45 @@ msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid "You can not import images via URL, check with your administrator or support for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr ""
@@ -604,6 +751,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr ""
@@ -640,7 +797,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr ""
diff --git a/addons/base_import/i18n/cs.po b/addons/base_import/i18n/cs.po
index 93d9e9cd88d..581d6ef35c9 100644
--- a/addons/base_import/i18n/cs.po
+++ b/addons/base_import/i18n/cs.po
@@ -2,32 +2,36 @@
# This file contains the translation of the following modules:
# * base_import
#
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2017
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~18\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 09:53+0000\n"
-"PO-Revision-Date: 2017-09-20 09:53+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:535
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "%d records were successfully imported"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:309
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -36,239 +40,333 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:89
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
-msgstr "Zrušit"
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:596
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:618
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:176
-#: code:addons/base_import/static/src/js/import_action.js:187
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:206
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_create_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_create_uid
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_uid
msgid "Created by"
-msgstr "Vytvořil(a)"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_create_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_create_date
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_date
msgid "Created on"
-msgstr "Vytvořeno"
+msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_display_name
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_display_name
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:56
+#, python-format
+msgid "Defer parent/child computation"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__display_name
msgid "Display Name"
-msgstr "Zobrazovaný název"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:353
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:195
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:620
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:512
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_name
msgid "File Name"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_file_type
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_type
msgid "File Type"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,help:base_import.field_base_import_import_file
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:115
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:559
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
+msgid "Formatting Options…"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
+msgid "Get all possible values"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:546
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:116
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__id
msgid "ID"
-msgstr "ID"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:73
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -279,7 +377,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:60
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -289,213 +387,268 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:88
-#: code:addons/base_import/static/src/xml/base_import.xml:147
+#: code:addons/base_import/static/src/xml/base_import.xml:54
+#, python-format
+msgid ""
+"If the model uses parent/child relations, computing the "
+"parent / child relation occurs on every line, and lead to a slower import."
+" Defering it can speed up import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:114
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child___last_update
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview___last_update
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview____last_update
msgid "Last Modified on"
-msgstr "Naposled upraveno"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_write_uid
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_write_uid
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_uid
msgid "Last Updated by"
-msgstr "Naposled upraveno"
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_write_date
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_write_date
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_date
msgid "Last Updated on"
-msgstr "Naposled upraveno"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:56
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_import_res_model
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__res_model
msgid "Model"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__name
msgid "Name"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
+msgid "Need Help?"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:418
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
+msgid "No Separator"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:30
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
+msgid "Normal Fields"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_othervalue
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
msgid "Other Variable"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_parent_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__parent_id
msgid "Parent"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:419
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:177
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:72
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__somevalue
msgid "Some Value"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:179
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:178
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:68
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -504,66 +657,95 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:62
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_value
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__value
msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:529
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr ""
@@ -594,6 +776,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr ""
@@ -630,7 +822,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:531
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr ""
diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po
index e5920fad6a5..7b4453233fd 100644
--- a/addons/base_import/i18n/de.po
+++ b/addons/base_import/i18n/de.po
@@ -3,24 +3,14 @@
# * base_import
#
# Translators:
-# darenkster <inactive+darenkster@transifex.com>, 2017
-# Martin Trigaux, 2017
-# Thomas Neu <t.neu@runbox.com>, 2017
-# Ermin Trevisan <trevi@twanda.com>, 2017
-# Henry Mineehen <info@mineehen.de>, 2017
-# Rudolf Schnapka <rs@techno-flex.de>, 2017
-# Tina Rittmüller <tr@ife.de>, 2017
-# Niki Waibel, 2017
-# Renzo Meister, 2017
-# Andi, 2017
-# e2f <projects@e2f.com>, 2018
+# Martin Trigaux, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Martin Trigaux, 2018\n"
"Language-Team: German (https://www.transifex.com/odoo/teams/41243/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,21 +20,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d mehr)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -55,41 +45,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Abbrechen"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Spalte %s enthält fehlerhafte Werte (Wert: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Spalte %s enthält fehlerhafte Werte. Fehler in der Zeile %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Komma"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -102,12 +124,15 @@ msgstr "Erstellt von"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -119,48 +144,67 @@ msgid "Created on"
msgstr "Erstellt am"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Währung"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Datenbank ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Datumsformat"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Tageszeit Format:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Dezimal Trennzeichen:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr "Eltern/Kind-Berechnung aufschieben"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -173,53 +217,76 @@ msgstr "Anzeigename"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Nicht importieren"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Punkt"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Herunterladen"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Zeichensatz:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Fehler bei der Analyse des Datums [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Fehlerhafte Zelle beim Lesen der XLS/XLSX-Datei gefunden: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Alles scheint o.k. zu sein."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Externe ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Feldname"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Datei"
@@ -235,53 +302,63 @@ msgid "File Type"
msgstr "Dateiformat"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Zu prüfende Datei und/oder Import, raw binary (not base64))"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "Bei CSV-Dateien könnte die Ursache in fehlerhafter Kodierung liegen."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Alle möglichen Werte holen"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Hilfe"
+msgid "Get all possible values"
+msgstr "Alle möglichen Werte holen"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Hier sind die möglichen Werte:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Hier ist der Beginn der Datei, die nicht importiert werden konnte."
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -294,7 +371,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -307,7 +384,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -320,7 +397,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -330,34 +407,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Import einer Datei"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Importiere Voransicht mit Fehler"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -370,12 +474,15 @@ msgstr "Zuletzt geändert am"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -388,12 +495,15 @@ msgstr "Zuletzt aktualisiert durch"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -406,14 +516,21 @@ msgstr "Zuletzt aktualisiert am"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Datei Laden"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Ordnen Sie die Spalten zum Importieren zu"
@@ -430,24 +547,24 @@ msgstr "Name"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Keine Datei ausgewählt..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Normale Felder"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Optionen"
+msgid "Normal Fields"
+msgstr "Normale Felder"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -461,42 +578,47 @@ msgstr "Übergeordnet"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Beziehungsfelder"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Datei erneut laden"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Wählen Sie eine CSV- oder Excel-Datei zum Importieren aus."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Semikolon"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Trennzeichen:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Felder mit Relationsfeldern anzeigen (erweitert)"
@@ -508,35 +630,35 @@ msgstr "Irgendein Wert"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Leerzeichen"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tabulator"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Test Import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Text Trennzeichen:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -547,20 +669,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Tausender Trennzeichen:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Verfolge die Historie während des Imports"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -568,7 +690,7 @@ msgstr ""
"erforderlich"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -577,12 +699,18 @@ msgstr ""
" und XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Benutzer"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -593,24 +721,47 @@ msgid "Value"
msgstr "Wert"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Sie müssen mindestens ein Feld für einen Import konfigurieren."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "in Zeile %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -641,6 +792,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -677,7 +838,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "zwischen Zeilen %d und %d"
diff --git a/addons/base_import/i18n/es.po b/addons/base_import/i18n/es.po
index 65aca84de62..e941090121f 100644
--- a/addons/base_import/i18n/es.po
+++ b/addons/base_import/i18n/es.po
@@ -3,28 +3,15 @@
# * base_import
#
# Translators:
-# Martin Trigaux, 2016
-# Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2016
-# José Vicente <txusev@gmail.com>, 2016
-# Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2016
-# Leonardo Chianea <noamixcontenidos@gmail.com>, 2016
-# Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2016
-# Ana Juaristi <ajuaristio@gmail.com>, 2016
-# Antonio Trueba, 2016
-# oihane <oihanecruce@gmail.com>, 2016
-# Carles Antoli <carlesantoli@hotmail.com>, 2016
-# Ivan Nieto <ivan.n.s@tuta.io>, 2016
-# RGB Consulting <odoo@rgbconsulting.com>, 2017
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
-# e2f <projects@e2f.com>, 2018
-# Carlos Vásquez <carlos.vasquez@clearcorp.co.cr>, 2018
+# Martin Trigaux, 2018
+# Miguel Orueta <mo@landoo.es>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Carlos Vásquez <carlos.vasquez@clearcorp.co.cr>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Miguel Orueta <mo@landoo.es>, 2018\n"
"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d más)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -59,41 +46,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Cancelar"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Columna %s contiene valores incorrectos (valores: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Columna %s contiene valores incorrectos. Error en la linea %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Coma"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -106,12 +125,15 @@ msgstr "Creado por"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -123,48 +145,67 @@ msgid "Created on"
msgstr "Creado el"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Id. de la BD"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Formato de la fecha:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Formato de fecha y hora:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Separador de decimales:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr "Diferir cálculo de padres e hijos"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -177,53 +218,76 @@ msgstr "Nombre a mostrar"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "No importar"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Punto"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Descargar"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Codificación:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Error al analizar la fecha [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Error de celda encontrado al leer el archivo XLS/XLSX: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Todo parece correcto."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "ID externo"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Nombre de campo"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Archivo"
@@ -239,53 +303,63 @@ msgid "File Type"
msgstr "Tipo de archivo"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Archivo a comprobar y/o importar, binario en bruto (no base64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "Para archivos CSV, el problema puede ser una codificación incorrecta."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Obtener todos los valores posibles"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Ayuda"
+msgid "Get all possible values"
+msgstr "Obtener todos los valores posibles"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Éstos son los posibles valores:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Éste es el comienzo del archivo que no se ha podido importar:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -298,7 +372,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -312,7 +386,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -325,7 +399,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -335,34 +409,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Importar"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Importar un Archivo"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "La previsualización de la importación ha fallado debido a:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -375,12 +476,15 @@ msgstr "Última modificación en"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -393,12 +497,15 @@ msgstr "Última actualización por"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -411,14 +518,21 @@ msgstr "Última actualización el"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Cargar fichero"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Asignar las columnas a importar"
@@ -435,24 +549,24 @@ msgstr "Nombre"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "No se ha escogido un fichero..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Campos normales"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Opciones..."
+msgid "Normal Fields"
+msgstr "Campos normales"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -466,42 +580,47 @@ msgstr "Padre"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Campos relación"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Recargar fichero"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Seleccione un archivo CSV o Excel para importar."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Punto y coma"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Separador:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Mostrar los campos de la relación (avanzado)"
@@ -513,35 +632,35 @@ msgstr "Algún valor"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Espacio"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tabulación"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Importación de prueba"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Delimitador de texto:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -550,20 +669,20 @@ msgstr "La primera fila contiene la etiqueta de la columna"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Separador de miles:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Registrar historial durante la importación"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -571,19 +690,25 @@ msgstr ""
"Python \"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr "Formato no soportado \"{}\", importar solo archivos CSV, OSD, XLS y XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -594,24 +719,47 @@ msgid "Value"
msgstr "Valor"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Debe configurar al menos un campo a importar"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "en la fila %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "Importación"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "Cadena de los modelos de test de importación"
@@ -642,6 +790,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "Cadena de sólo lectura de los modelos de test de importación"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "Relación many2one de los test de importación"
@@ -680,7 +838,7 @@ msgstr "Previsualización de los modelos de test de importación"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "entre las filas %d y %d"
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index 93fb356412c..031ff095e1f 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/i18n/fr.po
@@ -3,25 +3,15 @@
# * base_import
#
# Translators:
-# Xavier Belmere <Info@cartmeleon.com>, 2016
-# Martin Trigaux, 2016
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Xavier Symons <xsy@openerp.com>, 2016
-# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2016
-# Fabrice Henrion, 2016
-# Fabien Pinckaers <fp@openerp.com>, 2016
-# Xavier Brochard <xavier@alternatif.org>, 2017
-# Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017
-# Lionel Sausin <ls@numerigraphe.com>, 2017
-# Richard Mathot <rim@odoo.com>, 2017
-# e2f <projects@e2f.com>, 2018
+# Martin Trigaux, 2018
+# Fabien Pinckaers <fp@openerp.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Fabien Pinckaers <fp@openerp.com>, 2018\n"
"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d en plus)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -56,42 +46,74 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Annuler"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "La colonne %s contient des valeurs incorrectes (valeur: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
"La colonne %s contient des valeurs incorrectes. Erreur à la ligne %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Virgule"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -104,12 +126,15 @@ msgstr "Créé par"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -121,48 +146,67 @@ msgid "Created on"
msgstr "Créé le"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Devise"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Id. base de données"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Format de date"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Format de date et heure:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Séparateur de décimales"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -175,34 +219,45 @@ msgstr "Nom affiché"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Ne pas importer"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Point"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Télécharger"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Codage des caractères :"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Erreur lors du parsing de la date [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
@@ -210,19 +265,31 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Tout semble correct."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "ID Externe"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Nom de Champ"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Fichier"
@@ -238,54 +305,63 @@ msgid "File Type"
msgstr "Type de fichier"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Fichier à tester et/ou importer, binaire brut (pas Base64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
-"Pour les fichiers CSV, le problème pourrait être un encodage incorrect."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Obtenir toutes les valeurs possibles"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Aide"
+msgid "Get all possible values"
+msgstr "Obtenir toutes les valeurs possibles"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Voici les valeurs disponibles :"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Voici le début du fichier qu'il n'a pas été possible d'importer"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -298,7 +374,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -313,7 +389,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -327,7 +403,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -337,34 +413,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Importer"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Importer un Fichier"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "La prévisualisation de l'import à échoué à cause de :"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -377,12 +480,15 @@ msgstr "Dernière Modification le"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -395,12 +501,15 @@ msgstr "Dernière mise à jour par"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -413,14 +522,21 @@ msgstr "Dernière mise à jour le"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Choisir un fichier"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Faire correspondre les colonnes à importer"
@@ -437,24 +553,24 @@ msgstr "Nom"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Aucun fichier choisi..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Champs normaux"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Réglages..."
+msgid "Normal Fields"
+msgstr "Champs normaux"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -468,42 +584,47 @@ msgstr "Parent"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Champs relationnels"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Recharger"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Choisissez un fichier CSV ou Excel à importer."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Point-virgule"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Séparateur :"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Afficher les champs de relation (avancé)"
@@ -515,35 +636,35 @@ msgstr "Une valeur"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Espace"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tabulation"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Test d'importation"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Séparateur de texte:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -554,20 +675,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Séparateur des milliers"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Activer l'historique des modifications pendant l'importation"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -575,7 +696,7 @@ msgstr ""
"\"{modname}\" est requis"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -584,12 +705,18 @@ msgstr ""
"compte que les formats CSV, ODS, XLS et XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Utilisateurs"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -600,24 +727,47 @@ msgid "Value"
msgstr "Valeur"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Vous devez paramétrer au moins un champ à importer"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "à la ligne %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -648,6 +798,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -684,7 +844,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "entre les lignes %d et %d"
diff --git a/addons/base_import/i18n/gu.po b/addons/base_import/i18n/gu.po
new file mode 100644
index 00000000000..0725973257c
--- /dev/null
+++ b/addons/base_import/i18n/gu.po
@@ -0,0 +1,828 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_import
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Language-Team: Gujarati (https://www.transifex.com/odoo/teams/41243/gu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "%d records were successfully imported"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:647
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:378
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:711
+#, python-format
+msgid "Column %s contains incorrect values (value: %s)"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:806
+#, python-format
+msgid "Column %s contains incorrect values. Error in line %d: %s"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
+#, python-format
+msgid "Comma"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:83
+#, python-format
+msgid "Date Format:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:84
+#, python-format
+msgid "Datetime Format:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:88
+#, python-format
+msgid "Decimal Separator:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:56
+#, python-format
+msgid "Defer parent/child computation"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:445
+#, python-format
+msgid "Don't import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:229
+#, python-format
+msgid "Dot"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:808
+#, python-format
+msgid "Error Parsing Date [%s:L%d]: %s"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:288
+#, python-format
+msgid "Error cell found while reading XLS/XLSX file: %s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:624
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
+msgid "File"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_name
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__file_type
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,help:base_import.field_base_import_import__file
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:137
+#, python-format
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:13
+#, python-format
+msgid "Formatting Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:671
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:658
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:138
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__id
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:67
+#, python-format
+msgid ""
+"If the file contains\n"
+" the column names, Odoo can try auto-detecting the\n"
+" field corresponding to the column. This makes imports\n"
+" simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:45
+#, python-format
+msgid ""
+"If the model uses openchatter, history tracking "
+"will set up subscriptions and send notifications"
+" during the import, but lead to a slower import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:54
+#, python-format
+msgid ""
+"If the model uses parent/child relations, computing the "
+"parent / child relation occurs on every line, and lead to a slower import."
+" Defering it can speed up import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
+#, python-format
+msgid "Import a File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:101
+#, python-format
+msgid "Load File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
+#, python-format
+msgid "Map your columns to import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_import__res_model
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__name
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:85
+#, python-format
+msgid "Need Help?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:231
+#, python-format
+msgid "No Separator"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:513
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__parent_id
+msgid "Parent"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:514
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:100
+#, python-format
+msgid "Reload File"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:79
+#, python-format
+msgid "Select a CSV or Excel file to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:212
+#, python-format
+msgid "Semicolon"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:79
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:66
+#, python-format
+msgid "Show fields of relation fields (advanced)"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__somevalue
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:214
+#, python-format
+msgid "Space"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:213
+#, python-format
+msgid "Tab"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:99
+#, python-format
+msgid "Test Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:80
+#, python-format
+msgid "Text Delimiter:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:62
+#, python-format
+msgid ""
+"The first row\n"
+" contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:87
+#, python-format
+msgid "Thousands Separator:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:47
+#, python-format
+msgid "Track history during import"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:253
+#, python-format
+msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:254
+#, python-format
+msgid ""
+"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__value
+msgid "Value"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:641
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:643
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
diff --git a/addons/base_import/i18n/mn.po b/addons/base_import/i18n/mn.po
index d34b9d4e606..b1068bd1daa 100644
--- a/addons/base_import/i18n/mn.po
+++ b/addons/base_import/i18n/mn.po
@@ -5,15 +5,13 @@
# Translators:
# Martin Trigaux, 2018
# Otgonbayar.A <gobi.mn@gmail.com>, 2018
-# Khishigbat Ganbold <khishigbat@asterisk-tech.mn>, 2018
-# Onii Onii <onii0223@yahoo.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Onii Onii <onii0223@yahoo.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Otgonbayar.A <gobi.mn@gmail.com>, 2018\n"
"Language-Team: Mongolian (https://www.transifex.com/odoo/teams/41243/mn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d илүү)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -48,41 +46,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Цуцлах"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "%s багана буруу утга (утга: %s) агуулж байна"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "%s багана буруу утга агуулж байна. Алдааны мөр %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Таслал"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -95,12 +125,15 @@ msgstr "Үүсгэгч"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -112,48 +145,67 @@ msgid "Created on"
msgstr "Үүсгэсэн"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Валют"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Өгөгдлийн сангийн дугаар"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Огнооны Формат:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Огноо цагийн Формат:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Аравны тусгаарлагч:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -166,53 +218,76 @@ msgstr "Дэлгэцийн Нэр"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Импортлогдохгүй"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Цэг"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Татах"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Кодчилол:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Огноог задлахад алдаа [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "XLS/XLSX файлыг уншихад алдаатай нүд олдлоо: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Бүх зүйл зөв шиг байна."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Гадаад ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Талбарын нэр"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Файл"
@@ -228,53 +303,63 @@ msgid "File Type"
msgstr "Файлын төрөл"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Шалгах юмуу эсвэл импортлох файл, түүхий хоёртын (base64 биш)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "CSV файлд буруу шивсэн алдаа байж магадгүй."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Бүх боломжит утгыг авах"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Тусламж"
+msgid "Get all possible values"
+msgstr "Бүх боломжит утгыг авах"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Эдгээр боломжит утгууд:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Энд бидний импорт хийж чадаагүй файлын эхэн хэсэг байна:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -287,7 +372,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -302,7 +387,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -315,7 +400,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -325,34 +410,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Импортлох"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Файл импортлох"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Импортыг урьдчилан харуулах явдал дараах шалтгаанаар бүтсэнгүй:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -365,12 +477,15 @@ msgstr "Сүүлийн засвар хийсэн огноо"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -383,12 +498,15 @@ msgstr "Сүүлийн засвар хийсэн"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -401,14 +519,21 @@ msgstr "Сүүлийн засвар хийсэн огноо"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Файл Ачааллах"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Импортлох багануудаа харгалзуулах"
@@ -425,24 +550,24 @@ msgstr "Нэр"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Файл сонгогдоогүй..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Хэвийн талбарууд"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Сонголтууд…"
+msgid "Normal Fields"
+msgstr "Хэвийн талбарууд"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -456,42 +581,47 @@ msgstr "Эцэг"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Харицааны талбарууд"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Файл дахин ачааллах"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Нөөцийн Модель"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Импортлох CSV эсвэл Excel файл сонгоно уу."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Цэг таслал"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Тусгаарлах тэмдэгт:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Хүснэгтийн талбаруудыг харуулах (ахисан түвшин)"
@@ -503,35 +633,35 @@ msgstr "Зарим утга"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Зай"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Таб"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Текст Тусгаарлагач:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -542,20 +672,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Мянгатын тусгаарлагч:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Импортлох явцад түүхийг хөтлөх"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -563,7 +693,7 @@ msgstr ""
" модуль шаардлагатай"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -571,12 +701,18 @@ msgstr ""
"Дэмжигдэхгүй формат \"{}\", импорт нь зөвхөн CSV, ODS, XLS, XLSX-г дэмждэг"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -587,24 +723,47 @@ msgid "Value"
msgstr "Утга"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Импортлох дор хаяж нэг талбарыг тохируулсан байх ёстой"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "%d дугаар мөрд"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "суурь"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -635,6 +794,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -671,7 +840,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "%d болон %d дугаар мөрүүдийн хооронд"
diff --git a/addons/base_import/i18n/nb.po b/addons/base_import/i18n/nb.po
index 8bf84d970f6..a3622f6782e 100644
--- a/addons/base_import/i18n/nb.po
+++ b/addons/base_import/i18n/nb.po
@@ -4,17 +4,13 @@
#
# Translators:
# Martin Trigaux, 2018
-# Aleksander, 2018
-# Viktor Basso <viktor@voit.no>, 2018
-# Jorunn D. Newth, 2018
-# Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Martin Trigaux, 2018\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,21 +20,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d flere)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -48,42 +44,74 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Kanseller"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Kolonne %s inneholder verdier som ikke er riktige (verdi: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
"Kolonne %s inneholder verdier som ikke er korrekte. Feil i linje %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Komma"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -96,12 +124,15 @@ msgstr "Opprettet av"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -113,48 +144,67 @@ msgid "Created on"
msgstr "Opprettet"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Database-ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Datoformat:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Format for dato og tid:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Desimalskilletegn:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -167,53 +217,76 @@ msgstr "Visningsnavn"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Ikke importer"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Last ned"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Tegnkoding:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Feil ved lesing av dato [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Feil i celle funnet ved lesing av XLS/XLSX-fil: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Alt virker gyldig."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Ekstern ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Fil"
@@ -229,53 +302,63 @@ msgid "File Type"
msgstr "Filtype"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Filen for å kontrollere og / eller import, rå binære (ikke base64."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Få alle mulige verdier"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Hjelp"
+msgid "Get all possible values"
+msgstr "Få alle mulige verdier"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Her er de mulige verdiene:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Her er begynnelsen på filen vi ikke kunne importere:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -288,7 +371,7 @@ msgstr "IDID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -299,7 +382,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -309,7 +392,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -319,34 +402,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Importer fil"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Forhåndsvisning av import feilet på grunn av:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -359,12 +469,15 @@ msgstr "Sist endret"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -377,12 +490,15 @@ msgstr "Sist oppdatert av"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -395,14 +511,21 @@ msgstr "Sist oppdatert"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Last inn fil"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr ""
@@ -419,24 +542,24 @@ msgstr "Navn"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Ingen fil valgt..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Normale felter"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Alternativer..."
+msgid "Normal Fields"
+msgstr "Normale felter"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -450,42 +573,47 @@ msgstr "Overordnet"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Forhold feltene."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Last inn fil på nytt"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Velg en CSV eller Excel-fil å importere."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Semikolon"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Separator:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr ""
@@ -497,35 +625,35 @@ msgstr "Noen verdi."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tab"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Test import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Tekst-skilletegn:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -536,26 +664,26 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Skilletegn for tusener:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Spor historikk under import"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr "Kunne ikke laste inn \"{extension}\"-fil, krever Python-modul \"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -564,12 +692,18 @@ msgstr ""
"XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Brukere"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -580,24 +714,47 @@ msgid "Value"
msgstr "Verdi"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Du må sette opp minst ett felt å importere"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "på rad %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -628,6 +785,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -664,7 +831,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "mellom radene %d og %d"
diff --git a/addons/base_import/i18n/nl.po b/addons/base_import/i18n/nl.po
index 4b176ffe688..bfe75876184 100644
--- a/addons/base_import/i18n/nl.po
+++ b/addons/base_import/i18n/nl.po
@@ -3,18 +3,15 @@
# * base_import
#
# Translators:
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-# Martin Trigaux, 2016
-# Eric Geens <ericgeens@yahoo.com>, 2016
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
-# Cas Vissers <casvissers@brahoo.nl>, 2016
+# Martin Trigaux, 2018
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2016\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
-msgstr "Importeer sjabloon voor klanten"
+msgid "%d records were successfully imported"
+msgstr "%d records zijn succesvol geïmporteerd"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d meer)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -49,41 +46,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Annuleer"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Kolom %s bevat een incorrecte waarde (waarde: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Kolom %s bevat incorrecte waarde. Fout in regel %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Komma"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -96,12 +125,15 @@ msgstr "Aangemaakt door"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -113,48 +145,67 @@ msgid "Created on"
msgstr "Aangemaakt op"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "Database ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Datumnotatie:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Datumnotatie:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Decimaal scheidingsteken:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr "Uitstellen boven/onderliggende berekening"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -167,53 +218,76 @@ msgstr "Schermnaam"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Niet importeren"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Punt"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Downloaden"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Codering:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Fout bij maken datum [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Foute cel gevonden bij het inlezen van het XLS/XLSX-bestand: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Alle velden lijken geldig."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Externe ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Veldnaam"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Bestand"
@@ -229,54 +303,63 @@ msgid "File Type"
msgstr "Bestandstype"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Te controleren en/of te importeren bestand, raw binair (niet base64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
-"Bij CSV bestanden kan het probleem te wijten zijn aan een onjuiste codering."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Alle positieve waardes ophalen"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Help"
+msgid "Get all possible values"
+msgstr "Alle positieve waardes ophalen"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Hier de mogelijke waarden."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Hier is de start van het bestand welke we niet konden importeren:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -289,7 +372,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -304,7 +387,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -317,7 +400,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -327,34 +410,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Importeren"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Een bestand importeren"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Import voorbeeld mislukt omdat:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -367,12 +477,15 @@ msgstr "Laatst gewijzigd op"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -385,12 +498,15 @@ msgstr "Laatst bijgewerkt door"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -403,14 +519,21 @@ msgstr "Laatst bijgewerkt op"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Laad bestand"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Map uw kolommen om te importeren"
@@ -427,24 +550,24 @@ msgstr "Naam"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Geen bestand gekozen..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Normale velden"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Opties..."
+msgid "Normal Fields"
+msgstr "Normale velden"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -458,42 +581,47 @@ msgstr "Bovenliggend"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Relatie velden"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Opnieuw laden bestand"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Selecteer CSV of Excel bestand voor importeren."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Puntkomma"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Scheidingsteken:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Laat velden van relationele velden zien (geavanceerd)"
@@ -505,35 +633,35 @@ msgstr "Zelfde waarde"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Spatie"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tab"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Test import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Tekstscheidingsteken:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -544,20 +672,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Scheidingsteken voor duizendtallen:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Volg geschiedenis tijdens importeren"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -565,7 +693,7 @@ msgstr ""
" vereist Python."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -574,12 +702,18 @@ msgstr ""
"worden bij het importeren ondersteund."
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -590,24 +724,47 @@ msgid "Value"
msgstr "Waarde"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "U dient minstens een veld te confituren om te importeren"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "op regel %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "basis"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -638,6 +795,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -674,7 +841,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "Tussen regel %d en %d"
diff --git a/addons/base_import/i18n/ro.po b/addons/base_import/i18n/ro.po
index 15f5e15455a..94a232bedbc 100644
--- a/addons/base_import/i18n/ro.po
+++ b/addons/base_import/i18n/ro.po
@@ -4,16 +4,13 @@
#
# Translators:
# Martin Trigaux, 2018
-# Fekete Mihai <mihai.fekete@forestandbiomass.ro>, 2018
-# Dorin Hongu <dhongu@gmail.com>, 2018
-# Cozmin Candea <office@terrabit.ro>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Cozmin Candea <office@terrabit.ro>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Martin Trigaux, 2018\n"
"Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,21 +20,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d mai mult)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -48,41 +45,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Anulează"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Coloana %s conține valori incorecte (valoare: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Coloana %s conține valori incorecte. Eroare în linia %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Virgulă"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -95,12 +124,15 @@ msgstr "Creat de"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -112,48 +144,67 @@ msgid "Created on"
msgstr "Creat în"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "ID-ul Bază date"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Format dată:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Format datetimp:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Separator Zecimal"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -166,53 +217,76 @@ msgstr "Nume afișat"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Nu importă"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Punct"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Descarcă"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Codificare:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Eroare procesare Dată [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Eroare în celculă făsită la citirea fișierului XLS/XLSX : %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Totul pare valabil."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "ID extern"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Nume câmp"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Fișier"
@@ -228,53 +302,63 @@ msgid "File Type"
msgstr "Tip fișier"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Fisier de verificat si/sau importat, binar prim (nu baza64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "Pentru fișiere CSV, problema poate fi o codificare incorectă."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Obtineți toate valorile posibile"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Suport"
+msgid "Get all possible values"
+msgstr "Obtineți toate valorile posibile"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Iata valorile posibile"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Iata inceputul fisierului pe care nu l-am putut importa:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -287,7 +371,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -302,7 +386,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -315,7 +399,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -325,34 +409,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Importă"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Importă un Fișier"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Previzualizarea importului a eșuat din cauza:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -365,12 +476,15 @@ msgstr "Ultima modificare la"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -383,12 +497,15 @@ msgstr "Ultima actualizare făcută de"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -401,14 +518,21 @@ msgstr "Ultima actualizare pe"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Încarcă fișier"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Mapați coloane pentru import"
@@ -425,24 +549,24 @@ msgstr "Nume"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Fără fișier ales..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Câmpuri obișnuite"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Opțiuni..."
+msgid "Normal Fields"
+msgstr "Câmpuri obișnuite"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -456,42 +580,47 @@ msgstr "Părinte"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Campuri de Legatura"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Reîncarcă fișierul"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Selectați un fișier CSV sau Excel pentru import."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Punct si virgula"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Separator:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Afișare câmpuri din câmpuri relaționate (avansat)"
@@ -503,35 +632,35 @@ msgstr "Niște valori"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Spațiu"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tab"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Delimitator text:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -542,20 +671,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Separator mii:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Urmărește istoric în timpul importului"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -563,7 +692,7 @@ msgstr ""
"\"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -572,12 +701,18 @@ msgstr ""
" și XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Utilizatori"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -588,24 +723,47 @@ msgid "Value"
msgstr "Valoare"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Trebuie să configurați cel puțin un câmp de importat"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "la rândul %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -636,6 +794,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -672,7 +840,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "între rândurile %d și %d"
diff --git a/addons/base_import/i18n/ru.po b/addons/base_import/i18n/ru.po
index ca49ae4ffdd..341e85c74ef 100644
--- a/addons/base_import/i18n/ru.po
+++ b/addons/base_import/i18n/ru.po
@@ -3,20 +3,15 @@
# * base_import
#
# Translators:
-# Martin Trigaux, 2017
-# Viktor Pogrebniak <vp@aifil.ru>, 2017
-# Collex100, 2017
-# Max Belyanin <maxbelyanin@gmail.com>, 2017
-# Sergey Vilizhanin, 2017
-# Максим Дронь <dronmax@gmail.com>, 2017
-# Владимир Куряев <istercul@gmail.com>, 2017
+# Martin Trigaux, 2018
+# Collex100, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Владимир Куряев <istercul@gmail.com>, 2017\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Collex100, 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"
@@ -26,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d больше)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -51,41 +46,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Отменить"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Колонка %s содержит неверные значения (значение: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Столбец %s содержит неверные значения. Ошибка в строке %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Запятая"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -98,12 +125,15 @@ msgstr "Создано"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -115,48 +145,67 @@ msgid "Created on"
msgstr "Создан"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "ID базы данных"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Формат даты: "
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Формат даты и времени:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Десятичный разделитель:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -169,53 +218,76 @@ msgstr "Отображаемое Имя"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Не импортировать"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Точка"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Скачать"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Кодировка:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Ошибка парсинга данных [%s: L %d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Найдены ошибки в ячейках при чтении файла XLS/XLSX: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Все кажется корректным."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Внешний ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Имя поля"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Файл"
@@ -231,53 +303,63 @@ msgid "File Type"
msgstr "Тип файла"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Файл для проверки и/или импорта, двоичный код (не base64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "Для CSV-файлов, проблема может быть в неправильной кодировки."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Получить все возможные значения"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Помощь"
+msgid "Get all possible values"
+msgstr "Получить все возможные значения"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Вот возможные значения:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Вот начало файла, который мы не могли импортировать:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -290,7 +372,7 @@ msgstr "Номер"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -304,7 +386,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -317,7 +399,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -327,34 +409,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Импорт"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Импортировать файл"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Импорт предварительного просмотра не удался по причине:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -367,12 +476,15 @@ msgstr "Последнее изменение"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -385,12 +497,15 @@ msgstr "Последний раз обновил"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -403,14 +518,21 @@ msgstr "Последнее обновление"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Загрузить файл"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Отметьте колонки для импорта"
@@ -427,24 +549,24 @@ msgstr "Название"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Файл не выбран…"
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Обычные поля"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Настройки…"
+msgid "Normal Fields"
+msgstr "Обычные поля"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -458,42 +580,47 @@ msgstr "Родитель"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Поля отношений"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Перезагрузить файл"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Выбрать файл CSV или Excel для импорта."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Точка с запятой"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Разделитель:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Показать поля полей отношений (расширенные)"
@@ -505,35 +632,35 @@ msgstr "Некоторые Значения"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Пробел"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Табуляция"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Ограничитель текста:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -544,27 +671,27 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Разделитель тысяч:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Отслеживание истории при импорте"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
"Невозможно загрузить файл «{extension}»: требуется Python-модуль «{modname}»"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -573,12 +700,18 @@ msgstr ""
"ODS, XLS и XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Пользователи"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -589,24 +722,47 @@ msgid "Value"
msgstr "Объём"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Вы должны настроить хотя бы одно поле для импорта"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "в строке %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -637,6 +793,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -673,7 +839,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "между колонками %d и %d"
diff --git a/addons/base_import/i18n/uk.po b/addons/base_import/i18n/uk.po
index ec912124f69..8ef8c08ebef 100644
--- a/addons/base_import/i18n/uk.po
+++ b/addons/base_import/i18n/uk.po
@@ -3,17 +3,15 @@
# * base_import
#
# Translators:
-# Bohdan Lisnenko, 2018
-# ТАрас <tratatuta@i.ua>, 2018
-# rontif <oleksandr.basenko@gmail.com>, 2018
-# Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
"Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "(%d більше)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -48,41 +46,73 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "Скасувати"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "Колонка %s містить невірні значення (значення: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "Колонка %s містить невірні значення. Помилка в рядку %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "Кома"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -95,12 +125,15 @@ msgstr "Створив"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -112,48 +145,67 @@ msgid "Created on"
msgstr "Створено"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "ID бази даних"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "Формат дати:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "Формат дати та часу:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "Десятковий розділювач:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr "Відкласти батьківське/дочірнє обчислення"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -166,53 +218,76 @@ msgstr "Назва для відображення"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "Не імпортувати"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "Крапка"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "Завантажити"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "Кодування:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "Помилка аналізу дати [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "Знайдено помилку під час читання файлу XLS/XLSX: %s"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "Все здається вірним."
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "Зовнішній ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "Назва поля"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "Файл"
@@ -228,53 +303,63 @@ msgid "File Type"
msgstr "Тип файлу"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "Файл для перевірки та/або імпорту, бінарний файл (не base64)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "Для файлів CSV проблема може бути некоректною кодуванням."
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "Отримайте всі можливі значення"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "Допомога"
+msgid "Get all possible values"
+msgstr "Отримайте всі можливі значення"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "Тут можливі значення:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "Ось початок файла, який не вдалося імпортувати:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -287,7 +372,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -302,7 +387,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -315,7 +400,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -325,34 +410,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "Імпорт"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "Імпорт файлу"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "Помилка попереднього перегляду імпорту через:"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -365,12 +477,15 @@ msgstr "Остання модифікація"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -383,12 +498,15 @@ msgstr "Востаннє оновив"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -401,14 +519,21 @@ msgstr "Останнє оновлення"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "Завантажити файл"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "Позначте ваші колонки для імпорту"
@@ -425,24 +550,24 @@ msgstr "Назва"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "Не вибрано жодного файлу..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "Нормальні поля"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "Функції…"
+msgid "Normal Fields"
+msgstr "Нормальні поля"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -456,42 +581,47 @@ msgstr "Батьківський"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "Пов’язані поля"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "Перезавантажити файл"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Модель резервування"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "Оберіть файл CSV або Excel для імпорту."
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "Крапка з комою"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "Роздільник:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "Показати поля посилань (розширений)"
@@ -503,35 +633,35 @@ msgstr "Деяке значення"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "Пробіл"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "Tab"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "Тестувати імпорт"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "Роздільник тексту:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -542,20 +672,20 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "Тисячі сепараторів:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "Історія переміщень під час імпорту"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
@@ -563,7 +693,7 @@ msgstr ""
"\"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
@@ -572,12 +702,18 @@ msgstr ""
" XLSX"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "Користувачі"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -588,24 +724,47 @@ msgid "Value"
msgstr "Значення"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "Щоб імпортувати, потрібно налаштувати хоча б одне поле"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "в рядку %d"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "база"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -636,6 +795,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -672,7 +841,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "між рядками %d та %d"
diff --git a/addons/base_import/i18n/zh_CN.po b/addons/base_import/i18n/zh_CN.po
index 9b8d0db3d43..35121016c66 100644
--- a/addons/base_import/i18n/zh_CN.po
+++ b/addons/base_import/i18n/zh_CN.po
@@ -3,19 +3,15 @@
# * base_import
#
# Translators:
-# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
-# Martin Trigaux, 2016
-# 苏州远鼎 <tiexinliu@126.com>, 2016
-# liAnGjiA <liangjia@qq.com>, 2016
-# 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2018
-# John Lin <linyinhuan@139.com>, 2018
+# Martin Trigaux, 2018
+# Gary Wei <Gary.wei@elico-corp.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: John Lin <linyinhuan@139.com>, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>, 2018\n"
"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "( %d 更多)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -48,41 +44,73 @@ msgstr "文件中仅有一栏,这经常意味着文件分隔符不正确"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "取消"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "栏位 %s 包含非法数据(值: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "栏位 %s 包含非法数据。值 %d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "逗号"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -95,12 +123,15 @@ msgstr "创建人"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -112,48 +143,67 @@ msgid "Created on"
msgstr "创建时间"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "币种"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "数据库 ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "数据格式:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "日期时间格式:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "十进制分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr "推迟父/子计算"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -166,53 +216,76 @@ msgstr "显示名称"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "不导入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "点"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "下载"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "编码:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "日期语法错误 [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "读取XLS/XLSX文件: %s 时发现错误单元格"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "看上去一切正常。"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "外部 ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "字段名称"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "文件"
@@ -228,53 +301,63 @@ msgid "File Type"
msgstr "文件类型"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "文件的审核或导入, 原始二进制编码(不是base64编码)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "对于CSV文件来说,这个问题可能由错误的编码造成。"
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "获取所有可能的值"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "帮助"
+msgid "Get all possible values"
+msgstr "获取所有可能的值"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "这里是可能的值:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "下面是我们无法导入的起始文件:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -287,7 +370,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -302,7 +385,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -312,7 +395,7 @@ msgstr "如果该数据模型声明使用openchatter,历史跟踪功能,系ç
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -322,34 +405,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "导入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "导入文件"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "导入预览文件失败"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -362,12 +472,15 @@ msgstr "最后修改日"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -380,12 +493,15 @@ msgstr "最后更新人"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -398,14 +514,21 @@ msgstr "最后更新时间"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "加载文件"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "匹配导入列"
@@ -422,24 +545,24 @@ msgstr "名称"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "没有选择文件..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "正常字段"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "选项..."
+msgid "Normal Fields"
+msgstr "正常字段"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -453,42 +576,47 @@ msgstr "上级"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "关联字段"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "重新载入文件"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "选择 CSV 或者 Excel 文件导入。"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "分号"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "显示关系字段的字段(高级)"
@@ -500,35 +628,35 @@ msgstr "一些值"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "空格键"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "选项卡"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "测试导入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "文本分隔符: "
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -537,38 +665,44 @@ msgstr "文件的第一行包含表头"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "千分位分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "导入时跟踪导入历史"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr "无法装载 \"{extension}\" 文件:需要Python 模块 \"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr "不支持的文件格式 \"{}\",只支持导入CSV, ODS, XLS, XLSX格式"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -579,24 +713,47 @@ msgid "Value"
msgstr "值"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "You must configure at least one field to import"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "在 %d 行"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "基础"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -627,6 +784,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -663,7 +830,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "在第 %d 行和第 %d 行之间"
diff --git a/addons/base_import/i18n/zh_TW.po b/addons/base_import/i18n/zh_TW.po
index fcf58eb7bb0..4d7c55080e2 100644
--- a/addons/base_import/i18n/zh_TW.po
+++ b/addons/base_import/i18n/zh_TW.po
@@ -3,15 +3,15 @@
# * base_import
#
# Translators:
-# 敬雲 林 <chingyun@yuanchih-consult.com>, 2018
# Martin Trigaux, 2018
+# 敬雲 林 <chingyun@yuanchih-consult.com>, 2018
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: 敬雲 林 <chingyun@yuanchih-consult.com>, 2018\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/odoo/teams/41243/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,21 +21,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr "( 更多 %d)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid ""
"A single column was found in the file, this often means the file separator "
@@ -44,41 +44,73 @@ msgstr "文件中僅有一欄,這經常意味著文件分隔符不正確"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid ""
+"An unknown issue occurred during import (possibly lost connection, data "
+"limit exceeded or memory limits exceeded). Please retry in case the issue is"
+" transient. If the issue still occurs, try to split the file rather than "
+"import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr "取消"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr "列 %s 包含非法數據(值: %s)"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr "列 %s 包含非法數據. 錯誤在行%d: %s"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr "逗號"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid ""
+"Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: "
+"%(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -91,12 +123,15 @@ msgstr "創建者"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -108,48 +143,67 @@ msgid "Created on"
msgstr "創建時間"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid ""
+"Creates new records if they can't be found (instead of failing to import). "
+"Note that the value in the column will be used as the new record's 'name', "
+"and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr "資料庫 ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr "數據格式:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr "日期時間格式:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr "十進制分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -162,53 +216,76 @@ msgstr "顯示名稱"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr "不導入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr "點"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr "下載"
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr "編碼:"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr "日期語法錯誤 [%s:L%d]: %s"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr "讀取XLS/XLSX文件: %s 時發現錯誤單元格"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr "看上去一切正常。"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr "外部 ID"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr "字段名稱"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr "文件"
@@ -224,53 +301,63 @@ msgid "File Type"
msgstr "文件類型"
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr "文件的審核或導入, 原始二進制編碼(不是base64編碼)"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
-msgstr "對於CSV文件來說,這個問題可能由錯誤的編碼造成。"
+msgid "For CSV files, you may need to select the correct separator."
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
-msgstr "獲取所有可能的值"
+msgid "Formatting Options…"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
-msgstr "幫助"
+msgid "Get all possible values"
+msgstr "獲取所有可能的值"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr "這裡是可能的值:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr "下面是我們無法導入的起始文件:"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -283,7 +370,7 @@ msgstr "ID"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid ""
"If the file contains\n"
@@ -298,7 +385,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid ""
"If the model uses openchatter, history tracking "
@@ -308,7 +395,7 @@ msgstr "如果該數據模型聲明使用openchatter,歷史追蹤功能,系ç
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid ""
"If the model uses parent/child relations, computing the "
@@ -318,34 +405,61 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr "導入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr "導入文件"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr "導入預覽文件失敗"
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid ""
+"Import timed out. Please retry. If you still encounter this issue, the file "
+"may be too big for the system's configuration, try to split it (import less "
+"records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -358,12 +472,15 @@ msgstr "最後修改時間"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -376,12 +493,15 @@ msgstr "最後更新人"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -394,14 +514,21 @@ msgstr "最後更新時間"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr "加載文件"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr "匹配導入列"
@@ -418,24 +545,24 @@ msgstr "名稱"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
-msgstr "沒有選擇文件..."
+msgid "Need Help?"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
-msgstr "正常字段"
+msgid "No Separator"
+msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
-msgstr "選項..."
+msgid "Normal Fields"
+msgstr "正常字段"
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue
@@ -449,42 +576,47 @@ msgstr "上級"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr "關聯字段"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr "重新載入文件"
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr "Res Model"
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr "選擇 CSV 或者 Excel 文件導入。"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr "分號"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr "分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr "顯示關係字段的字段(高級)"
@@ -496,35 +628,35 @@ msgstr "一些值"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr "空格鍵"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr "選項卡"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr "測試導入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr "文本分隔符: "
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid ""
"The first row\n"
@@ -533,38 +665,44 @@ msgstr "文件的第一行包含表頭"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr "千分位分隔符:"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr "導入時追蹤導入歷史"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr "無法裝載 \"{extension}\" 文件:需要Python 模組 \"{modname}\""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid ""
"Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr "不支援的文件格式 \"{}\",只支援導入CSV, ODS, XLS, XLSX格式"
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr "使用者"
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -575,24 +713,47 @@ msgid "Value"
msgstr "價值"
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid ""
+"You can not import images via URL, check with your administrator or support "
+"for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr "您必須至少配置一個字段來導入"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr "在 %d 行"
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr "base"
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr "base_import.import"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr "base_import.tests.models.char"
@@ -623,6 +784,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr "base_import.tests.models.char.stillreadonly"
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr "base_import.tests.models.m2o"
@@ -659,7 +830,7 @@ msgstr "base_import.tests.models.preview"
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr "在第 %d 行和第 %d 行之間"