[I18N] Update 8.0 translation with latest source code

1 files changed, 515 insertions, 462 deletions

diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index 027911b59ff..51b6d7bc69f 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* base_import
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: Odoo Server 8.0rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 13:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,418 +17,475 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:420
+#: code:addons/base_import/static/src/js/import.js:437
 #, python-format
-msgid "Get all possible values"
+msgid "(%d more)"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:71
+#: code:addons/base_import/static/src/xml/import.xml:369
 #, python-format
-msgid "Need to import data from an other application?"
+msgid ". The issue is\n"
+"            usually an incorrect file encoding."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:163
+#: code:addons/base_import/static/src/xml/import.xml:26
 #, python-format
-msgid "When you use External IDs, you can import CSV files \n"
-"                        with the \"External ID\" column to define the External \n"
-"                        ID of each record you import. Then, you will be able \n"
-"                        to make a reference to that record with columns like \n"
-"                        \"Field/External ID\". The following two CSV files give \n"
-"                        you an example for Products and their Categories."
+msgid ".CSV"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:271
+#: code:addons/base_import/static/src/js/import.js:254
 #, python-format
-msgid "How to export/import different tables from an SQL \n"
-"                        application to OpenERP?"
+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.js:310
+#: code:addons/base_import/static/src/xml/import.xml:160
 #, python-format
-msgid "Relation Fields"
+msgid "According to your need, you should use \n"
+"                        one of these 3 ways to reference records in relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:142
+#: code:addons/base_import/static/src/xml/import.xml:233
 #, python-format
-msgid "Country/Database ID: the unique OpenERP ID for a \n"
-"                        record, defined by the ID postgresql column"
+msgid "As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV \n"
+"                        file of some quotations you can import, based on demo \n"
+"                        data."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:155
+#: code:addons/base_import/static/src/xml/import.xml:298
 #, python-format
-msgid "Use \n"
-"                        Country/Database ID: You should rarely use this \n"
-"                        notation. It's mostly used by developers as it's main \n"
-"                        advantage is to never have conflicts (you may have \n"
-"                        several records with the same name, but they always \n"
-"                        have a unique Database ID)"
+msgid "As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and \n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:146
+#: code:addons/base_import/static/src/xml/import.xml:330
 #, python-format
-msgid "For the country \n"
-"                        Belgium, you can use one of these 3 ways to import:"
+msgid "As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation \n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a \n"
+"                        conflict of ID between persons and companies (person_1 \n"
+"                        and company_1 who shared the same ID 1 in the orignial \n"
+"                        database)."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:303
+#: code:addons/base_import/static/src/xml/import.xml:105
 #, python-format
-msgid "company_1,Bigees,True"
-msgstr ""
-
-#. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
-msgid "base_import.tests.models.m2o"
+msgid "By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:297
+#: code:addons/base_import/static/src/xml/import.xml:30
 #, python-format
-msgid "copy \n"
-"                        (select 'company_'||id as \"External ID\",company_name \n"
-"                        as \"Name\",'True' as \"Is a Company\" from companies) TO \n"
-"                        '/tmp/company.csv' with CSV HEADER;"
+msgid "CSV File:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:206
+#: code:addons/base_import/static/src/xml/import.xml:216
 #, python-format
 msgid "CSV file for Manufacturer, Retailer"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:160
+#: code:addons/base_import/static/src/xml/import.xml:180
 #, python-format
-msgid "Use \n"
-"                        Country/External ID: Use External ID when you import \n"
-"                        data from a third party application."
+msgid "CSV file for Products"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:316
+#: code:addons/base_import/static/src/xml/import.xml:179
 #, python-format
-msgid "person_1,Fabien,False,company_1"
+msgid "CSV file for categories"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:80
+#: code:addons/base_import/static/src/xml/import.xml:249
 #, python-format
-msgid "XXX/External ID"
+msgid "Can I import several times the same record?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:351
+#: code:addons/base_import/static/src/xml/import.xml:20
 #, python-format
-msgid "Don't Import"
+msgid "Cancel"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:24
+#: code:addons/base_import/static/src/js/import.js:179
+#: code:addons/base_import/static/src/js/import.js:190
 #, python-format
-msgid "Select the"
+msgid "Comma"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:100
+#: code:addons/base_import/static/src/xml/import.xml:158
 #, python-format
