Merge lp:~camptocamp/openerp-connector-magento/7.0-next-release-bundle-import-base into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0-next-release

[Guewen Baconnier @ Camptocamp]

Prepare import of bundle products so it can be handled in sub-modules.

It does not implement the import of bundle products, but only add a hook ConnectorUnit to implement it.
It imports the dependencies of the bundle though.

The PHP part of the connector has been updated in order to add the bundle information, so it needs to be updated on the Magento instance.

[lp:~camptocamp/openerp-connector-magento/7.0-next-release-bundle-import-base]

989. By Guewen Baconnier @ Camptocamp on 2014-05-19

typo and example with custom backend

[Chafique DELLI (chafique-delli)]

Hi,

In my module who implement the import(orders with) bundle products, I need to map the type of product(if record['type_id'] == 'bundle': return {'type': 'service'}).
I thought extending the mapping product type from the base map in magentoerpconnect/product.py to treat the case of the bundle only if a flag is set via my module.
Like that, if my module is not installed then no mapping for record['type_id'] = 'bundle'.
What do you think?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you give a link please?

[Chafique DELLI (chafique-delli)]

> Can you give a link please?
Here is the link to my module:
https://code.launchpad.net/~akretion-team/openerp-connector-magento/openerp-connector-magento-bundle-split

[lp:~camptocamp/openerp-connector-magento/7.0-next-release-bundle-import-base]

990. By Guewen Baconnier @ Camptocamp on 2014-06-18

merge from lp:openerp-connector-magento/7.0

991. By Guewen Baconnier @ Camptocamp on 2014-06-18

Add possibility to have a custom mapper extension for the bundle products

992. By Guewen Baconnier @ Camptocamp on 2014-06-18

BundleImporter is an importer

993. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated mapper

994. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated method

995. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated data entry

996. By Guewen Baconnier @ Camptocamp on 2014-06-19

importer entry point should be run(). Also takes binding_id as argument, it can be useful

997. By Guewen Baconnier @ Camptocamp on 2014-07-04

Correct test data for bundle products

Unmerged revisions

997. By Guewen Baconnier @ Camptocamp on 2014-07-04

Correct test data for bundle products

996. By Guewen Baconnier @ Camptocamp on 2014-06-19

importer entry point should be run(). Also takes binding_id as argument, it can be useful

995. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated data entry

994. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated method

993. By Guewen Baconnier @ Camptocamp on 2014-06-19

remove duplicated mapper

992. By Guewen Baconnier @ Camptocamp on 2014-06-18

BundleImporter is an importer

991. By Guewen Baconnier @ Camptocamp on 2014-06-18

Add possibility to have a custom mapper extension for the bundle products

990. By Guewen Baconnier @ Camptocamp on 2014-06-18

merge from lp:openerp-connector-magento/7.0

989. By Guewen Baconnier @ Camptocamp on 2014-05-19

typo and example with custom backend

988. By Guewen Baconnier @ Camptocamp on 2014-05-19

Prepare import of bundle products so it can be handled in sub-modules.

It does not implement the import of bundle products, but only add a hook ConnectorUnit to implement it.
It imports the dependencies of the bundle though.

The PHP part of the connector has been updated in order to add the bundle information, so it needs to be updated on the Magento instance.

=== modified file 'magentoerpconnect/AUTHORS'
--- magentoerpconnect/AUTHORS	2014-05-06 15:46:57 +0000
+++ magentoerpconnect/AUTHORS	2014-06-18 11:34:02 +0000
@@ -13,7 +13,7 @@
 * Alexis de Lattre at Akretion (tiny change)
 * Olivier Distexhe at Akilon (tiny change)
 * Romain Deheele at Camptocamp
-* Jan-Philipp Fischer at Greencoding
 * Thomas Rehn at initOS
 * Katja Matthes at initOS
 * Markus Schneider at initOS
+* Jan-Philipp Fischer at greencoding

=== modified file 'magentoerpconnect/CHANGES.rst'
--- magentoerpconnect/CHANGES.rst	2014-05-26 08:28:17 +0000
+++ magentoerpconnect/CHANGES.rst	2014-06-18 11:34:02 +0000
@@ -1,8 +1,18 @@
 Changelog
 ---------
 
-2.3.1.dev0 (unreleased)
-~~~~~~~~~~~~~~~~~~~~~~~
+2.4.2 (2014-06-16)
+~~~~~~~~~~~~~~~~~~
+
+* Fix: AssertionError: Several classes found for <class 'openerp.addons.connector.unit.mapper.ImportMapper'> with session <Session db_name: pruebas, uid: 1>, model name: magento.product.product. Found: set([<class 'openerp.addons.magentoerpconnect.product.IsActiveProductImportMapper'>, <class 'openerp.addons.magentoerpconnect.product.ProductImportMapper'>])
+
+2.4.1 (2014-06-10)
+~~~~~~~~~~~~~~~~~~
+
+* Fix: Binders should find records even if they are inactive (lp:1323719)
+
+2.4.0 (2014-05-26)
+~~~~~~~~~~~~~~~~~~
 
 * New helper in importer to import dependencies
 * allow to customize the available versions without overriding the 'version' field
@@ -16,9 +26,16 @@
 * Fix: calculate correctly the discount ratio on sales order lines (lp:1201590)
 * Possibility to exclude products from stock synchronizations
 * Products disabled on Magento are imported disabled on OpenERP. An additional module allows more options.
-* Possibility to disable import of sales orders per storeview
-* Related Actions: open the form view on the record concerned by an export job, or open the Magento's admin page
-  on importing jobs
+<<<<<<< TREE
+* Possibility to disable import of sales orders per storeview
+* Related Actions: open the form view on the record concerned by an export job, or open the Magento's admin page
+  on importing jobs
+=======
+* Possibility to disable import of sales orders per storeview
+* Related Actions: open the form view on the record concerned by an export job, or open the Magento's admin page
+  on importing jobs
+* Special order lines (shipping, ...) are now the last lines of an order, not the first
+>>>>>>> MERGE-SOURCE
 
 
 2.3.1 (2014-01-23)