-msgid "Note that if your CSV file \n"
-"                        has a tabulation as separator, OpenERP will not \n"
-"                        detect the separations. You will need to change the \n"
-"                        file format options in your spreadsheet application. \n"
-"                        See the following question."
+msgid "Country/Database \n"
+"                        ID: 21"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:141
+#: code:addons/base_import/static/src/xml/import.xml:152
 #, python-format
-msgid "Country: the name or code of the country"
+msgid "Country/Database ID: the unique Odoo ID for a \n"
+"                        record, defined by the ID postgresql column"
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
-msgid "base_import.tests.models.o2m.child"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:159
+#, python-format
+msgid "Country/External ID: base.be"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:239
+#: code:addons/base_import/static/src/xml/import.xml:154
 #, python-format
-msgid "Can I import several times the same record?"
+msgid "Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file \n"
+"                        that imported it)"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:15
+#: code:addons/base_import/static/src/xml/import.xml:158
 #, python-format
-msgid "Validate"
+msgid "Country: Belgium"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:55
+#: code:addons/base_import/static/src/xml/import.xml:151
 #, python-format
-msgid "Map your data to OpenERP"
+msgid "Country: the name or code of the country"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:153
-#, python-format
-msgid "Use Country: This is \n"
-"                        the easiest way when your data come from CSV files \n"
-"                        that have been created manually."
+#: field:base_import.import,create_uid:0
+#: field:base_import.tests.models.char,create_uid:0
+#: field:base_import.tests.models.char.noreadonly,create_uid:0
+#: field:base_import.tests.models.char.readonly,create_uid:0
+#: field:base_import.tests.models.char.required,create_uid:0
+#: field:base_import.tests.models.char.states,create_uid:0
+#: field:base_import.tests.models.char.stillreadonly,create_uid:0
+#: field:base_import.tests.models.m2o,create_uid:0
+#: field:base_import.tests.models.m2o.related,create_uid:0
+#: field:base_import.tests.models.m2o.required,create_uid:0
+#: field:base_import.tests.models.m2o.required.related,create_uid:0
+#: field:base_import.tests.models.o2m,create_uid:0
+#: field:base_import.tests.models.o2m.child,create_uid:0
+#: field:base_import.tests.models.preview,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:127
-#, python-format
-msgid "What's the difference between Database ID and \n"
-"                        External ID?"
+#: field:base_import.import,create_date:0
+#: field:base_import.tests.models.char,create_date:0
+#: field:base_import.tests.models.char.noreadonly,create_date:0
+#: field:base_import.tests.models.char.readonly,create_date:0
+#: field:base_import.tests.models.char.required,create_date:0
+#: field:base_import.tests.models.char.states,create_date:0
+#: field:base_import.tests.models.char.stillreadonly,create_date:0
+#: field:base_import.tests.models.m2o,create_date:0
+#: field:base_import.tests.models.m2o.related,create_date:0
+#: field:base_import.tests.models.m2o.required,create_date:0
+#: field:base_import.tests.models.m2o.required.related,create_date:0
+#: field:base_import.tests.models.o2m,create_date:0
+#: field:base_import.tests.models.o2m.child,create_date:0
+#: field:base_import.tests.models.preview,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:138
+#: code:addons/base_import/static/src/xml/import.xml:243
 #, python-format
-msgid "For example, to \n"
-"                        reference the country of a contact, OpenERP proposes \n"
-"                        you 3 different fields to import:"
+msgid "Customers and their respective contacts"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:175
+#: code:addons/base_import/models.py:116
+#: code:addons/base_import/models.py:122
 #, python-format
-msgid "What can I do if I have multiple matches for a field?"
+msgid "Database ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:302
+#: code:addons/base_import/static/src/js/import.js:288
 #, python-format
-msgid "External ID,Name,Is a Company"
+msgid "Don't import"
 msgstr ""
 
 #. module: base_import
-#: field:base_import.tests.models.preview,somevalue:0
-msgid "Some Value"
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:77
+#, python-format
+msgid "Encoding:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:231
+#: code:addons/base_import/static/src/js/import.js:414
 #, python-format
-msgid "The following CSV file shows how to import \n"
-"                        suppliers and their respective contacts"
+msgid "Everything seems valid."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:109
+#: code:addons/base_import/models.py:81
+#: code:addons/base_import/models.py:115
+#: code:addons/base_import/static/src/xml/import.xml:87
+#: code:addons/base_import/static/src/xml/import.xml:92
 #, python-format
-msgid "How can I change the CSV file format options when \n"
-"                        saving in my spreadsheet application?"
+msgid "External ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:320
+#: code:addons/base_import/static/src/xml/import.xml:324
 #, python-format
-msgid "As you can see in this file, Fabien and Laurence \n"
-"                        are working for the Bigees company (company_1) and \n"
-"                        Eric is working for the Organi company. The relation \n"
-"                        between persons and companies is done using the \n"
-"                        External ID of the companies. We had to prefix the \n"
-"                        \"External ID\" by the name of the table to avoid a \n"
-"                        conflict of ID between persons and companies (person_1 \n"
-"                        and company_1 who shared the same ID 1 in the orignial \n"
-"                        database)."
+msgid "External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:308
+#: code:addons/base_import/static/src/xml/import.xml:312
 #, python-format
-msgid "copy (select \n"
-"                        'person_'||id as \"External ID\",person_name as \n"
-"                        \"Name\",'False' as \"Is a Company\",'company_'||company_id\n"
-"                         as \"Related Company/External ID\" from persons) TO \n"
-"                        '/tmp/person.csv' with CSV"
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:148
+#: code:addons/base_import/static/src/xml/import.xml:39
 #, python-format
-msgid "Country: Belgium"
+msgid "File Format Options…"
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
-msgid "base_import.tests.models.char.stillreadonly"
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:314
+#: code:addons/base_import/static/src/xml/import.xml:237
 #, python-format
-msgid "External ID,Name,Is a \n"
-"                        Company,Related Company/External ID"
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:233
+#: code:addons/base_import/static/src/xml/import.xml:148
 #, python-format
-msgid "Suppliers and their respective contacts"
+msgid "For example, to \n"
+"                        reference the country of a contact, Odoo proposes \n"
+"                        you 3 different fields to import:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:179
+#: code:addons/base_import/static/src/xml/import.xml:156
 #, python-format
-msgid "If for example you have two product categories \n"
-"                        with the child name \"Sellable\" (ie. \"Misc. \n"
-"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
-"                        your validation is halted but you may still import \n"
-"                        your data. However, we recommend you do not import the \n"
-"                        data because they will all be linked to the first \n"
-"                        'Sellable' category found in the Product Category list \n"
-"                        (\"Misc. Products/Sellable\"). We recommend you modify \n"
-"                        one of the duplicates' values or your product category \n"
-"                        hierarchy."
+msgid "For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:306
+#: code:addons/base_import/static/src/xml/import.xml:78
 #, python-format
-msgid "To create the CSV file for persons, linked to \n"
-"                        companies, we will use the following SQL command in \n"
-"                        PSQL:"
+msgid "Frequently Asked Questions"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:119
+#: code:addons/base_import/static/src/js/import.js:461
 #, python-format
-msgid "Microsoft Excel will allow \n"
-"                        you to modify only the encoding when saving \n"
-"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
-"                        list > Encoding tab)."
+msgid "Get all possible values"
 msgstr ""
 
 #. module: base_import
-#: field:base_import.tests.models.preview,othervalue:0
-msgid "Other Variable"
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:448
+#, python-format
+msgid "Here are the possible values:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:82
+#: code:addons/base_import/static/src/xml/import.xml:371
 #, python-format
-msgid "will also be used to update the original\n"
-"                        import if you need to re-import modified data\n"
-"                        later, it's thus good practice to specify it\n"
-"                        whenever possible"
+msgid "Here is the start of the file we could not import:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:26
+#: code:addons/base_import/static/src/xml/import.xml:119
 #, python-format
-msgid "file to import. If you need a sample importable file, you\n"
-"            can use the export tool to generate one."
+msgid "How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:148
+#: code:addons/base_import/static/src/xml/import.xml:207
 #, python-format
-msgid "Country/Database \n"
-"                        ID: 21"
+msgid "How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_char
-msgid "base_import.tests.models.char"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:222
+#, python-format
+msgid "How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
 msgstr ""
 
 #. module: base_import
-#: help:base_import.import,file:0
-msgid "File to check and/or import, raw binary (not base64)"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:281
+#, python-format
+msgid "How to export/import different tables from an SQL \n"
+"                        application to Odoo?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:230
+#: code:addons/base_import/static/src/xml/import.xml:198
 #, python-format