=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2014-03-19 10:06:58 +0000
+++ magentoerpconnect/__openerp__.py	2014-06-18 11:34:02 +0000
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {'name': 'Magento Connector',
- 'version': '2.3.1',
+ 'version': '2.4.2',
  'category': 'Connector',
  'depends': ['account',
              'product',
@@ -35,7 +35,7 @@
  },
  'author': 'Connector Core Editors',
  'license': 'AGPL-3',
- 'website': 'https://launchpad.net/magentoerpconnect',
+ 'website': 'https://launchpad.net/openerp-connector-magento',
  'description': """
 Magento Connector
 =================
@@ -132,7 +132,8 @@
           'delivery_view.xml',
           'stock_view.xml',
           'security/ir.model.access.csv',
-	  'payment_invoice.xml',
+          'payment_invoice.xml',
+          'payment_invoice.xml',
           ],
  'installable': True,
  'application': True,

=== modified file 'magentoerpconnect/i18n/de.po'
--- magentoerpconnect/i18n/de.po	2014-04-12 10:07:56 +0000
+++ magentoerpconnect/i18n/de.po	2014-06-18 11:34:02 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openerp-connector-magento\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"POT-Creation-Date: 2014-06-10 14:00+0000\n"
 "PO-Revision-Date: 2014-02-26 21:07+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,119 +15,79 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
-
-#. module: magentoerpconnect
-#: help:magento.backend,pricelist_id:0
-msgid "The price list used to define the prices of the products in Magento."
-msgstr ""
-"Die Preisliste wird benutzt, um die Preise der Produkte in Magento zu "
-"definieren."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_invoice_paid_mail:0
-msgid ""
-"Does the invoice export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Soll bei Erstellung/Export der Rechnung eine E-Mail aus Magento versendet "
-"werden  ?"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import sales orders from all store views"
-msgstr "Importiere Aufträge von allen Store Views"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
-msgid ""
-"The tax amount computed in OpenERP doesn't match with the tax amount in "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"Die in OpenERP errechnete Steuer stimmt nicht mit der Magento Steuer "
-"überein.\n"
-"\n"
-"Grund:\n"
-"Vermutlich sind die Steuersätze in OpenERP und Magento nicht identisch.  "
-"Durch eine entsprechende Steuerzuordnung wurde möglicherweise der Endpreis "
-"verändert.\n"
-"\n"
-"Lösung: \n"
-"Überprüfen Sie die Steuern und auch Zuordnungen und korrigieren Sie diese "
-"dann bei Bedarf."
-
-#. module: magentoerpconnect
-#: help:magento.backend,warehouse_id:0
-msgid "Warehouse used to compute the stock quantities."
-msgstr "Zentrallager zur Bestände Berechnung"
-
-#. module: magentoerpconnect
-#: field:magento.account.invoice,sync_date:0
-#: field:magento.address,sync_date:0
-#: field:magento.binding,sync_date:0
-#: field:magento.product.category,sync_date:0
-#: field:magento.product.product,sync_date:0
-#: field:magento.res.partner,sync_date:0
-#: field:magento.res.partner.category,sync_date:0
-#: field:magento.sale.order,sync_date:0
-#: field:magento.sale.order.line,sync_date:0
-#: field:magento.stock.picking.out,sync_date:0
-#: field:magento.store,sync_date:0
-#: field:magento.storeview,sync_date:0
-#: field:magento.website,sync_date:0
-msgid "Last synchronization date"
-msgstr "Letzte Synchronisierung"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_category_id:0
-msgid ""
-"If a default category is selected, products imported without a category will "
-"be linked to it."
-msgstr ""
-"Durch eine vor-eingestellte Standard Kategorie, werden alle Produkte, ohne "
-"irgendeine Kategorie dann mit dieser verlinkt."
-
-#. module: magentoerpconnect
-#: help:magento.storeview,import_orders_from_date:0
-msgid ""
-"do not consider non-imported sale orders before this date. Leave empty to "
-"import all sale orders"
-msgstr ""
-"Vernachlässigen Sie die nicht-importierten Aufträge vor diesem Datum. Bitte "
-"tragen Sie nichts ein, um sämtliche  Aufträge zu importieren."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_picking_done_mail:0
-msgid ""
-"Does the picking export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Soll bei Erstellung / Export eines Lieferscheins eine E-Mail aus Magento "
-"versendet werden ?"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Do Not Manage Stock"
-msgstr "Kein Lager verwalten"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "Handle the product's catalog (not implemented)"
-msgstr "Verwalre den Produktkatalog (nicht implementiert)"
-
-#. module: magentoerpconnect
-#: field:res.partner,company:0
-msgid "Company"
-msgstr "Unternehmen"
+"X-Launchpad-Export-Date: 2014-06-11 06:38+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "'order_id' Feld in Magento"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(neuberechnen)"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.backend:0
+msgid "A backend with the same sale prefix already exists"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "Ein Partner Tag mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr ""
+"Ein Partner mit der ID existiert in Magento bereits für diese Webseite."
+
+#. module: magentoerpconnect
+#: help:magento.backend,sale_prefix:0
+msgid ""
+"A prefix put before the name of imported sales orders.\n"
+"For instance, if the prefix is 'mag-', the sales order 100000692 in Magento, "
+"will be named 'mag-100000692' in OpenERP."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr ""
+"Eine Produktkategorie mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "Ein Produkt mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "Eine VK-Auftragszeile mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "Ein Packauftrag mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "Ein Store mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "Ein Storeview mit der ID existiert bereits in Magento."
 
 #. module: magentoerpconnect
 #: sql_constraint:magento.website:0
@@ -135,33 +95,9 @@
 msgstr "Eine Webseite mit der gleichen ID existiert bereits in Magento."
 
 #. module: magentoerpconnect
-#: field:magento.backend,import_categories_from_date:0
-msgid "Import categories from date"
-msgstr "Importiere Kategorien ab Datum"
-
-#. module: magentoerpconnect
-#: view:account.invoice:0
-#: field:account.invoice,magento_bind_ids:0
-#: view:product.category:0
-#: field:product.category,magento_bind_ids:0
-#: view:product.product:0
-#: field:product.product,magento_bind_ids:0
-#: view:res.partner:0
-#: field:res.partner,magento_bind_ids:0
-#: field:res.partner.category,magento_bind_ids:0
-#: field:sale.order,magento_bind_ids:0
-#: field:sale.order.line,magento_bind_ids:0
-#: field:sale.shop,magento_bind_ids:0
-#: field:stock.picking,magento_bind_ids:0
-#: view:stock.picking.out:0
-#: field:stock.picking.out,magento_bind_ids:0
-msgid "Magento Bindings"
-msgstr "Magento Verbindungen"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "This installs the module magentoerpconnect_catalog."
-msgstr "Dies installiert das Modul magentoerpconnect_catalog"
+#: view:magento.backend:0
+msgid "API"
+msgstr ""
 
 #. module: magentoerpconnect
 #: field:magento.address,is_magento_order_address:0
@@ -169,124 +105,58 @@
 msgstr "Adresse von einer Magento Bestellung"
 
 #. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_id:0
-msgid "Magento Order ID"
-msgstr "Magento Bestell ID"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
-msgid "magentoerpconnect.installed"
+#: field:magento.backend,admin_location:0
+msgid "Admin Location"
 msgstr ""
 
 #. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "This installs the module magentoerpconnect_export_partner."
-msgstr "Dies installiert das Modul magentoerpconnect_export_partner."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notizen"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,openerp_id:0
-msgid "Sale Order"
-msgstr "VK-Auftrag"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,openerp_id:0
-msgid "Stock Picking"
-msgstr "Lagerpackauftrag"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Extensions"
-msgstr "Erweiterungen"
-
-#. module: magentoerpconnect
 #: view:magento.backend:0
 msgid "Advanced Configuration"
 msgstr "Erweiterte Einstellungen"
 
 #. module: magentoerpconnect
-#: field:magento.res.partner,group_id:0
-msgid "Magento Group (Category)"
-msgstr "Magento Gruppe (Kategorie)"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
-#: view:magento.website:0
-#: field:magento.website,store_ids:0
-msgid "Stores"
-msgstr "Stores"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_stock_field_id:0
-msgid "Stock Field"
-msgstr "Lagerfeld"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,openerp_id:0
-msgid "Partner Category"
-msgstr "Partnerkategorie"
-
-#. module: magentoerpconnect
-#: help:magento.product.product,magento_qty:0
-msgid "Last computed quantity to send on Magento."
-msgstr "Zuletzt errechnete Anzahl die zu Magento geschickt wird."
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
-#: view:res.partner.category:0
-msgid "Magento"
-msgstr "Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
-msgid "connector.config.settings"
-msgstr ""
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_products_from_date:0
-msgid "Import products from date"
-msgstr "Importiere Produkte vom Datum"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner
-#: field:magento.address,openerp_id:0
-#: field:magento.res.partner,openerp_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order
-msgid "Sales Order"
-msgstr "VK-Auftrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Auslieferungsaufträge"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Auftragsposition"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid "Prices are managed in OpenERP with pricelists"
-msgstr "Preise sind in OpenERP mit Preislisten verwaltet"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_shipping:0
-msgid "Default Shipping"
-msgstr "Vorgegebener Versand"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.stock.picking.out:0
-msgid "A stock picking with same ID on Magento already exists."
-msgstr "Ein Packauftrag mit der gleichen ID existiert bereits in Magento."
+#: help:magento.res.partner,consider_as_company:0
+msgid ""
+"An account imported with a 'company' in the billing address is considered as "
+"a company.\n"
+" The partner takes the name of the company and is not merged with the "
+"billing address."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "Eine Rechnung mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_password:0
+msgid "Basic Auth. Password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_username:0
+msgid "Basic Auth. Username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_password:0
+msgid "Basic access authentication web server side password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_username:0
+msgid "Basic access authentication web server side username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Geburtstag"
 
 #. module: magentoerpconnect
 #: view:magento.backend:0
@@ -308,6 +178,23 @@
 "die dies so früh wie möglich erledigen."
 
 #. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Frachtführer"
+
+#. module: magentoerpconnect
+#: help:magento.storeview,no_sales_order_sync:0
+msgid ""
+"Check if the storeview is active in Magento but its sales orders should not "
+"be imported."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.product.product,no_stock_sync:0
+msgid "Check this to exclude the product from stock synchronizations."
+msgstr ""
+
+#. module: magentoerpconnect
 #: help:magento.backend,product_stock_field_id:0
 msgid ""
 "Choose the field of the product which will be used for stock inventory "
@@ -319,55 +206,137 @@
 "Wenn leer, wird die verfügbare Menge benutzt."
 
 #. module: magentoerpconnect
-#: sql_constraint:magento.product.product:0
-msgid "A product with the same ID on Magento already exists"
-msgstr "Ein Produkt mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
-msgid "Backends"
-msgstr "Backends"
-
-#. module: magentoerpconnect
-#: field:magento.backend,location:0
-msgid "Location"
-msgstr "Standort"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking
-msgid "Picking List"
-msgstr "Entnahmeliste"
-
-#. module: magentoerpconnect
-#: field:magento.backend,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
-
-#. module: magentoerpconnect
-#: field:magento.backend,catalog_price_tax_included:0
-msgid "Prices include tax"
-msgstr "Preise inkl. Steuer"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products categories since"
-msgstr "Importiere Produktkategorien seit"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,openerp_id:0
-msgid "Sale Order Line"
-msgstr "Verkaufsauftragsposition"
-
-#. module: magentoerpconnect
-#: field:magento.backend,username:0
-msgid "Username"
-msgstr "Benutzername"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_category
-#: field:magento.product.category,openerp_id:0
-msgid "Product Category"
-msgstr "Produktkategorie"
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Vollständig"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Errechnete Menge"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "Connector Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,consider_as_company:0
+msgid "Considered as company"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:payment.method:0
+msgid "Create invoice on"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,create_invoice_on:0
+#: field:payment.method,create_invoice_on:0
+msgid "Create invoice on action"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Erstellt am (in Magento)"
+
+#. module: magentoerpconnect
+#: field:magento.backend,use_custom_api_path:0
+msgid "Custom Api Path"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Voreingestellte Rechnung"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Standardsprache"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Voreingestellte Produktkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Vorgegebener Versand"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Auslieferungsaufträge"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "Kein Lager verwalten"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Soll bei Erstellung/Export der Rechnung eine E-Mail aus Magento versendet "
+"werden  ?"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Soll bei Erstellung / Export eines Lieferscheins eine E-Mail aus Magento "
+"versendet werden ?"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "E-Mail Adresse"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr "Exportiere Partner zu Magento (experimentell)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exportiere Sendungsverfolgungsnummern"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Erweiterungen"
 
 #. module: magentoerpconnect
 #: field:magento.res.partner,guest_customer:0
@@ -375,31 +344,14 @@
 msgstr "Gastkunde"
 
 #. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid ""
-"Prices are set in OpenERP and exported to Magento.\n"
-"\n"
-"This installs the module magentoerpconnect_pricing."
+#: view:magento.backend:0
+msgid "HTTP Authentication"
 msgstr ""
-"Preise sind in OpenERP gesetzt und zu Magento exportiert.\n"
-"\n"
-"Dies installier das Modul magentoerpconnect_pricing."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_carrier_code:0
-msgid "Magento Base Carrier Code"
-msgstr "Magento Basisspediteur Code"
-
-#. module: magentoerpconnect
-#: view:magento.website:0
-msgid "Import partners since"
-msgstr "Importiere Partner seit"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.website:0
-msgid "Import in background"
-msgstr "Importiere im Hintergrund"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Verwalre den Produktkatalog (nicht implementiert)"
 
 #. module: magentoerpconnect
 #: field:magento.account.invoice,magento_id:0
@@ -419,41 +371,163 @@
 msgstr "ID in Magento"
 
 #. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
-msgid "Magento Stores"
-msgstr "Magento Stores"
-
-#. module: magentoerpconnect
-#: field:magento.backend,pricelist_id:0
-#: field:magento.website,pricelist_id:0
-msgid "Pricelist"
-msgstr "Preisliste"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount:0
-msgid "Total amount"
-msgstr "Gesamtbetrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_category
-#: view:magento.product.category:0
-msgid "Magento Product Category"
-msgstr "Magento Produktkategorie"
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"Durch eine vor-eingestellte Standard Kategorie, werden alle Produkte, ohne "
+"irgendeine Kategorie dann mit dieser verlinkt."
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importiere VK-Aufträge"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importiere VK-Aufträge seit"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importiere alle Kundengruppen"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importiere Kategorien ab Datum"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importiere im Hintergrund"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importiere Partner von allen Webseiten"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importiere Partner seit Datum"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importiere Partner seit"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importiere Produktkategorien seit"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importiere Produkte vom Datum"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importiere/Update Produkte seit"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importiere VK-Aufträge vom Datum"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Importiere Aufträge von allen Store Views"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Importe"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informationen"
 
 #. module: magentoerpconnect
 #: view:magento.product.product:0
-msgid "(recompute)"
-msgstr "(neuberechnen)"
-
-#. module: magentoerpconnect
-#: field:magento.store,openerp_id:0
-msgid "Sale Shop"
-msgstr "Verkaufsshop"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,manage_stock:0
-msgid "Manage Stock Level"
-msgstr "Verwalte Lager Level"
+msgid "Inventory Options"
+msgstr "Sortimentsoptionen"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Sprache"
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr "Zuletzt errechnete Anzahl die zu Magento geschickt wird."
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,sync_date:0
+#: field:magento.address,sync_date:0
+#: field:magento.binding,sync_date:0
+#: field:magento.product.category,sync_date:0
+#: field:magento.product.product,sync_date:0
+#: field:magento.res.partner,sync_date:0
+#: field:magento.res.partner.category,sync_date:0
+#: field:magento.sale.order,sync_date:0
+#: field:magento.sale.order.line,sync_date:0
+#: field:magento.stock.picking.out,sync_date:0
+#: field:magento.store,sync_date:0
+#: field:magento.storeview,sync_date:0
+#: field:magento.website,sync_date:0
+msgid "Last synchronization date"
+msgstr "Letzte Synchronisierung"
+
+#. module: magentoerpconnect
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr "Standort"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:payment.method:0
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr "Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr "Magento Adresse"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr ""
 
 #. module: magentoerpconnect
 #: model:ir.model,name:magentoerpconnect.model_magento_backend
@@ -475,45 +549,81 @@
 msgstr "Magento Backend"
 
 #. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders"
-msgstr "Importiere VK-Aufträge"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,picking_method:0
-msgid "Picking Method"
-msgstr "Packmethode"
-
-#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr "Magento Backends"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr "Magento Basisspediteur Code"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:account.invoice:0
+#: field:account.invoice,magento_bind_ids:0
+#: view:product.category:0
+#: field:product.category,magento_bind_ids:0
+#: view:product.product:0
+#: field:product.product,magento_bind_ids:0
 #: view:res.partner:0
-#: field:res.partner,magento_address_bind_ids:0
-msgid "Magento Address Bindings"
+#: field:res.partner,magento_bind_ids:0
+#: field:res.partner.category,magento_bind_ids:0
+#: field:sale.order,magento_bind_ids:0
+#: field:sale.order.line,magento_bind_ids:0
+#: field:sale.shop,magento_bind_ids:0
+#: field:stock.picking,magento_bind_ids:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,magento_bind_ids:0
+msgid "Magento Bindings"
+msgstr "Magento Verbindungen"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
 msgstr ""
 
 #. module: magentoerpconnect
-#: field:magento.store,send_invoice_paid_mail:0
-msgid "Send email notification on invoice paid"
-msgstr "Sende E-Mail bei bezahlter Rechnung"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
-msgid "Magento Storeviews"
-msgstr "Magento Storeviews"
-
-#. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders since"
-msgstr "Importiere VK-Aufträge seit"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0"
-msgstr "Verkaufmenge < 0"
-
-#. module: magentoerpconnect
-#: help:magento.sale.order,magento_order_id:0
-msgid "'order_id' field in Magento"
-msgstr "'order_id' Feld in Magento"
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr "Untergeordnete Magento Kategorien"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr "Magento Konfiguration"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr "Magento Versandauftrag"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr "Magento Gruppe (Kategorie)"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr "Magento Rechnung"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_id:0
+msgid "Magento Order ID"
+msgstr "Magento Bestell ID"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr "Magento Auftragszeilen"
 
 #. module: magentoerpconnect
 #: field:magento.product.category,magento_parent_id:0
@@ -521,132 +631,23 @@
 msgstr "Magento Überkategorie"
 
 #. module: magentoerpconnect
-#: field:magento.res.partner,emailid:0
-msgid "E-mail address"
-msgstr "E-Mail Adresse"
-
-#. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Partial"
-msgstr "Teilweise"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_shop
-msgid "Sales Shop"
-msgstr "Verkaufsshop"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount_tax:0
-msgid "Total amount w. tax"
-msgstr "Gesamtbetrag inkl. Steuern"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_storeview
-#: view:magento.storeview:0
-msgid "Magento Storeview"
-msgstr "Magento Storeview"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_lang_id:0
-msgid "Default Language"
-msgstr "Standardsprache"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_parent_id:0
-msgid "Parent Magento Order"
-msgstr "Übergeordneter Vk-Auftrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_address
-#: view:magento.address:0
-msgid "Magento Address"
-msgstr "Magento Adresse"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update"
-msgstr "Update"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
-#: view:magento.store:0
-#: field:magento.store,storeview_ids:0
-msgid "Storeviews"
-msgstr "Storeviews"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-#: selection:magento.product.product,manage_stock:0
-msgid "Use Default Config"
-msgstr "Verwende Standartkonfiguration"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,store_id:0
-msgid "Store"
-msgstr "Store"
-
-#. module: magentoerpconnect
-#: field:magento.backend,website_ids:0
-msgid "Website"
-msgstr "Webseite"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Magento Configuration"
-msgstr "Magento Konfiguration"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update all the products stock quantities"
-msgstr "Update alle Lagerstückzahlen"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import partners from all websites"
-msgstr "Importiere Partner von allen Webseiten"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Magentoerpconnect"
-msgstr "Magentoerpconnect"
-
-#. module: magentoerpconnect
-#: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Options"
-msgstr "Optionen"
-
-#. module: magentoerpconnect
-#: field:res.partner,birthday:0
-msgid "Birthday"
-msgstr "Geburtstag"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_category_id:0
-msgid "Default Product Category"
-msgstr "Voreingestellte Produktkategorie"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,magento_qty:0
-msgid "Computed Quantity"
-msgstr "Errechnete Menge"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
-msgid "Magento Websites"
-msgstr "Magento Webseiten"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
-msgid "Magento Sale Order Line"
-msgstr "Magento Auftragszeile"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.product.category:0
-msgid "A product category with same ID on Magento already exists."
-msgstr ""
-"Eine Produktkategorie mit der gleichen ID existiert bereits in Magento."
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr "Magento Partner"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr "Magento Produkt"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr "Magento Produktkategorie"
 
 #. module: magentoerpconnect
 #: field:magento.product.product,product_type:0
@@ -654,109 +655,51 @@
 msgstr "Magento Produkttyp"
 
 #. module: magentoerpconnect
-#: field:magento.storeview,lang_id:0
-msgid "Language"
-msgstr "Sprache"
-
-#. module: magentoerpconnect
-#: field:magento.address,created_at:0
-#: field:magento.product.product,created_at:0
-#: field:magento.res.partner,created_at:0
-msgid "Created At (on Magento)"
-msgstr "Erstellt am (in Magento)"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_export_tracking:0
-msgid "Export tracking numbers"
-msgstr "Exportiere Sendungsverfolgungsnummern"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,sort_order:0
-#: field:magento.website,sort_order:0
-msgid "Sort Order"
-msgstr "Sortiere VK-Auftrag"
-
-#. module: magentoerpconnect
 #: field:magento.backend,product_binding_ids:0
 #: field:magento.website,product_binding_ids:0
 msgid "Magento Products"
 msgstr "Magento Produkte"
 
 #. module: magentoerpconnect
-#: field:magento.storeview,import_orders_from_date:0
-msgid "Import sale orders from date"
-msgstr "Importiere VK-Aufträge vom Datum"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner_category
-msgid "Partner Categories"
-msgstr "Partnerkategorien"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_billing:0
-msgid "Default Invoice"
-msgstr "Voreingestellte Rechnung"
-
-#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr "Magento VK-Auftrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr "Magento Auftragszeile"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
 #: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Informations"
-msgstr "Informationen"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,code:0
-#: field:magento.website,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,tax_rate:0
-msgid "Tax Rate"
-msgstr "Steuersatz"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Imports"
-msgstr "Importe"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
-msgid "Magento Backends"
-msgstr "Magento Backends"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,magento_child_ids:0
-msgid "Magento Child Categories"
-msgstr "Untergeordnete Magento Kategorien"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "Export Partners to Magento (experimental)"
-msgstr "Exportiere Partner zu Magento (experimentell)"
-
-#. module: magentoerpconnect
-#: field:magento.backend,version:0
-msgid "Version"
-msgstr "Version"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_account_invoice
-#: field:magento.account.invoice,openerp_id:0
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_code:0
-msgid "Magento Carrier Code"
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner.category:0
-msgid "A partner tag with same ID on Magento already exists."
-msgstr "Ein Partner Tag mit der gleichen ID existiert bereits in Magento."
+msgid "Magento Store"
+msgstr "Magento Store"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr "Magento Stores"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: field:magento.sale.order,storeview_id:0
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr "Magento Storeview"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr "Magento Storeviews"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr "Magento Sendungsverfolgungstitel"
 
 #. module: magentoerpconnect
 #: field:magento.res.partner,taxvat:0
@@ -764,141 +707,6 @@
 msgstr "Magento VAT"
 
 #. module: magentoerpconnect
-#: field:magento.res.partner.category,tax_class_id:0
-msgid "Tax Class ID"
-msgstr "Steuersatz ID"
-
-#. module: magentoerpconnect
-#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
-msgid "Total Amount differs from Magento"
-msgstr "Gesamtwert unterscheidet sich zu Magento"
-
-#. module: magentoerpconnect
-#: field:magento.store,send_picking_done_mail:0
-msgid "Send email notification on picking done"
-msgstr "Sende Versandbestätigung per E-Mail"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_binding
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
-msgid "Magento Binding (abstract)"
-msgstr ""
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
-msgid "Magento Account Invoice"
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.store:0
-msgid "A store with the same ID on Magento already exists."
-msgstr "Ein Store mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
-#: field:magento.address,magento_partner_id:0
-#: view:magento.res.partner:0
-msgid "Magento Partner"
-msgstr "Magento Partner"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.storeview:0
-msgid "A storeview with same ID on Magento already exists."
-msgstr "Ein Storeview mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
-#: view:magento.stock.picking.out:0
-msgid "Magento Delivery Order"
-msgstr "Magento Versandauftrag"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products since"
-msgstr "Importiere/Update Produkte seit"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0 and Use Customer Notification"
-msgstr "Verkaufsmenge < 0 und benutzte Kundenbenachrichtigungen"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.account.invoice:0
-msgid "An invoice with the same ID on Magento already exists."
-msgstr "Eine Rechnung mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner:0
-msgid "A partner with same ID on Magento already exists for this website."
-msgstr ""
-"Ein Partner mit der ID existiert in Magento bereits für diese Webseite."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "e.g. http://my.magento.com"
-msgstr "e.g. http://my.magento.com"
-
-#. module: magentoerpconnect
-#: view:magento.account.invoice:0
-msgid "Magento Invoice"
-msgstr "Magento Rechnung"
-
-#. module: magentoerpconnect
-#: field:magento.backend,password:0
-msgid "Password"
-msgstr "Passwort"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Main Configuration"
-msgstr "Hauptkonfiguration"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
-msgid ""
-"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"Die in OpenERP errechnete Summe stimmt nicht mit der aus Magento überein.\n"
-"\n"
-"Grund:\n"
-"Die Steuern sind evtl. verschieden zwischen OpenERP und Magento. Eine "
-"Finanzposition hat die Endsumme evtl. verändert.\n"
-"\n"
-"Lösung:\n"
-"Überprüfen Sie Steuern und Finanzpositionen und korrigieren Sie diese, falls "
-"nötig."
-
-#. module: magentoerpconnect
-#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
-msgid "Total Tax Amount differs from Magento"
-msgstr "Steuersumme unterscheidet sich zu Magento"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import all customer groups"
-msgstr "Importiere alle Kundengruppen"
-
-#. module: magentoerpconnect
-#: field:magento.backend,name:0
-#: field:magento.storeview,name:0
-#: field:magento.website,name:0
-msgid "Name"
-msgstr "Name"
-
-#. module: magentoerpconnect
 #: model:ir.model,name:magentoerpconnect.model_magento_website
 #: field:magento.address,website_id:0
 #: field:magento.res.partner,website_id:0
@@ -908,9 +716,19 @@
 msgstr "Magento Webseite"
 
 #. module: magentoerpconnect
-#: field:magento.storeview,enabled:0
-msgid "Enabled"
-msgstr "Aktiviert"
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr "Magento Webseiten"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr "Magentoerpconnect"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr "Hauptkonfiguration"
 
 #. module: magentoerpconnect
 #: field:magento.product.product,backorders:0
@@ -918,46 +736,31 @@
 msgstr "Verwalte Inventarrücksendungen"
 
 #. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_product
-#: field:magento.product.product,openerp_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Synchronize Metadata"
-msgstr "Synchronisiere Metadaten"
-
-#. module: magentoerpconnect
-#: help:magento.website,pricelist_id:0
-msgid ""
-"The pricelist used to define the prices of the products in Magento for this "
-"website.\n"
-"Choose a pricelist only if the prices are different for this website.\n"
-"When empty, the default price will be used."
-msgstr ""
-"Die Preisliste, welche benutzt wird, um die Preise der Produkte der Webseite "
-"in Magento zu definieren.\n"
-"Wählen Sie eine Preisliste nur, wenn die Preis sich für diese Webseite "
-"unterscheiden. \n"
-"Wenn leer,  wird der Standartpreis benutzt."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
-msgid "Carrier"
-msgstr "Frachtführer"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
-#: view:magento.backend:0
-#: field:magento.product.product,website_ids:0
-msgid "Websites"
-msgstr "Webseiten"
-
-#. module: magentoerpconnect
-#: view:magento.product.product:0
-msgid "Inventory Options"
-msgstr "Sortimentsoptionen"
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr "Verwalte Lager Level"
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr "Newsletter"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,no_sales_order_sync:0
+msgid "No Sales Order Synchronization"
+msgstr ""
 
 #. module: magentoerpconnect
 #: selection:magento.product.product,backorders:0
@@ -965,6 +768,16 @@
 msgstr "Kein Verkauf"
 
 #. module: magentoerpconnect
+#: field:magento.product.product,no_stock_sync:0
+msgid "No Stock Synchronization"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notizen"
+
+#. module: magentoerpconnect
 #: view:magento.backend:0
 msgid ""
 "Once imported,\n"
@@ -984,14 +797,329 @@
 "                                 Menü 'Connectors > Checkpunkte'."
 
 #. module: magentoerpconnect
-#: field:delivery.carrier,magento_tracking_title:0
-msgid "Magento Tracking Title"
-msgstr "Magento Sendungsverfolgungstitel"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Manage Stock"
-msgstr ""
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Options"
+msgstr "Optionen"
+
+#. module: magentoerpconnect
+#: selection:magento.store,create_invoice_on:0
+#: selection:payment.method,create_invoice_on:0
+msgid "Paid"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr "Übergeordneter Vk-Auftrag"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr "Teilweise"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner
+#: field:magento.address,openerp_id:0
+#: field:magento.res.partner,openerp_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr "Partnerkategorien"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr "Partnerkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr "Passwort"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_payment_method
+msgid "Payment Method"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr "Entnahmeliste"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr "Packmethode"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid "Prices are managed in OpenERP with pricelists"
+msgstr "Preise sind in OpenERP mit Preislisten verwaltet"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+"Preise sind in OpenERP gesetzt und zu Magento exportiert.\n"
+"\n"
+"Dies installier das Modul magentoerpconnect_pricing."
+
+#. module: magentoerpconnect
+#: field:magento.backend,catalog_price_tax_included:0
+msgid "Prices include tax"
+msgstr "Preise inkl. Steuer"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_category
+#: field:magento.product.category,openerp_id:0
+msgid "Product Category"
+msgstr "Produktkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr "VK-Auftrag"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr "Verkaufsauftragsposition"
+
+#. module: magentoerpconnect
+#: field:magento.backend,sale_prefix:0
+msgid "Sale Prefix"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,openerp_id:0
+msgid "Sale Shop"
+msgstr "Verkaufsshop"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr "VK-Auftrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_shop
+msgid "Sales Shop"
+msgstr "Verkaufsshop"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr "Verkaufmenge < 0"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr "Verkaufsmenge < 0 und benutzte Kundenbenachrichtigungen"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice validated/paid"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr "Sende Versandbestätigung per E-Mail"
+
+#. module: magentoerpconnect
+#: help:payment.method,create_invoice_on:0
+msgid ""
+"Should the invoice be created in Magento when it is validated or when it is "
+"paid in OpenERP?\n"
+"If nothing is set, the option falls back to the same option on the Magento "
+"store related to the sales order."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.store,create_invoice_on:0
+msgid ""
+"Should the invoice be created in Magento when it is validated or when it is "
+"paid in OpenERP?\n"
+"This only takes effect if the sales order's related payment method is not "
+"giving an option for this by itself. (See Payment Methods)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr "Sortiere VK-Auftrag"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr "Lagerfeld"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr "Lagerpackauftrag"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr "Store"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr "Stores"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
+#: view:magento.store:0
+#: field:magento.store,storeview_ids:0
+msgid "Storeviews"
+msgstr "Storeviews"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr "Synchronisiere Metadaten"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr "Steuersatz ID"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,tax_rate:0
+msgid "Tax Rate"
+msgstr "Steuersatz"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Die in OpenERP errechnete Summe stimmt nicht mit der aus Magento überein.\n"
+"\n"
+"Grund:\n"
+"Die Steuern sind evtl. verschieden zwischen OpenERP und Magento. Eine "
+"Finanzposition hat die Endsumme evtl. verändert.\n"
+"\n"
+"Lösung:\n"
+"Überprüfen Sie Steuern und Finanzpositionen und korrigieren Sie diese, falls "
+"nötig."
+
+#. module: magentoerpconnect
+#: help:magento.backend,use_custom_api_path:0
+msgid ""
+"The default API path is '/index.php/api/xmlrpc'. Check this box if you use a "
+"custom API path, in that case, the location has to be completed with the "
+"custom API path "
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Die in OpenERP errechnete Steuer stimmt nicht mit der Magento Steuer "
+"überein.\n"
+"\n"
+"Grund:\n"
+"Vermutlich sind die Steuersätze in OpenERP und Magento nicht identisch.  "
+"Durch eine entsprechende Steuerzuordnung wurde möglicherweise der Endpreis "
+"verändert.\n"
+"\n"
+"Lösung: \n"
+"Überprüfen Sie die Steuern und auch Zuordnungen und korrigieren Sie diese "
+"dann bei Bedarf."
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr "Dies installiert das Modul magentoerpconnect_catalog"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr "Dies installiert das Modul magentoerpconnect_export_partner."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"This option should respect the same\n"
+"                                      configuration than Magento.  Pay\n"
+"                                      attention to the taxes on the "
+"products,\n"
+"                                      which should surely include prices "
+"when\n"
+"                                      this option is activated."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
+msgid "Total Amount differs from Magento"
+msgstr "Gesamtwert unterscheidet sich zu Magento"
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
+msgid "Total Tax Amount differs from Magento"
+msgstr "Steuersumme unterscheidet sich zu Magento"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr "Gesamtbetrag"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr "Gesamtbetrag inkl. Steuern"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr "Update"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr "Update alle Lagerstückzahlen"
 
 #. module: magentoerpconnect
 #: field:magento.address,updated_at:0
@@ -1001,60 +1129,102 @@
 msgstr ""
 
 #. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Complete"
-msgstr "Vollständig"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_store
-#: view:magento.store:0
-msgid "Magento Store"
-msgstr "Magento Store"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_product
-#: view:magento.product.product:0
-msgid "Magento Product"
-msgstr "Magento Produkt"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
-#: field:magento.account.invoice,magento_order_id:0
-#: field:magento.sale.order.line,magento_order_id:0
-#: field:magento.stock.picking.out,magento_order_id:0
-msgid "Magento Sale Order"
-msgstr "Magento VK-Auftrag"
-
-#. module: magentoerpconnect
-#: field:magento.website,import_partners_from_date:0
-msgid "Import partners from date"
-msgstr "Importiere Partner seit Datum"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.sale.order:0
-#: sql_constraint:magento.sale.order.line:0
-msgid "A sale order line with the same ID on Magento already exists."
-msgstr "Eine VK-Auftragszeile mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_line_ids:0
-msgid "Magento Order Lines"
-msgstr "Magento Auftragszeilen"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,newsletter:0
-msgid "Newsletter"
-msgstr "Newsletter"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_lang_id:0
-msgid ""
-"If a default language is selected, the records will be imported in the "
-"translation of this language.\n"
-"Note that a similar configuration exists for each storeview."
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.address:0
-msgid "A partner address with same ID on Magento already exists."
+#: help:magento.backend,location:0
+msgid "Url to magento application"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr "Verwende Standartkonfiguration"
+
+#. module: magentoerpconnect
+#: field:magento.backend,use_auth_basic:0
+msgid "Use HTTP Auth Basic"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,use_auth_basic:0
+msgid ""
+"Use a Basic Access Authentication for the API. The Magento server could be "
+"configured to restrict access using a HTTP authentication based on a "
+"username and a password."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr "Benutzername"
+
+#. module: magentoerpconnect
+#: selection:magento.store,create_invoice_on:0
+#: selection:payment.method,create_invoice_on:0
+msgid "Validate"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr "Version"
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr "Zentrallager zur Bestände Berechnung"
+
+#. module: magentoerpconnect
+#: help:magento.backend,password:0
+msgid "Webservice password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,username:0
+msgid "Webservice user"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr "Webseite"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr "Webseiten"
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+"Vernachlässigen Sie die nicht-importierten Aufträge vor diesem Datum. Bitte "
+"tragen Sie nichts ein, um sämtliche  Aufträge zu importieren."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com"
+msgstr "e.g. http://my.magento.com"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com/admin"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "mag-"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
 msgstr ""

=== modified file 'magentoerpconnect/i18n/es.po'
--- magentoerpconnect/i18n/es.po	2014-04-12 10:07:56 +0000
+++ magentoerpconnect/i18n/es.po	2014-06-18 11:34:02 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openerp-connector-magento\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"POT-Creation-Date: 2014-06-10 14:00+0000\n"
 "PO-Revision-Date: 2014-03-25 16:58+0000\n"
 "Last-Translator: Alberto Garcia (Factor Libre) "
 "<[e-mail]>\n"
@@ -15,13 +15,283 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
-
-#. module: magentoerpconnect
-#: help:magento.backend,pricelist_id:0
-msgid "The price list used to define the prices of the products in Magento."
-msgstr "La tarifa usada para definir los precios de los productos en Magento"
+"X-Launchpad-Export-Date: 2014-06-11 06:38+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "'order_id' field in Magento"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(recompitar)"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.backend:0
+msgid "A backend with the same sale prefix already exists"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr "A partner address with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "A partner tag with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr "A partner with same ID on Magento already exists for this website."
+
+#. module: magentoerpconnect
+#: help:magento.backend,sale_prefix:0
+msgid ""
+"A prefix put before the name of imported sales orders.\n"
+"For instance, if the prefix is 'mag-', the sales order 100000692 in Magento, "
+"will be named 'mag-100000692' in OpenERP."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr "A product category with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "A product with the same ID on Magento already exists"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "A sale order line with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "A stock picking with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "A store with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "A storeview with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.website:0
+msgid "A website with the same ID on Magento already exists."
+msgstr "Una web con las misma ID existe en Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "API"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_magento_order_address:0
+msgid "Address from a Magento Order"
+msgstr "Dirección desde un Pedido Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,admin_location:0
+msgid "Admin Location"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Advanced Configuration"
+msgstr "Configuración avanzada"
+
+#. module: magentoerpconnect
+#: help:magento.res.partner,consider_as_company:0
+msgid ""
+"An account imported with a 'company' in the billing address is considered as "
+"a company.\n"
+" The partner takes the name of the company and is not merged with the "
+"billing address."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "An invoice with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_password:0
+msgid "Basic Auth. Password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_username:0
+msgid "Basic Auth. Username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_password:0
+msgid "Basic access authentication web server side password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_username:0
+msgid "Basic access authentication web server side username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+msgstr ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: magentoerpconnect
+#: help:magento.storeview,no_sales_order_sync:0
+msgid ""
+"Check if the storeview is active in Magento but its sales orders should not "
+"be imported."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.product.product,no_stock_sync:0
+msgid "Check this to exclude the product from stock synchronizations."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,product_stock_field_id:0
+msgid ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+msgstr ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+
+#. module: magentoerpconnect
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Completo"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Computed Quantity"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "Connector Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,consider_as_company:0
+msgid "Considered as company"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:payment.method:0
+msgid "Create invoice on"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,create_invoice_on:0
+#: field:payment.method,create_invoice_on:0
+msgid "Create invoice on action"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Creado a las (en Magento)"
+
+#. module: magentoerpconnect
+#: field:magento.backend,use_custom_api_path:0
+msgid "Custom Api Path"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Factura por defecto"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Idioma por defecto"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Categoría Producto por Defecto"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Forma Envio Por Defecto"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Albaranes"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "No se controla stock"
 
 #. module: magentoerpconnect
 #: help:magento.store,send_invoice_paid_mail:0
@@ -33,39 +303,191 @@
 "desde Magento?"
 
 #. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "E-mail"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Activado"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr "Exportar Empresas a Magento (experimental)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exportar Números de Seguimiento"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Extensiones"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,guest_customer:0
+msgid "Guest Customer"
+msgstr "Cliente Anónimo"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "HTTP Authentication"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Handle the product's catalog (not implemented)"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,magento_id:0
+#: field:magento.address,magento_id:0
+#: field:magento.binding,magento_id:0
+#: field:magento.product.category,magento_id:0
+#: field:magento.product.product,magento_id:0
+#: field:magento.res.partner,magento_id:0
+#: field:magento.res.partner.category,magento_id:0
+#: field:magento.sale.order,magento_id:0
+#: field:magento.sale.order.line,magento_id:0
+#: field:magento.stock.picking.out,magento_id:0
+#: field:magento.store,magento_id:0
+#: field:magento.storeview,magento_id:0
+#: field:magento.website,magento_id:0
+msgid "ID on Magento"
+msgstr "ID en Magento"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importar"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importar Pedidos Venta desde"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importar todos los grupos de clientes"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importar categorías desde fecha"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importar en segundo plano"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importar empresas de todos los sitios web"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importar empresas desde fecha"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importar empresas desde"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importar categorias productos desde"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importar productos desde fecha"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importar productos desde"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importar pedidos venta desde fecha"
+
+#. module: magentoerpconnect
 #: view:magento.backend:0
 msgid "Import sales orders from all store views"
 msgstr "Importar ordenes de ventas de todas las vistas de tienda"
 
 #. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
-msgid ""
-"The tax amount computed in OpenERP doesn't match with the tax amount in "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"The tax amount computed in OpenERP doesn't match with the tax amount in "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-
-#. module: magentoerpconnect
-#: help:magento.backend,warehouse_id:0
-msgid "Warehouse used to compute the stock quantities."
-msgstr "Almacén utilizado para computar las cantidades de stock"
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Importaciones"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informaciones"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "Inventory Options"
+msgstr "Opciones Inventario"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr "Ultima cantidad computada enviada a Magento"
 
 #. module: magentoerpconnect
 #: field:magento.account.invoice,sync_date:0
@@ -85,56 +507,63 @@
 msgstr "Fecha última sincronización"
 
 #. module: magentoerpconnect
-#: help:magento.backend,default_category_id:0
-msgid ""
-"If a default category is selected, products imported without a category will "
-"be linked to it."
-msgstr ""
-"If a default category is selected, products imported without a category will "
-"be linked to it."
-
-#. module: magentoerpconnect
-#: help:magento.storeview,import_orders_from_date:0
-msgid ""
-"do not consider non-imported sale orders before this date. Leave empty to "
-"import all sale orders"
-msgstr ""
-"do not consider non-imported sale orders before this date. Leave empty to "
-"import all sale orders"
-
-#. module: magentoerpconnect
-#: help:magento.store,send_picking_done_mail:0
-msgid ""
-"Does the picking export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Does the picking export/creation should send an email notification on "
-"Magento side?"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Do Not Manage Stock"
-msgstr "No se controla stock"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "Handle the product's catalog (not implemented)"
-msgstr "Handle the product's catalog (not implemented)"
-
-#. module: magentoerpconnect
-#: field:res.partner,company:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.website:0
-msgid "A website with the same ID on Magento already exists."
-msgstr "Una web con las misma ID existe en Magento"
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_categories_from_date:0
-msgid "Import categories from date"
-msgstr "Importar categorías desde fecha"
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr "Localización"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:payment.method:0
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr "Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr "Dirección Magento"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr "Magento Address Bindings"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_backend
+#: field:magento.account.invoice,backend_id:0
+#: field:magento.address,backend_id:0
+#: view:magento.backend:0
+#: field:magento.binding,backend_id:0
+#: field:magento.product.category,backend_id:0
+#: field:magento.product.product,backend_id:0
+#: field:magento.res.partner,backend_id:0
+#: field:magento.res.partner.category,backend_id:0
+#: field:magento.sale.order,backend_id:0
+#: field:magento.sale.order.line,backend_id:0
+#: field:magento.stock.picking.out,backend_id:0
+#: field:magento.store,backend_id:0
+#: field:magento.storeview,backend_id:0
+#: field:magento.website,backend_id:0
+msgid "Magento Backend"
+msgstr "Magento Backend"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr "Magento Backends"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr "Magento Base Carrier Code"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr "Magento Binding (abstract)"
 
 #. module: magentoerpconnect
 #: view:account.invoice:0
@@ -156,14 +585,36 @@
 msgstr "Magento Bindings"
 
 #. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "This installs the module magentoerpconnect_catalog."
-msgstr "Esto instala el módulo magentoerpconnect_catalog."
-
-#. module: magentoerpconnect
-#: field:magento.address,is_magento_order_address:0
-msgid "Address from a Magento Order"
-msgstr "Dirección desde un Pedido Magento"
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
+msgstr "Modo de Envio Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr "Subcategorias Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr "Magento Configuration"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr "Albaran Magento"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr "Grupo Magento (Categoría)"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr "Factura Magento"
 
 #. module: magentoerpconnect
 #: field:magento.sale.order,magento_order_id:0
@@ -171,14 +622,156 @@
 msgstr "Id Pedido Magento"
 
 #. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
-msgid "magentoerpconnect.installed"
-msgstr "magentoerpconnect.installed"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "This installs the module magentoerpconnect_export_partner."
-msgstr "This installs the module magentoerpconnect_export_partner."
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr "Lineas Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_parent_id:0
+msgid "Magento Parent Category"
+msgstr "Categoría Padre Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr "Empresa Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr "Producto Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr "Categoría Producto Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,product_type:0
+msgid "Magento Product Type"
+msgstr "Tipo Producto Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_binding_ids:0
+#: field:magento.website,product_binding_ids:0
+msgid "Magento Products"
+msgstr "Productos Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr "Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr "Línea Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
+#: view:magento.store:0
+msgid "Magento Store"
+msgstr "Tienda Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr "Tiendas Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: field:magento.sale.order,storeview_id:0
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr "Vista Tienda Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr "Vista Tienda Magento"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr "Magento Tracking Title"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,taxvat:0
+msgid "Magento VAT"
+msgstr "Impuesto Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_website
+#: field:magento.address,website_id:0
+#: field:magento.res.partner,website_id:0
+#: field:magento.store,website_id:0
+#: view:magento.website:0
+msgid "Magento Website"
+msgstr "Sitio Web Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr "Sitio Web Magento"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr "Magentoerpconnect"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr "Configuración Principal"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,backorders:0
+msgid "Manage Inventory Backorders"
+msgstr "Manage Inventory Backorders"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr "Gestionar Stock"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr "Gestión Nivel Stock"
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr "Boletín"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,no_sales_order_sync:0
+msgid "No Sales Order Synchronization"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "No Sell"
+msgstr "No Vender"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,no_stock_sync:0
+msgid "No Stock Synchronization"
+msgstr ""
 
 #. module: magentoerpconnect
 #: field:magento.sale.order.line,notes:0
@@ -186,67 +779,46 @@
 msgstr "Notas"
 
 #. module: magentoerpconnect
-#: field:magento.sale.order,openerp_id:0
-msgid "Sale Order"
-msgstr "Pedido de Venta"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,openerp_id:0
-msgid "Stock Picking"
-msgstr "Albaran"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Extensions"
-msgstr "Extensiones"
-
-#. module: magentoerpconnect
 #: view:magento.backend:0
-msgid "Advanced Configuration"
-msgstr "Configuración avanzada"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,group_id:0
-msgid "Magento Group (Category)"
-msgstr "Grupo Magento (Categoría)"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+msgid ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+msgstr ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
 #: view:magento.website:0
-#: field:magento.website,store_ids:0
-msgid "Stores"
-msgstr "Tiendas"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_stock_field_id:0
-msgid "Stock Field"
-msgstr "Campo Stock"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,openerp_id:0
-msgid "Partner Category"
-msgstr "Categoría de empresa"
-
-#. module: magentoerpconnect
-#: help:magento.product.product,magento_qty:0
-msgid "Last computed quantity to send on Magento."
-msgstr "Ultima cantidad computada enviada a Magento"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
-#: view:res.partner.category:0
-msgid "Magento"
-msgstr "Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
-msgid "connector.config.settings"
-msgstr "connector.config.settings"
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_products_from_date:0
-msgid "Import products from date"
-msgstr "Importar productos desde fecha"
+msgid "Options"
+msgstr "Opciones"
+
+#. module: magentoerpconnect
+#: selection:magento.store,create_invoice_on:0
+#: selection:payment.method,create_invoice_on:0
+msgid "Paid"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr "Pedido Magento Padre"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr "Parcial"
 
 #. module: magentoerpconnect
 #: model:ir.model,name:magentoerpconnect.model_res_partner
@@ -256,19 +828,34 @@
 msgstr "Empresa"
 
 #. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order
-msgid "Sales Order"
-msgstr "Pedidos de venta"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Albaranes"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Lineas Pedidos Venta"
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr "Categorías Empresas"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr "Categoría de empresa"
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_payment_method
+msgid "Payment Method"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr "Método Picking"
 
 #. module: magentoerpconnect
 #: field:connector.config.settings,module_magentoerpconnect_pricing:0
@@ -276,69 +863,15 @@
 msgstr "Precios son gestionados en OpenERP con Tarifas"
 
 #. module: magentoerpconnect
-#: field:magento.address,is_default_shipping:0
-msgid "Default Shipping"
-msgstr "Forma Envio Por Defecto"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.stock.picking.out:0
-msgid "A stock picking with same ID on Magento already exists."
-msgstr "A stock picking with same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid ""
-"By clicking on the buttons,\n"
-"                                    you will initiate the synchronizations\n"
-"                                    with Magento.\n"
-"                                    Note that the import or exports\n"
-"                                    won't be done directly,\n"
-"                                    they will create 'Jobs'\n"
-"                                    executed as soon as possible."
-msgstr ""
-"By clicking on the buttons,\n"
-"                                    you will initiate the synchronizations\n"
-"                                    with Magento.\n"
-"                                    Note that the import or exports\n"
-"                                    won't be done directly,\n"
-"                                    they will create 'Jobs'\n"
-"                                    executed as soon as possible."
-
-#. module: magentoerpconnect
-#: help:magento.backend,product_stock_field_id:0
-msgid ""
-"Choose the field of the product which will be used for stock inventory "
-"updates.\n"
-"If empty, Quantity Available is used."
-msgstr ""
-"Choose the field of the product which will be used for stock inventory "
-"updates.\n"
-"If empty, Quantity Available is used."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.product.product:0
-msgid "A product with the same ID on Magento already exists"
-msgstr "A product with the same ID on Magento already exists"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
-msgid "Backends"
-msgstr "Backends"
-
-#. module: magentoerpconnect
-#: field:magento.backend,location:0
-msgid "Location"
-msgstr "Localización"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
-
-#. module: magentoerpconnect
-#: field:magento.backend,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacen"
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
 
 #. module: magentoerpconnect
 #: field:magento.backend,catalog_price_tax_included:0
@@ -346,19 +879,10 @@
 msgstr "Precios incluyen impuestos"
 
 #. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products categories since"
-msgstr "Importar categorias productos desde"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,openerp_id:0
-msgid "Sale Order Line"
-msgstr "Línea Pedido Venta"
-
-#. module: magentoerpconnect
-#: field:magento.backend,username:0
-msgid "Username"
-msgstr "Usuario"
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr "Producto"
 
 #. module: magentoerpconnect
 #: model:ir.model,name:magentoerpconnect.model_product_category
@@ -367,80 +891,19 @@
 msgstr "Categoría Producto"
 
 #. module: magentoerpconnect
-#: field:magento.res.partner,guest_customer:0
-msgid "Guest Customer"
-msgstr "Cliente Anónimo"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid ""
-"Prices are set in OpenERP and exported to Magento.\n"
-"\n"
-"This installs the module magentoerpconnect_pricing."
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr "Pedido de Venta"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr "Línea Pedido Venta"
+
+#. module: magentoerpconnect
+#: field:magento.backend,sale_prefix:0
+msgid "Sale Prefix"
 msgstr ""
-"Prices are set in OpenERP and exported to Magento.\n"
-"\n"
-"This installs the module magentoerpconnect_pricing."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_carrier_code:0
-msgid "Magento Base Carrier Code"
-msgstr "Magento Base Carrier Code"
-
-#. module: magentoerpconnect
-#: view:magento.website:0
-msgid "Import partners since"
-msgstr "Importar empresas desde"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.website:0
-msgid "Import in background"
-msgstr "Importar en segundo plano"
-
-#. module: magentoerpconnect
-#: field:magento.account.invoice,magento_id:0
-#: field:magento.address,magento_id:0
-#: field:magento.binding,magento_id:0
-#: field:magento.product.category,magento_id:0
-#: field:magento.product.product,magento_id:0
-#: field:magento.res.partner,magento_id:0
-#: field:magento.res.partner.category,magento_id:0
-#: field:magento.sale.order,magento_id:0
-#: field:magento.sale.order.line,magento_id:0
-#: field:magento.stock.picking.out,magento_id:0
-#: field:magento.store,magento_id:0
-#: field:magento.storeview,magento_id:0
-#: field:magento.website,magento_id:0
-msgid "ID on Magento"
-msgstr "ID en Magento"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
-msgid "Magento Stores"
-msgstr "Tiendas Magento"
-
-#. module: magentoerpconnect
-#: field:magento.backend,pricelist_id:0
-#: field:magento.website,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount:0
-msgid "Total amount"
-msgstr "Cantidad Total"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_category
-#: view:magento.product.category:0
-msgid "Magento Product Category"
-msgstr "Categoría Producto Magento"
-
-#. module: magentoerpconnect
-#: view:magento.product.product:0
-msgid "(recompute)"
-msgstr "(recompitar)"
 
 #. module: magentoerpconnect
 #: field:magento.store,openerp_id:0
@@ -448,84 +911,14 @@
 msgstr "Tienda Venta"
 
 #. module: magentoerpconnect
-#: field:magento.product.product,manage_stock:0
-msgid "Manage Stock Level"
-msgstr "Gestión Nivel Stock"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_backend
-#: field:magento.account.invoice,backend_id:0
-#: field:magento.address,backend_id:0
-#: view:magento.backend:0
-#: field:magento.binding,backend_id:0
-#: field:magento.product.category,backend_id:0
-#: field:magento.product.product,backend_id:0
-#: field:magento.res.partner,backend_id:0
-#: field:magento.res.partner.category,backend_id:0
-#: field:magento.sale.order,backend_id:0
-#: field:magento.sale.order.line,backend_id:0
-#: field:magento.stock.picking.out,backend_id:0
-#: field:magento.store,backend_id:0
-#: field:magento.storeview,backend_id:0
-#: field:magento.website,backend_id:0
-msgid "Magento Backend"
-msgstr "Magento Backend"
-
-#. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders"
-msgstr "Importar"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,picking_method:0
-msgid "Picking Method"
-msgstr "Método Picking"
-
-#. module: magentoerpconnect
-#: view:res.partner:0
-#: field:res.partner,magento_address_bind_ids:0
-msgid "Magento Address Bindings"
-msgstr "Magento Address Bindings"
-
-#. module: magentoerpconnect
-#: field:magento.store,send_invoice_paid_mail:0
-msgid "Send email notification on invoice paid"
-msgstr "Enviar notificación email cuando se pague la factura"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
-msgid "Magento Storeviews"
-msgstr "Vista Tienda Magento"
-
-#. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders since"
-msgstr "Importar Pedidos Venta desde"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0"
-msgstr "Vendes Cantidad < 0"
-
-#. module: magentoerpconnect
-#: help:magento.sale.order,magento_order_id:0
-msgid "'order_id' field in Magento"
-msgstr "'order_id' field in Magento"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,magento_parent_id:0
-msgid "Magento Parent Category"
-msgstr "Categoría Padre Magento"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,emailid:0
-msgid "E-mail address"
-msgstr "E-mail"
-
-#. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Partial"
-msgstr "Parcial"
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr "Pedidos de venta"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Lineas Pedidos Venta"
 
 #. module: magentoerpconnect
 #: model:ir.model,name:magentoerpconnect.model_sale_shop
@@ -533,36 +926,70 @@
 msgstr "Tienda Ventas"
 
 #. module: magentoerpconnect
-#: field:magento.sale.order,total_amount_tax:0
-msgid "Total amount w. tax"
-msgstr "Total w. impuesto"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_storeview
-#: view:magento.storeview:0
-msgid "Magento Storeview"
-msgstr "Vista Tienda Magento"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_lang_id:0
-msgid "Default Language"
-msgstr "Idioma por defecto"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_parent_id:0
-msgid "Parent Magento Order"
-msgstr "Pedido Magento Padre"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_address
-#: view:magento.address:0
-msgid "Magento Address"
-msgstr "Dirección Magento"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update"
-msgstr "Actualizar"
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr "Vendes Cantidad < 0"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr "Vender cantidad z 0 y Usar Notificación Cliente"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice validated/paid"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr "Enviar email de notificación cuando sea realizado el picking"
+
+#. module: magentoerpconnect
+#: help:payment.method,create_invoice_on:0
+msgid ""
+"Should the invoice be created in Magento when it is validated or when it is "
+"paid in OpenERP?\n"
+"If nothing is set, the option falls back to the same option on the Magento "
+"store related to the sales order."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.store,create_invoice_on:0
+msgid ""
+"Should the invoice be created in Magento when it is validated or when it is "
+"paid in OpenERP?\n"
+"This only takes effect if the sales order's related payment method is not "
+"giving an option for this by itself. (See Payment Methods)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr "Orden de Clasificación"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr "Campo Stock"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr "Albaran"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr "Tienda"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr "Tiendas"
 
 #. module: magentoerpconnect
 #: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
@@ -572,139 +999,14 @@
 msgstr "Vistas Tiendas"
 
 #. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-#: selection:magento.product.product,manage_stock:0
-msgid "Use Default Config"
-msgstr "Usar Configuración por defecto"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,store_id:0
-msgid "Store"
-msgstr "Tienda"
-
-#. module: magentoerpconnect
-#: field:magento.backend,website_ids:0
-msgid "Website"
-msgstr "Sitio Web"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Magento Configuration"
-msgstr "Magento Configuration"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update all the products stock quantities"
-msgstr "Actualizar el stock de todos los productos"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import partners from all websites"
-msgstr "Importar empresas de todos los sitios web"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Magentoerpconnect"
-msgstr "Magentoerpconnect"
-
-#. module: magentoerpconnect
-#: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Options"
-msgstr "Opciones"
-
-#. module: magentoerpconnect
-#: field:res.partner,birthday:0
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_category_id:0
-msgid "Default Product Category"
-msgstr "Categoría Producto por Defecto"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,magento_qty:0
-msgid "Computed Quantity"
-msgstr "Computed Quantity"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
-msgid "Magento Websites"
-msgstr "Sitio Web Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
-msgid "Magento Sale Order Line"
-msgstr "Línea Pedido Venta Magento"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.product.category:0
-msgid "A product category with same ID on Magento already exists."
-msgstr "A product category with same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: field:magento.product.product,product_type:0
-msgid "Magento Product Type"
-msgstr "Tipo Producto Magento"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: magentoerpconnect
-#: field:magento.address,created_at:0
-#: field:magento.product.product,created_at:0
-#: field:magento.res.partner,created_at:0
-msgid "Created At (on Magento)"
-msgstr "Creado a las (en Magento)"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_export_tracking:0
-msgid "Export tracking numbers"
-msgstr "Exportar Números de Seguimiento"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,sort_order:0
-#: field:magento.website,sort_order:0
-msgid "Sort Order"
-msgstr "Orden de Clasificación"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_binding_ids:0
-#: field:magento.website,product_binding_ids:0
-msgid "Magento Products"
-msgstr "Productos Magento"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,import_orders_from_date:0
-msgid "Import sale orders from date"
-msgstr "Importar pedidos venta desde fecha"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner_category
-msgid "Partner Categories"
-msgstr "Categorías Empresas"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_billing:0
-msgid "Default Invoice"
-msgstr "Factura por defecto"
-
-#. module: magentoerpconnect
-#: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Informations"
-msgstr "Informaciones"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,code:0
-#: field:magento.website,code:0
-msgid "Code"
-msgstr "Código"
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr "Sincronizar Metadata"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr "Tax Class ID"
 
 #. module: magentoerpconnect
 #: field:magento.sale.order.line,tax_rate:0
@@ -712,57 +1014,82 @@
 msgstr "Impuesto"
 
 #. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+
+#. module: magentoerpconnect
+#: help:magento.backend,use_custom_api_path:0
+msgid ""
+"The default API path is '/index.php/api/xmlrpc'. Check this box if you use a "
+"custom API path, in that case, the location has to be completed with the "
+"custom API path "
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr "Esto instala el módulo magentoerpconnect_catalog."
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr "This installs the module magentoerpconnect_export_partner."
+
+#. module: magentoerpconnect
 #: view:magento.backend:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Imports"
-msgstr "Importaciones"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
-msgid "Magento Backends"
-msgstr "Magento Backends"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,magento_child_ids:0
-msgid "Magento Child Categories"
-msgstr "Subcategorias Magento"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "Export Partners to Magento (experimental)"
-msgstr "Exportar Empresas a Magento (experimental)"
-
-#. module: magentoerpconnect
-#: field:magento.backend,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_account_invoice
-#: field:magento.account.invoice,openerp_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_code:0
-msgid "Magento Carrier Code"
-msgstr "Modo de Envio Magento"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner.category:0
-msgid "A partner tag with same ID on Magento already exists."
-msgstr "A partner tag with same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,taxvat:0
-msgid "Magento VAT"
-msgstr "Impuesto Magento"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,tax_class_id:0
-msgid "Tax Class ID"
-msgstr "Tax Class ID"
+msgid ""
+"This option should respect the same\n"
+"                                      configuration than Magento.  Pay\n"
+"                                      attention to the taxes on the "
+"products,\n"
+"                                      which should surely include prices "
+"when\n"
+"                                      this option is activated."
+msgstr ""
 
 #. module: magentoerpconnect
 #: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
@@ -770,222 +1097,29 @@
 msgstr "Importe Total Difiere de Magento"
 
 #. module: magentoerpconnect
-#: field:magento.store,send_picking_done_mail:0
-msgid "Send email notification on picking done"
-msgstr "Enviar email de notificación cuando sea realizado el picking"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_binding
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
-msgid "Magento Binding (abstract)"
-msgstr "Magento Binding (abstract)"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
-msgid "Magento Account Invoice"
-msgstr "Factura Magento"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.store:0
-msgid "A store with the same ID on Magento already exists."
-msgstr "A store with the same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
-#: field:magento.address,magento_partner_id:0
-#: view:magento.res.partner:0
-msgid "Magento Partner"
-msgstr "Empresa Magento"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.storeview:0
-msgid "A storeview with same ID on Magento already exists."
-msgstr "A storeview with same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
-#: view:magento.stock.picking.out:0
-msgid "Magento Delivery Order"
-msgstr "Albaran Magento"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products since"
-msgstr "Importar productos desde"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0 and Use Customer Notification"
-msgstr "Vender cantidad z 0 y Usar Notificación Cliente"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.account.invoice:0
-msgid "An invoice with the same ID on Magento already exists."
-msgstr "An invoice with the same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner:0
-msgid "A partner with same ID on Magento already exists for this website."
-msgstr "A partner with same ID on Magento already exists for this website."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "e.g. http://my.magento.com"
-msgstr "e.g. http://my.magento.com"
-
-#. module: magentoerpconnect
-#: view:magento.account.invoice:0
-msgid "Magento Invoice"
-msgstr "Factura Magento"
-
-#. module: magentoerpconnect
-#: field:magento.backend,password:0
-msgid "Password"
-msgstr "Contraseña"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Main Configuration"
-msgstr "Configuración Principal"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
-msgid ""
-"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-
-#. module: magentoerpconnect
 #: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
 msgid "Total Tax Amount differs from Magento"
 msgstr "Total Impuestos difiere de Magento"
 
 #. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import all customer groups"
-msgstr "Importar todos los grupos de clientes"
-
-#. module: magentoerpconnect
-#: field:magento.backend,name:0
-#: field:magento.storeview,name:0
-#: field:magento.website,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_website
-#: field:magento.address,website_id:0
-#: field:magento.res.partner,website_id:0
-#: field:magento.store,website_id:0
-#: view:magento.website:0
-msgid "Magento Website"
-msgstr "Sitio Web Magento"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,enabled:0
-msgid "Enabled"
-msgstr "Activado"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,backorders:0
-msgid "Manage Inventory Backorders"
-msgstr "Manage Inventory Backorders"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_product
-#: field:magento.product.product,openerp_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Synchronize Metadata"
-msgstr "Sincronizar Metadata"
-
-#. module: magentoerpconnect
-#: help:magento.website,pricelist_id:0
-msgid ""
-"The pricelist used to define the prices of the products in Magento for this "
-"website.\n"
-"Choose a pricelist only if the prices are different for this website.\n"
-"When empty, the default price will be used."
-msgstr ""
-"Lista de precios usada para definir los precios de los productos en Magento "
-"para esta web.\n"
-"Elige una lista solo si los precios son diferentes para esta web.\n"
-"Si no seleccionas ninguna, los precios serán por defecto."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
-#: view:magento.backend:0
-#: field:magento.product.product,website_ids:0
-msgid "Websites"
-msgstr "Sitios Web"
-
-#. module: magentoerpconnect
-#: view:magento.product.product:0
-msgid "Inventory Options"
-msgstr "Opciones Inventario"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "No Sell"
-msgstr "No Vender"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid ""
-"Once imported,\n"
-"                                    some types of records,\n"
-"                                    like the products or categories,\n"
-"                                    need a manual review.\n"
-"                                    You will find the list\n"
-"                                    of the new records to review\n"
-"                                    in the menu 'Connectors > Checkpoint'."
-msgstr ""
-"Once imported,\n"
-"                                    some types of records,\n"
-"                                    like the products or categories,\n"
-"                                    need a manual review.\n"
-"                                    You will find the list\n"
-"                                    of the new records to review\n"
-"                                    in the menu 'Connectors > Checkpoint'."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_tracking_title:0
-msgid "Magento Tracking Title"
-msgstr "Magento Tracking Title"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Manage Stock"
-msgstr "Gestionar Stock"
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr "Cantidad Total"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr "Total w. impuesto"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr "Actualizar"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr "Actualizar el stock de todos los productos"
 
 #. module: magentoerpconnect
 #: field:magento.address,updated_at:0
@@ -995,63 +1129,102 @@
 msgstr "Updated At (on Magento)"
 
 #. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Complete"
-msgstr "Completo"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_store
-#: view:magento.store:0
-msgid "Magento Store"
-msgstr "Tienda Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_product
-#: view:magento.product.product:0
-msgid "Magento Product"
-msgstr "Producto Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
-#: field:magento.account.invoice,magento_order_id:0
-#: field:magento.sale.order.line,magento_order_id:0
-#: field:magento.stock.picking.out,magento_order_id:0
-msgid "Magento Sale Order"
-msgstr "Pedido Venta Magento"
-
-#. module: magentoerpconnect
-#: field:magento.website,import_partners_from_date:0
-msgid "Import partners from date"
-msgstr "Importar empresas desde fecha"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.sale.order:0
-#: sql_constraint:magento.sale.order.line:0
-msgid "A sale order line with the same ID on Magento already exists."
-msgstr "A sale order line with the same ID on Magento already exists."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_line_ids:0
-msgid "Magento Order Lines"
-msgstr "Lineas Pedido Venta Magento"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,newsletter:0
-msgid "Newsletter"
-msgstr "Boletín"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_lang_id:0
-msgid ""
-"If a default language is selected, the records will be imported in the "
-"translation of this language.\n"
-"Note that a similar configuration exists for each storeview."
-msgstr ""
-"If a default language is selected, the records will be imported in the "
-"translation of this language.\n"
-"Note that a similar configuration exists for each storeview."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.address:0
-msgid "A partner address with same ID on Magento already exists."
-msgstr "A partner address with same ID on Magento already exists."
+#: help:magento.backend,location:0
+msgid "Url to magento application"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr "Usar Configuración por defecto"
+
+#. module: magentoerpconnect
+#: field:magento.backend,use_auth_basic:0
+msgid "Use HTTP Auth Basic"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,use_auth_basic:0
+msgid ""
+"Use a Basic Access Authentication for the API. The Magento server could be "
+"configured to restrict access using a HTTP authentication based on a "
+"username and a password."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr "Usuario"
+
+#. module: magentoerpconnect
+#: selection:magento.store,create_invoice_on:0
+#: selection:payment.method,create_invoice_on:0
+msgid "Validate"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr "Versión"
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacen"
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr "Almacén utilizado para computar las cantidades de stock"
+
+#. module: magentoerpconnect
+#: help:magento.backend,password:0
+msgid "Webservice password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,username:0
+msgid "Webservice user"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr "Sitio Web"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr "Sitios Web"
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com"
+msgstr "e.g. http://my.magento.com"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com/admin"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "mag-"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
+msgstr "magentoerpconnect.installed"

=== modified file 'magentoerpconnect/i18n/fr.po'
--- magentoerpconnect/i18n/fr.po	2014-04-12 10:07:56 +0000
+++ magentoerpconnect/i18n/fr.po	2014-06-18 11:34:02 +0000
@@ -6,123 +6,84 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"POT-Creation-Date: 2014-06-10 14:00+0000\n"
 "PO-Revision-Date: 2014-01-06 13:12+0000\n"
 "Last-Translator: Guewen Baconnier @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
-
-#. module: magentoerpconnect
-#: help:magento.backend,pricelist_id:0
-msgid "The price list used to define the prices of the products in Magento."
-msgstr ""
-"La liste de prix utilisée pour définir les prix des articles sur Magento."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_invoice_paid_mail:0
-msgid ""
-"Does the invoice export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Définit si Magento doit envoyer un e-mail lors de l'export des factures."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import sales orders from all store views"
-msgstr "Importer les commandes depuis toutes les vues magasin"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
-msgid ""
-"The tax amount computed in OpenERP doesn't match with the tax amount in "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"Les taxes calculées par OpenERP ne correspondent pas aux tax calculées par "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"La configuration des taxes est probablement différente entre OpenERP et "
-"Magento. Une position fiscale peut avoir modifié le prix final.\n"
-"\n"
-"Résolution:\n"
-"Contrôler la configuration des taxes et positions fiscales et les corriger "
-"si nécessaire."
-
-#. module: magentoerpconnect
-#: help:magento.backend,warehouse_id:0
-msgid "Warehouse used to compute the stock quantities."
-msgstr "Entrepôt utilisé pour calculer les quantités en stock."
-
-#. module: magentoerpconnect
-#: field:magento.account.invoice,sync_date:0
-#: field:magento.address,sync_date:0
-#: field:magento.binding,sync_date:0
-#: field:magento.product.category,sync_date:0
-#: field:magento.product.product,sync_date:0
-#: field:magento.res.partner,sync_date:0
-#: field:magento.res.partner.category,sync_date:0
-#: field:magento.sale.order,sync_date:0
-#: field:magento.sale.order.line,sync_date:0
-#: field:magento.stock.picking.out,sync_date:0
-#: field:magento.store,sync_date:0
-#: field:magento.storeview,sync_date:0
-#: field:magento.website,sync_date:0
-msgid "Last synchronization date"
-msgstr "Dernière date de synchronisation"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_category_id:0
-msgid ""
-"If a default category is selected, products imported without a category will "
-"be linked to it."
-msgstr ""
-"Si une catégorie par défaut est sélectionnée, les articles importés sans "
-"catégorie y seront liés."
-
-#. module: magentoerpconnect
-#: help:magento.storeview,import_orders_from_date:0
-msgid ""
-"do not consider non-imported sale orders before this date. Leave empty to "
-"import all sale orders"
-msgstr ""
-"Ignore les commandes non importées avant cette date. Laisser vide pour "
-"importer toutes les commandes."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_picking_done_mail:0
-msgid ""
-"Does the picking export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Définit si Magento doit envoyer un e-mail lors de l'export des bons de "
-"livraisons."
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Do Not Manage Stock"
-msgstr "Ne pas gérer les stock"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "Handle the product's catalog (not implemented)"
-msgstr "Gérer le catalogue d'articles depuis OpenERP (non supporté)"
-
-#. module: magentoerpconnect
-#: field:res.partner,company:0
-msgid "Company"
-msgstr "Société"
+"X-Launchpad-Export-Date: 2014-06-11 06:38+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "Champ 'order_id' dans Magento"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(recalculer)"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.backend:0
+msgid "A backend with the same sale prefix already exists"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr "Une adresse avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "Une catégorie de partenaire avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr "Un client Magento avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: help:magento.backend,sale_prefix:0
+msgid ""
+"A prefix put before the name of imported sales orders.\n"
+"For instance, if the prefix is 'mag-', the sales order 100000692 in Magento, "
+"will be named 'mag-100000692' in OpenERP."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr "Une catégorie d'articles avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "Un article avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "Une ligne de commande avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "Un bon de livraison avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "Une boutique Magento avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "Une vue magasin Magento avec le même ID Magento existe déjà."
 
 #. module: magentoerpconnect
 #: sql_constraint:magento.website:0
@@ -130,33 +91,9 @@
 msgstr "Un site web avec le même ID sur Magento existe déjà."
 
 #. module: magentoerpconnect
-#: field:magento.backend,import_categories_from_date:0
-msgid "Import categories from date"
-msgstr "Importer les catégories depuis la date"
-
-#. module: magentoerpconnect
-#: view:account.invoice:0
-#: field:account.invoice,magento_bind_ids:0
-#: view:product.category:0
-#: field:product.category,magento_bind_ids:0
-#: view:product.product:0
-#: field:product.product,magento_bind_ids:0
-#: view:res.partner:0
-#: field:res.partner,magento_bind_ids:0
-#: field:res.partner.category,magento_bind_ids:0
-#: field:sale.order,magento_bind_ids:0
-#: field:sale.order.line,magento_bind_ids:0
-#: field:sale.shop,magento_bind_ids:0
-#: field:stock.picking,magento_bind_ids:0
-#: view:stock.picking.out:0
-#: field:stock.picking.out,magento_bind_ids:0
-msgid "Magento Bindings"
-msgstr "Liens Magento"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "This installs the module magentoerpconnect_catalog."
-msgstr "Installe le module magentoerpconnect_catalog"
+#: view:magento.backend:0
+msgid "API"
+msgstr ""
 
 #. module: magentoerpconnect
 #: field:magento.address,is_magento_order_address:0
@@ -164,39 +101,9 @@
 msgstr "Adresse d'une commande Magento"
 
 #. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_id:0
-msgid "Magento Order ID"
-msgstr "ID de commande Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
-msgid "magentoerpconnect.installed"
-msgstr "magentoerpconnect.installed"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "This installs the module magentoerpconnect_export_partner."
-msgstr "Installe le module magentoerpconnect_export_partner."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,openerp_id:0
-msgid "Sale Order"
-msgstr "Bons de Commande"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,openerp_id:0
-msgid "Stock Picking"
-msgstr "Bon de livraison"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Extensions"
-msgstr "Extensions"
+#: field:magento.backend,admin_location:0
+msgid "Admin Location"
+msgstr ""
 
 #. module: magentoerpconnect
 #: view:magento.backend:0
@@ -204,84 +111,48 @@
 msgstr "Configuration avancée"
 
 #. module: magentoerpconnect
-#: field:magento.res.partner,group_id:0
-msgid "Magento Group (Category)"
-msgstr "Groupe de client Magento (Catégorie)"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
-#: view:magento.website:0
-#: field:magento.website,store_ids:0
-msgid "Stores"
-msgstr "Magasins"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_stock_field_id:0
-msgid "Stock Field"
-msgstr "Champ de stock"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,openerp_id:0
-msgid "Partner Category"
-msgstr "Catégorie de partenaire"
-
-#. module: magentoerpconnect
-#: help:magento.product.product,magento_qty:0
-msgid "Last computed quantity to send on Magento."
-msgstr "Dernière quantité calculée à envoyer à Magento"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
-#: view:res.partner.category:0
-msgid "Magento"
-msgstr "Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
-msgid "connector.config.settings"
-msgstr "connector.config.settings"
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_products_from_date:0
-msgid "Import products from date"
-msgstr "Importer les articles depuis la date"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner
-#: field:magento.address,openerp_id:0
-#: field:magento.res.partner,openerp_id:0
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order
-msgid "Sales Order"
-msgstr "Bon de commande"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Bons de livraisons"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Ligne de commande"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid "Prices are managed in OpenERP with pricelists"
-msgstr "Les prix de vente sont gérés dans OpenERP avec des listes de prix"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_shipping:0
-msgid "Default Shipping"
-msgstr "Adresse de livraison par défaut"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.stock.picking.out:0
-msgid "A stock picking with same ID on Magento already exists."
-msgstr "Un bon de livraison avec le même ID Magento existe déjà."
+#: help:magento.res.partner,consider_as_company:0
+msgid ""
+"An account imported with a 'company' in the billing address is considered as "
+"a company.\n"
+" The partner takes the name of the company and is not merged with the "
+"billing address."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "Une facture Magento avec le même ID Magento existe déjà."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_password:0
+msgid "Basic Auth. Password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,auth_basic_username:0
+msgid "Basic Auth. Username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_password:0
+msgid "Basic access authentication web server side password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,auth_basic_username:0
+msgid "Basic access authentication web server side username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Anniversaire"
 
 #. module: magentoerpconnect
 #: view:magento.backend:0
@@ -303,6 +174,23 @@
 "                                    exécutés aussitôt que possible."
 
 #. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Transporteur"
+
+#. module: magentoerpconnect
+#: help:magento.storeview,no_sales_order_sync:0
+msgid ""
+"Check if the storeview is active in Magento but its sales orders should not "
+"be imported."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.product.product,no_stock_sync:0
+msgid "Check this to exclude the product from stock synchronizations."
+msgstr ""
+
+#. module: magentoerpconnect
 #: help:magento.backend,product_stock_field_id:0
 msgid ""
 "Choose the field of the product which will be used for stock inventory "
@@ -313,55 +201,138 @@
 "quantité en stock.Quand le champ est vide, la quantité en stock est utilisée."
 
 #. module: magentoerpconnect
-#: sql_constraint:magento.product.product:0
-msgid "A product with the same ID on Magento already exists"
-msgstr "Un article avec le même ID Magento existe déjà."
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
-msgid "Backends"
-msgstr "Backends"
-
-#. module: magentoerpconnect
-#: field:magento.backend,location:0
-msgid "Location"
-msgstr "Emplacement"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking
-msgid "Picking List"
-msgstr "Liste de colisage"
-
-#. module: magentoerpconnect
-#: field:magento.backend,warehouse_id:0
-msgid "Warehouse"
-msgstr "Entrepôt"
-
-#. module: magentoerpconnect
-#: field:magento.backend,catalog_price_tax_included:0
-msgid "Prices include tax"
-msgstr "Prix taxes-incluses"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products categories since"
-msgstr "Importer les catégories d'articles depuis"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,openerp_id:0
-msgid "Sale Order Line"
-msgstr "Ligne de commande"
-
-#. module: magentoerpconnect
-#: field:magento.backend,username:0
-msgid "Username"
-msgstr "Utilisateur"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_category
-#: field:magento.product.category,openerp_id:0
-msgid "Product Category"
-msgstr "Catégorie d'articles"
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Société"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Complet"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Quantité calculée"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "Connector Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,consider_as_company:0
+msgid "Considered as company"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:payment.method:0
+msgid "Create invoice on"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,create_invoice_on:0
+#: field:payment.method,create_invoice_on:0
+msgid "Create invoice on action"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Créé le (sur Magento)"
+
+#. module: magentoerpconnect
+#: field:magento.backend,use_custom_api_path:0
+msgid "Custom Api Path"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Adresse de facturation par défaut"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Langue par défaut"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Catégorie d'articles par défaut"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Adresse de livraison par défaut"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Bons de livraisons"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "Ne pas gérer les stock"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Définit si Magento doit envoyer un e-mail lors de l'export des factures."
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Définit si Magento doit envoyer un e-mail lors de l'export des bons de "
+"livraisons."
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "Adresse e-mail"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Activé"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr ""
+"Exporter les clients vers Magento (expérimental, ne pas utiliser en "
+"production)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exporter la référence de suivi transporteur"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Extensions"
 
 #. module: magentoerpconnect
 #: field:magento.res.partner,guest_customer:0
@@ -369,31 +340,14 @@
 msgstr "Client invité"
 
 #. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid ""
-"Prices are set in OpenERP and exported to Magento.\n"
-"\n"
-"This installs the module magentoerpconnect_pricing."
+#: view:magento.backend:0
+msgid "HTTP Authentication"
 msgstr ""
-"Les prix sont définis dans OpenERP et exportés vers Magento.\n"
-"\n"
-"Installe le module magentoerpconnect_pricing."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_carrier_code:0
-msgid "Magento Base Carrier Code"
-msgstr "Code de base de transporteur sur Magento"
-
-#. module: magentoerpconnect
-#: view:magento.website:0
-msgid "Import partners since"
-msgstr "Importer les partenaires depuis"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.website:0
-msgid "Import in background"
-msgstr "Importer en arrière-plan"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Gérer le catalogue d'articles depuis OpenERP (non supporté)"
 
 #. module: magentoerpconnect
 #: field:magento.account.invoice,magento_id:0
@@ -413,41 +367,166 @@
 msgstr "ID sur Magento"
 
 #. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
-msgid "Magento Stores"
-msgstr "Magasins Magento"
-
-#. module: magentoerpconnect
-#: field:magento.backend,pricelist_id:0
-#: field:magento.website,pricelist_id:0
-msgid "Pricelist"
-msgstr "Liste de prix"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount:0
-msgid "Total amount"
-msgstr "Montant total"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_category
-#: view:magento.product.category:0
-msgid "Magento Product Category"
-msgstr "Catégorie d'articles Magento"
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"Si une catégorie par défaut est sélectionnée, les articles importés sans "
+"catégorie y seront liés."
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+"Si une langue par défaut est sélectionnée, les enregistements seront "
+"importés dans la traduction de cette langue.\n"
+"Note: une configuration similaire peut être définie sur chaque vue magasin."
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importer les commandes"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importer les commandes depuis"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importer tous les groupes client"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importer les catégories depuis la date"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importer en arrière-plan"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importer les clients de tous les sites web"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importer les clients depuis la date"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importer les partenaires depuis"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importer les catégories d'articles depuis"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importer les articles depuis la date"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importer les articles depuis"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importer les commandes depuis une date"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Importer les commandes depuis toutes les vues magasin"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Imports"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informations"
 
 #. module: magentoerpconnect
 #: view:magento.product.product:0
-msgid "(recompute)"
-msgstr "(recalculer)"
-
-#. module: magentoerpconnect
-#: field:magento.store,openerp_id:0
-msgid "Sale Shop"
-msgstr "Magasin"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,manage_stock:0
-msgid "Manage Stock Level"
-msgstr "Gérer les stocks"
+msgid "Inventory Options"
+msgstr "Options d'inventaire"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Langue"
+
+#. module: magentoerpconnect