-msgid "Purchase orders with their respective purchase order lines"
+msgid "However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:60
+#: code:addons/base_import/static/src/xml/import.xml:87
+#: code:addons/base_import/static/src/xml/import.xml:92
+#: field:base_import.import,id:0
+#: field:base_import.tests.models.char,id:0
+#: field:base_import.tests.models.char.noreadonly,id:0
+#: field:base_import.tests.models.char.readonly,id:0
+#: field:base_import.tests.models.char.required,id:0
+#: field:base_import.tests.models.char.states,id:0
+#: field:base_import.tests.models.char.stillreadonly,id:0
+#: field:base_import.tests.models.m2o,id:0
+#: field:base_import.tests.models.m2o.related,id:0
+#: field:base_import.tests.models.m2o.required,id:0
+#: field:base_import.tests.models.m2o.required.related,id:0
+#: field:base_import.tests.models.o2m,id:0
+#: field:base_import.tests.models.o2m.child,id:0
+#: field:base_import.tests.models.preview,id:0
 #, python-format
-msgid "If the file contains\n"
-"                the column names, OpenERP can try auto-detecting the\n"
-"                field corresponding to the column. This makes imports\n"
-"                simpler especially when the file has many columns."
+msgid "ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:26
+#: code:addons/base_import/static/src/xml/import.xml:189
 #, python-format
-msgid ".CSV"
+msgid "If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you modify \n"
+"                        one of the duplicates' values or your product category \n"
+"                        hierarchy."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:360
+#: code:addons/base_import/static/src/xml/import.xml:69
 #, python-format
-msgid ". The issue is\n"
-"            usually an incorrect file encoding."
+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
-#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
-msgid "base_import.tests.models.m2o.required"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, 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
-#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
-msgid "base_import.tests.models.char.noreadonly"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid "If you do not set all fields in your CSV file, \n"
+"                        Odoo will assign the default value for every non \n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, Odoo \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:113
+#: code:addons/base_import/static/src/xml/import.xml:123
 #, python-format
 msgid "If you edit and save CSV files in speadsheet \n"
 "                        applications, your computer's regional settings will \n"
@@ -441,290 +498,343 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:30
+#: code:addons/base_import/static/src/xml/import.xml:252
 #, python-format
-msgid "CSV File:"
+msgid "If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records that \n"
+"                        have already been imported will be modified instead of \n"
+"                        being created. This is very usefull as it allows you \n"
+"                        to import several times the same CSV file while having \n"
+"                        made some changes in between two imports. Odoo will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_preview
-msgid "base_import.tests.models.preview"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:285
+#, python-format
+msgid "If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records \n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the \n"
+"                        link between each person and the company they work \n"
+"                        for)."
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
-msgid "base_import.tests.models.char.required"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:226
+#, python-format
+msgid "If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to reserve \n"
+"                        a specific row in the CSV file. The first order line \n"
+"                        will be imported on the same row as the information \n"
+"                        relative to order. Any additional lines will need an \n"
+"                        addtional row that does not have any information in \n"
+"                        the fields relative to the order."
 msgstr ""
 
 #. module: base_import
-#: code:addons/base_import/models.py:112
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:405
 #, python-format
-msgid "Database ID"
+msgid "Import"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:313
+#: code:addons/base_import/static/src/xml/import.xml:7
 #, python-format
-msgid "It will produce the following CSV file:"
+msgid "Import a CSV File"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:362
+#: code:addons/base_import/static/src/xml/import.xml:369
 #, python-format
-msgid "Here is the start of the file we could not import:"
+msgid "Import preview failed due to:"
 msgstr ""
 
 #. module: base_import
-#: field:base_import.import,file_type:0
-msgid "File Type"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:84
+#, python-format
+msgid "In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_import
-msgid "base_import.import"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:323
+#, python-format
+msgid "It will produce the following CSV file:"
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
-msgid "base_import.tests.models.o2m"
+#: field:base_import.import,write_uid:0
+#: field:base_import.tests.models.char,write_uid:0
+#: field:base_import.tests.models.char.noreadonly,write_uid:0
+#: field:base_import.tests.models.char.readonly,write_uid:0
+#: field:base_import.tests.models.char.required,write_uid:0
+#: field:base_import.tests.models.char.states,write_uid:0
+#: field:base_import.tests.models.char.stillreadonly,write_uid:0
+#: field:base_import.tests.models.m2o,write_uid:0
+#: field:base_import.tests.models.m2o.related,write_uid:0
+#: field:base_import.tests.models.m2o.required,write_uid:0
+#: field:base_import.tests.models.m2o.required.related,write_uid:0
+#: field:base_import.tests.models.o2m,write_uid:0
+#: field:base_import.tests.models.o2m.child,write_uid:0
+#: field:base_import.tests.models.preview,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:360
-#, python-format
-msgid "Import preview failed due to:"
+#: field:base_import.import,write_date:0
+#: field:base_import.tests.models.char,write_date:0
+#: field:base_import.tests.models.char.noreadonly,write_date:0
+#: field:base_import.tests.models.char.readonly,write_date:0
+#: field:base_import.tests.models.char.required,write_date:0
+#: field:base_import.tests.models.char.states,write_date:0
+#: field:base_import.tests.models.char.stillreadonly,write_date:0
+#: field:base_import.tests.models.m2o,write_date:0
+#: field:base_import.tests.models.m2o.related,write_date:0
+#: field:base_import.tests.models.m2o.required,write_date:0
+#: field:base_import.tests.models.m2o.required.related,write_date:0
+#: field:base_import.tests.models.o2m,write_date:0
+#: field:base_import.tests.models.o2m.child,write_date:0
+#: field:base_import.tests.models.preview,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:144
+#: code:addons/base_import/static/src/xml/import.xml:55
 #, python-format
-msgid "Country/External ID: the ID of this record \n"
-"                        referenced in another application (or the .XML file \n"
-"                        that imported it)"
+msgid "Map your data to Odoo"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:35
+#: code:addons/base_import/static/src/xml/import.xml:129
 #, python-format
-msgid "Reload data to check changes."
+msgid "Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
-msgid "base_import.tests.models.char.readonly"
+#: field:base_import.import,res_model:0
+msgid "Model"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:131
-#, python-format
-msgid "Some fields define a relationship with another \n"
-"                        object. For example, the country of a contact is a \n"
-"                        link to a record of the 'Country' object. When you \n"
-"                        want to import such fields, OpenERP will have to \n"
-"                        recreate links between the different records. \n"
-"                        To help you import such fields, OpenERP provides 3 \n"
-"                        mechanisms. You must use one and only one mechanism \n"
-"                        per field you want to import."
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:201
-#, python-format
-msgid "The tags should be separated by a comma without any \n"
-"                        spacing. For example, if you want you customer to be \n"
-"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
-"                        then you will encode it as follow \"Manufacturer,\n"
-"                        Retailer\" in the same column of your CSV file."
-msgstr ""
-
-#. module: base_import
-#: code:addons/base_import/models.py:264
+#: code:addons/base_import/static/src/xml/import.xml:81
 #, python-format
-msgid "You must configure at least one field to import"
+msgid "Need to import data from an other application?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:304
+#: code:addons/base_import/static/src/js/import.js:336
 #, python-format
-msgid "company_2,Organi,True"
+msgid "Normal Fields"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:58
+#: code:addons/base_import/static/src/xml/import.xml:110
 #, python-format
-msgid "The first row of the\n"
-"                file contains the label of the column"
+msgid "Note that if your CSV file \n"
+"                        has a tabulation as separator, Odoo will not \n"
+"                        detect the separations. You will need to change the \n"
+"                        file format options in your spreadsheet application. \n"
+"                        See the following question."
 msgstr ""
 
 #. module: base_import
-#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
-msgid "base_import.tests.models.char.states"
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:7
+#: code:addons/base_import/static/src/xml/import.xml:240
 #, python-format
-msgid "Import a CSV File"
+msgid "Purchase orders with their respective purchase order lines"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:74
+#: code:addons/base_import/static/src/js/import.js:79
 #, python-format
 msgid "Quoting:"
 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"
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:337
+#, python-format
+msgid "Relation Fields"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:293
+#: code:addons/base_import/static/src/xml/import.xml:35
 #, python-format
-msgid ")."
+msgid "Reload data to check changes."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:18
-#: code:addons/base_import/static/src/xml/import.xml:396
+#: code:addons/base_import/static/src/xml/import.xml:24
 #, python-format
-msgid "Import"
+msgid "Select the"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:407
+#: code:addons/base_import/static/src/js/import.js:180
 #, python-format
-msgid "Here are the possible values:"
+msgid "Semicolon"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:82
+#: code:addons/base_import/static/src/js/import.js:78
 #, python-format
-msgid "The"
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:227
+#: code:addons/base_import/static/src/xml/import.xml:141
 #, python-format
-msgid "A single column was found in the file, this often means the file separator is incorrect"
+msgid "Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, Odoo will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, Odoo provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism \n"
+"                        per field you want to import."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:293
+#: code:addons/base_import/static/src/js/import.js:182
 #, python-format
-msgid "dump of such a PostgreSQL database"
+msgid "Space"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:301
+#: code:addons/base_import/static/src/js/import.js:181
 #, python-format
-msgid "This SQL command will create the following CSV file:"
+msgid "Tab"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:228
+#: code:addons/base_import/static/src/xml/import.xml:92
 #, python-format
-msgid "The following CSV file shows how to import purchase \n"
-"                        orders with their respective purchase order lines:"
+msgid "The"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:91
+#: code:addons/base_import/static/src/xml/import.xml:67
 #, python-format
-msgid "What can I do when the Import preview table isn't \n"
-"                        displayed correctly?"
+msgid "The first row of the\n"
+"                file contains the label of the column"
 msgstr ""
 
 #. module: base_import
-#: field:base_import.tests.models.char,value:0
-#: field:base_import.tests.models.char.noreadonly,value:0
-#: field:base_import.tests.models.char.readonly,value:0
-#: field:base_import.tests.models.char.required,value:0
-#: field:base_import.tests.models.char.states,value:0
-#: field:base_import.tests.models.char.stillreadonly,value:0
-#: field:base_import.tests.models.m2o,value:0
-#: field:base_import.tests.models.m2o.related,value:0
-#: field:base_import.tests.models.m2o.required,value:0
-#: field:base_import.tests.models.m2o.required.related,value:0
-#: field:base_import.tests.models.o2m,value:0
-#: field:base_import.tests.models.o2m.child,parent_id:0
-#: field:base_import.tests.models.o2m.child,value:0
-msgid "unknown"
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:241
+#, python-format
+msgid "The following CSV file shows how to import \n"
+"                        customers and their respective contacts"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:317
+#: code:addons/base_import/static/src/xml/import.xml:238
 #, python-format
-msgid "person_2,Laurence,False,company_1"
+msgid "The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:149
+#: code:addons/base_import/static/src/xml/import.xml:211
 #, python-format
-msgid "Country/External ID: base.be"
+msgid "The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be \n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:288
+#: code:addons/base_import/static/src/xml/import.xml:339
 #, python-format
-msgid "As an example, suppose you have a SQL database \n"
-"                        with two tables you want to import: companies and \n"
-"                        persons. Each person belong to one company, so you \n"
-"                        will have to recreate the link between a person and \n"
-"                        the company he work for. (If you want to test this \n"
-"                        example, here is a"
+msgid "The two files produced are ready to be imported in \n"
+"                        Odoo without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked \n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:396
+#: code:addons/base_import/static/src/xml/import.xml:311
 #, python-format
-msgid "(%d more)"
+msgid "This SQL command will create the following CSV file:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:227
+#: code:addons/base_import/static/src/xml/import.xml:259
 #, python-format
-msgid "File for some Quotations"
+msgid "This feature \n"
+"                        allows you to use the Import/Export tool of Odoo to \n"
+"                        modify a batch of records in your favorite spreadsheet \n"
+"                        application."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:72
+#: code:addons/base_import/static/src/xml/import.xml:316
 #, python-format
-msgid "Encoding:"
+msgid "To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in \n"
+"                        PSQL:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:280
+#: code:addons/base_import/static/src/xml/import.xml:290
 #, python-format
 msgid "To manage relations between tables, \n"
-"                        you can use the \"External ID\" facilities of OpenERP. \n"
+"                        you can use the \"External ID\" facilities of Odoo. \n"
 "                        The \"External ID\" of a record is the unique identifier \n"
 "                        of this record in another application. This \"External \n"
 "                        ID\" must be unique accoss all the records of all \n"
@@ -735,322 +845,265 @@ msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:295
+#: code:addons/base_import/static/src/xml/import.xml:61
 #, python-format
-msgid "We will first export all companies and their \n"
-"                        \"External ID\". In PSQL, write the following command:"
+msgid "Track history during import"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
+#: code:addons/base_import/static/src/xml/import.xml:165
 #, python-format
-msgid "How can I import a one2many relationship (e.g. several \n"
-"                        Order Lines of a Sales Order)?"
+msgid "Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always \n"
+"                        have a unique Database ID)"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:373
+#: code:addons/base_import/static/src/xml/import.xml:170
 #, python-format
-msgid "Everything seems valid."
+msgid "Use \n"
+"                        Country/External ID: Use External ID when you import \n"
+"                        data from a third party application."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:188
+#: code:addons/base_import/static/src/xml/import.xml:163
 #, python-format
-msgid "However if you do not wish to change your \n"
-"                        configuration of product categories, we recommend you \n"
-"                        use make use of the external ID for this field \n"
-"                        'Category'."
+msgid "Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:390
+#: code:addons/base_import/static/src/xml/import.xml:15
 #, python-format
-msgid "at row %d"
+msgid "Validate"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:197
+#: code:addons/base_import/static/src/xml/import.xml:305
 #, python-format
-msgid "How can I import a many2many relationship field \n"
-"                        (e.g. a customer that has multiple tags)?"
+msgid "We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following command:"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:80
+#: code:addons/base_import/static/src/xml/import.xml:185
 #, python-format
-msgid "XXX/ID"
+msgid "What can I do if I have multiple matches for a field?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:275
+#: code:addons/base_import/static/src/xml/import.xml:101
 #, python-format
-msgid "If you need to import data from different tables, \n"
-"                        you will have to recreate relations between records \n"
-"                        belonging to different tables. (e.g. if you import \n"
-"                        companies and persons, you will have to recreate the \n"
-"                        link between each person and the company they work \n"
-"                        for)."
+msgid "What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:150
+#: code:addons/base_import/static/src/xml/import.xml:267
 #, python-format
-msgid "According to your need, you should use \n"
-"                        one of these 3 ways to reference records in relations. \n"
-"                        Here is when you should use one or the other, \n"
-"                        according to your need:"
+msgid "What happens if I do not provide a value for a \n"
+"                        specific field?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:319
+#: code:addons/base_import/static/src/xml/import.xml:137
 #, python-format
-msgid "person_4,Ramsy,False,company_3"
+msgid "What's the difference between Database ID and \n"
+"                        External ID?"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:261
+#: code:addons/base_import/static/src/xml/import.xml:173
 #, python-format
-msgid "If you do not set all fields in your CSV file, \n"
-"                        OpenERP will assign the default value for every non \n"
-"                        defined fields. But if you\n"
-"                        set fields with empty values in your CSV file, OpenERP \n"
-"                        will set the EMPTY value in the field, instead of \n"
-"                        assigning the default value."
+msgid "When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the External \n"
+"                        ID of each record you import. Then, you will be able \n"
+"                        to make a reference to that record with columns like \n"
+"                        \"Field/External ID\". The following two CSV files give \n"
+"                        you an example for Products and their Categories."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:20
+#: code:addons/base_import/static/src/xml/import.xml:90
 #, python-format
-msgid "Cancel"
+msgid "XXX/External ID"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:257
+#: code:addons/base_import/static/src/xml/import.xml:90
 #, python-format
-msgid "What happens if I do not provide a value for a \n"
-"                        specific field?"
+msgid "XXX/ID"
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:68
+#: code:addons/base_import/models.py:271
 #, python-format
-msgid "Frequently Asked Questions"
+msgid "You must configure at least one field to import"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:305
+#: code:addons/base_import/static/src/js/import.js:431
 #, python-format
-msgid "company_3,Boum,True"
+msgid "at row %d"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:249
+#: code:addons/base_import/static/src/js/import.js:433
 #, python-format
-msgid "This feature \n"
-"                        allows you to use the Import/Export tool of OpenERP to \n"
-"                        modify a batch of records in your favorite spreadsheet \n"
-"                        application."
+msgid "between rows %d and %d"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:87
 #, python-format
-msgid "column in OpenERP. When you\n"
+msgid "column in Odoo. When you\n"
 "                        import an other record that links to the first\n"
 "                        one, use"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:242
-#, python-format
-msgid "If you import a file that contains one of the \n"
-"                        column \"External ID\" or \"Database ID\", records that \n"
-"                        have already been imported will be modified instead of \n"
-"                        being created. This is very usefull as it allows you \n"
-"                        to import several times the same CSV file while having \n"
-"                        made some changes in between two imports. OpenERP will \n"
-"                        take care of creating or modifying each record \n"
-"                        depending if it's new or not."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:169
+#: code:addons/base_import/static/src/xml/import.xml:313
 #, python-format
-msgid "CSV file for categories"
+msgid "company_1,Bigees,True"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:309
+#: code:addons/base_import/static/src/xml/import.xml:314
 #, python-format
-msgid "Normal Fields"
+msgid "company_2,Organi,True"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:74
+#: code:addons/base_import/static/src/xml/import.xml:315
 #, python-format
-msgid "In order to re-create relationships between\n"
-"                        different records, you should use the unique\n"
-"                        identifier from the original application and\n"
-"                        map it to the"
+msgid "company_3,Boum,True"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:170
+#: code:addons/base_import/static/src/xml/import.xml:307
 #, python-format
-msgid "CSV file for Products"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:216
-#, python-format
-msgid "If you want to import sales order having several \n"
-"                        order lines; for each order line, you need to reserve \n"
-"                        a specific row in the CSV file. The first order line \n"
-"                        will be imported on the same row as the information \n"
-"                        relative to order. Any additional lines will need an \n"
-"                        addtional row that does not have any information in \n"
-"                        the fields relative to the order."
-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
-#: field:base_import.tests.models.preview,name:0
-msgid "Name"
+msgid "copy \n"
+"                        (select 'company_'||id as \"External ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:80
+#: code:addons/base_import/static/src/xml/import.xml:318
 #, python-format
-msgid "to the original unique identifier."
+msgid "copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO \n"
+"                        '/tmp/person.csv' with CSV"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:318
+#: code:addons/base_import/static/src/xml/import.xml:303
 #, python-format
-msgid "person_3,Eric,False,company_2"
-msgstr ""
-
-#. module: base_import
-#: field:base_import.import,res_model:0
-msgid "Model"
+msgid "dump of such a PostgreSQL database"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:77
-#: code:addons/base_import/static/src/xml/import.xml:82
+#: code:addons/base_import/static/src/xml/import.xml:26
 #, python-format
-msgid "ID"
+msgid "file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:329
+#: code:addons/base_import/static/src/xml/import.xml:19
 #, python-format
-msgid "The two files produced are ready to be imported in \n"
-"                        OpenERP without any modifications. After having \n"
-"                        imported these two CSV files, you will have 4 contacts \n"
-"                        and 3 companies. (the firsts two contacts are linked \n"
-"                        to the first company). You must first import the \n"
-"                        companies and then the persons."
+msgid "or"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:95
+#: code:addons/base_import/static/src/xml/import.xml:326
 #, python-format
-msgid "By default the Import preview is set on commas as \n"
-"                        field separators and quotation marks as text \n"
-"                        delimiters. If your csv file does not have these \n"
-"                        settings, you can modify the File Format Options \n"
-"                        (displayed under the Browse CSV file bar after you \n"
-"                        select your file)."
+msgid "person_1,Fabien,False,company_1"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:73
+#: code:addons/base_import/static/src/xml/import.xml:327
 #, python-format
-msgid "Separator:"
-msgstr ""
-
-#. module: base_import
-#: field:base_import.import,file_name:0
-msgid "File Name"
+msgid "person_2,Laurence,False,company_1"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/models.py:80
-#: code:addons/base_import/models.py:111
-#: code:addons/base_import/static/src/xml/import.xml:77
-#: code:addons/base_import/static/src/xml/import.xml:82
+#: code:addons/base_import/static/src/xml/import.xml:328
 #, python-format
-msgid "External ID"
+msgid "person_3,Eric,False,company_2"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:39
+#: code:addons/base_import/static/src/xml/import.xml:329
 #, python-format
-msgid "File Format Options…"
+msgid "person_4,Ramsy,False,company_3"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/js/import.js:392
+#: code:addons/base_import/static/src/xml/import.xml:90
 #, python-format
-msgid "between rows %d and %d"
+msgid "to the original unique identifier."
 msgstr ""
 
 #. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:19
-#, python-format
-msgid "or"
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
 msgstr ""
 
 #. module: base_import
 #. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:223
+#: code:addons/base_import/static/src/xml/import.xml:92
 #, python-format
-msgid "As an example, here is \n"
-"                        purchase.order_functional_error_line_cant_adpat.CSV \n"
-"                        file of some quotations you can import, based on demo \n"
-"                        data."
-msgstr ""
-
-#. module: base_import
-#: field:base_import.import,file:0
-msgid "File"
+msgid "will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
 msgstr ""