[MERGE] Forward-Port branch 10.0 up to 803263c

.tx/config

@@ -57,11 +57,6 @@ file_filter = locale/<lang>/LC_MESSAGES/inventory.po
 source_file = locale/sources/inventory.pot
 source_lang = en
 
-[odoo-10-doc.legal]
-file_filter = locale/<lang>/LC_MESSAGES/legal.po
-source_file = locale/sources/legal.pot
-source_lang = en
-
 [odoo-10-doc.manufacturing]
 file_filter = locale/<lang>/LC_MESSAGES/manufacturing.po
 source_file = locale/sources/manufacturing.pot

accounting/others/taxes.rst

@@ -12,3 +12,4 @@ Taxes
    taxes/tax_included
    taxes/retention
    taxes/B2B_B2C
+   taxes/cash_basis_taxes

accounting/others/taxes/cash_basis_taxes.rst

@@ -0,0 +1,87 @@
+==============================
+How to manage cash basis taxes
+==============================
+
+The cash basis taxes are due when the payment has been done and not at
+the validation of the invoice (as it is the case with standard taxes).
+Reporting your income and expenses to the administration based on the
+cash basis method is legal in some countries and under some conditions.
+
+Example : You sell a product in the 1st quarter of your fiscal year and
+receive the payment the 2nd quarter of your fiscal year. Based on the
+cash basis method, the tax you have to pay to the administration is due
+for the 2nd quarter.
+
+How to configure cash basis taxes ? 
+------------------------------------
+
+You first have to activate the setting in
+:menuselection:`Accounting --> Configuration --> Settings --> Allow Tax Cash Basis`.
+You will be asked to define the Tax Cash Basis Journal.
+
+.. image:: media/cash_basis_taxes01.png
+    :width: 5.04688in
+    :height: 0.79688in
+    :align: center
+
+Once this is done, you can configure your taxes in
+:menuselection:`Accounting --> Configuration --> Taxes`.
+You can open a tax and in the *Advanced Options*
+tab you will see the checkbox *Use Cash Basis*. You will then have to
+define the *Tax Received Account*.
+
+.. image:: media/cash_basis_taxes02.png
+    :width: 6.50000in
+    :height: 1.81944in
+    :align: center
+
+What is the impact of cash basis taxes in my accounting ? 
+----------------------------------------------------------
+
+Let’s take an example. You make a sale of $100 with a 15% cash basis
+tax. When you validate the customer invoice, the following entry is
+created in your accounting:
+
++-----------------------------+-----------------------+
+| Customer Invoices Journal   |                       |
++=============================+=======================+
+| **Debit**                   | **Credit**            |
++-----------------------------+-----------------------+
+| Receivables $115            |                       |
++-----------------------------+-----------------------+
+|                             | Tax Account $15       |
++-----------------------------+-----------------------+
+|                             | Income Account $100   |
++-----------------------------+-----------------------+
+
+A few days later, you receive the payment:
+
++----------------+--------------------+
+| Bank Journal   |                    |
++================+====================+
+| **Debit**      | **Credit**         |
++----------------+--------------------+
+| Bank $115      |                    |
++----------------+--------------------+
+|                | Receivables $115   |
++----------------+--------------------+
+
+When you reconcile the invoice and the payment, this entry is generated:
+
++--------------------------+----------------------------+
+| Tax Cash Basis Journal                                |
++==========================+============================+
+| **Debit**                | **Credit**                 |
++--------------------------+----------------------------+
+| Tax Account $15          |                            |
++--------------------------+----------------------------+
+|                          | Tax Received Account $15   |
++--------------------------+----------------------------+
+| Income Account $100      |                            |
++--------------------------+----------------------------+
+|                          | Income Account $100        |
++--------------------------+----------------------------+
+
+.. tip::
+    The two journal items created in the Income Account are neutral but
+    they are needed to insure correct tax reports in Odoo.

accounting/receivables/customer_payments/credit_cards.rst

@@ -47,7 +47,7 @@ Create a Journal called 'Credit card payments' with the following data:
 -  **Default debit account**: Credit cards
 -  **Default credit account**: Credit cards
 
-Once it's done, don't forget to set the "Credit cards" account as "Allow
+The account type should be "Credit Card". Once it's done, don't forget to set the "Credit cards" account as "Allow
 Reconciliation".
 
 .. image:: ./media/credit01.png
@@ -164,6 +164,6 @@ account).
 .. seealso::
    
    * :doc:`recording`
-   * :doc:`paypal`
+   * :doc:`../../bank/feeds/paypal`
    * :doc:`check`
    * :doc:`followup`

accounting/receivables/customer_payments/recording.rst

@@ -125,6 +125,6 @@ payments.
 .. seealso::
 
 	* :doc:`credit_cards`
-	* :doc:`paypal`
+	* :doc:`../../bank/feeds/paypal`
 	* :doc:`check`
 	* :doc:`followup`

crm/calendar/google_calendar_credentials.rst

@@ -1,51 +1,84 @@
-=====================================================
-How to synchronize your calendar with Google Calendar
-=====================================================
+==========================================================
+How to synchronize your Odoo Calendar with Google Calendar
+==========================================================
 
-- Connect on your google account and go to `https://console.developers.google.com/ <https://console.developers.google.com/>`_.
+Odoo is perfectly integrated with Google Calendar so that you 
+can see & manage your meetings from both platforms 
+(updates go through both directions).
 
-- Click on **Create a project...** and enter a project name and change your id if you want.
-  Don't forget to accept the Terms of Services 
+Setup in Google
+===============
+- Go to `Google APIs platform <https://console.developers.google.com>`__ 
+  to generate Google Calendar API credentials. Log in with your Google account. 
+
+- Choose *Calendar API*.
 
 .. image:: media/google_calendar_credentials01.png
     :align: center
 
-- In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on 'Calendar API'. 
-  Activate the Calendar API by clicking on the blue button 'Enable API'. 
-  When it's done, the Calendar API overview will be available 
+- Create a new project and give it a name (e.g. Odoo). This project is needed
+  to store your API credentials.
 
 .. image:: media/google_calendar_credentials02.png
     :align: center
 
+- Enable the API.
+
 .. image:: media/google_calendar_credentials03.png
     :align: center
 
+- Create credentials to use in Odoo.
+
 .. image:: media/google_calendar_credentials04.png
     :align: center
 
-- In the menu on left side, select the sub menu 'Credentials' (from menu APIs and auth) and click on
-  button 'Create new Client ID'
+- Select *Web browser (Javascript)* 
+  as calling source and *User data* as kind of data.
 
 .. image:: media/google_calendar_credentials05.png
     :align: center
 
-- Check that the Application type is set on 'Web Application', then click on 'Configure consent screen'. 
-  Specify an email address and a product name, then save. 
+- Then you can create a Client ID.
+  Enter the name of the application (e.g. Odoo) and the allowed pages on 
+  which you will be redirected. The *Authorized JavaScript origin* is your 
+  Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance 
+  URL followed by '/google_account/authentication'.
 
 .. image:: media/google_calendar_credentials06.png
     :align: center
 
+- Go through the Consent Screen step by entering a product name 
+  (e.g. Odoo). Feel free to check the customizations options 
+  but this is not mandatory. The Consent Screen will only show up when you 
+  enter the Client ID in Odoo for the first time.
+
+- Finally you are provided with your **Client ID**. Go to *Credentials* to 
+  get the **Client secret** as well. You will need both of them in Odoo.
+
 .. image:: media/google_calendar_credentials07.png
     :align: center
 
-You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field "Authorized redirect URI" and set as value (your own domain followed by '/google_account/authentication'): 
-==> http://mydomain.odoo.com/google_account/authentication
-You can now click on 'Create Client ID'
+Setup in Odoo
+=============
+
+- Install **Google Calendar** app.
 
 .. image:: media/google_calendar_credentials08.png
     :align: center
 
-- Once done, you will have the both informations (Client ID and Client Secret) that you need to insert in the 2 fields below! 
+- Go to :menuselection:`Settings --> General Settings` and enter your 
+  credentials in Google Calendar option.
 
 .. image:: media/google_calendar_credentials09.png
     :align: center
+
+- The setup is now ready. Open your Odoo Calendar and sync with Google.
+  The first time you do it you are redirected to Google to authorize
+  the connection. Once back in Odoo, click the sync button again.
+  You can click it whenever you want to synchronize your calendar.
+
+.. image:: media/google_calendar_credentials10.png
+    :align: center
+
+As of now you no longer have excuses to miss a meeting!
+

crm/leads/generate/manual.rst

@@ -32,9 +32,7 @@ Go to :menuselection:`Sales --> Leads` and click the **Create** button.
 
 From the contact form, provide all the details in your possession
 (contact name, email, phone, address, etc.) as well as some additional
-information in the **Internal notes** field. You can also link the
-lead to an existing company by editing the**Customer** field. Click
-on save and the contact will be visible as a lead in your pipeline .
+information in the **Internal notes** field.
 
 .. note::
 

db_management/documentation.rst

@@ -71,7 +71,7 @@ Uninstalling Apps
 =================
 
 .. warning:: Make sure you first test what you are about to do on a 
-    :ref:`duplicate <duplicate>` of your database before making any
+    :ref:`duplicate <duplicate_online>` of your database before making any
     changes (*especially* installing/uninstalling apps).
 
 In your Odoo instance click on **Settings**; in this app, you will be

discuss/email_servers.rst

@@ -18,9 +18,9 @@ and check *External Email Servers*
 Then, go through the following steps.
 
 .. note::
-    Office 365 doesn't allow external hosts like Odoo. 
-    Consequently you can't use Office 365 email servers to send
-    or receive messages in Odoo.
+    Office 365 email servers don't allow to send external emails 
+    from hosts like Odoo. 
+    Consequently you can only use such email servers for incoming messages.
 
 Set an outgoing email server for outbound messages
 --------------------------------------------------
@@ -81,31 +81,28 @@ If you want to use another alias, you have extra steps in Odoo:
 How to use my own email servers with Odoo Online
 ================================================
 Odoo Online comes up with an embedded and ready-to-use email 
-server (*@yourcompany.odoo.com*).
-We recommend to keep this default setting as it is really convenient. 
-Indeed, while it is Odoo-labelled, the visible source of any message
-sent from Odoo will be your personal email address (your Odoo login). 
-Your contacts will therefore trust your messages. 
+solution with *@yourcompany.odoo.com* as domain.
+We recommend to keep this default setup as it is really convenient. 
 
-You can still use your own email servers if you want your contacts to see
-your historic email address when they reply to your messages or if you want 
-to manage the reputation of your email servers yourself.
+Nevertheless you can still use your own email servers if you want
+to manage your email server's reputation (blacklisting, etc).
+The configuration for both incoming and outgoing mail servers is
+given here above.
 
-There are 2 methods:
+However when it comes to incoming messages, we don't recommend
+to exclusively use your own email server. Indeed, Odoo Online is fetching
+incoming messages from the email server once every hour only. 
+To receive emails in real time, you should rather use
+a **catchall redirection** (your server -> Odoo server). To do so:
 
-* [Recommended] **Use a catchall redirection** (your server -> Odoo server) 
-  to receive emails in Odoo in real time thanks to the Odoo email server.
-  Create a catchall address in your email server settings.
-  Then apply following redirection:
+* Create a catchall address in your email server settings (e.g. catchall).
+* Still from such settings, set a redirection
+  from this catchall address to Odoo's one:
   catchall@yourdomain.ext -> catchall@yourcompany.odoo.com.
-  That's it you're ready to go!
-* **Use a catchall mailbox** to exclusively use your own email server.
-  That way you can also manage your email server reputation (blacklisting, etc).
-  However, incoming messages are fetched from the email server
-  thanks to a cron running every hour. This is the shortest time lap
-  for crons in Online instances.
-  If you opt for this solution, simply follow the procedure
-  of above section.
+* In Odoo check *External Email Servers* in :menuselection:`Settings --> General Settings`
+  and enter your email domain name (i.e. yourdomain.ext).
+* No need to set up an incoming email server in such a case.
+  
 
 How to be SPF-compliant when using external email servers in Odoo
 =================================================================

ecommerce/managing_products/variants.rst

@@ -4,7 +4,9 @@ How to manage product variants
 
 Product variants are used to offer variations of the same product to your
 customers on the products page. For example, the customer chooses a T-shirt
-and then selects its size and color.
+and then selects its size and color.  In the example below, the customer
+chooses a phone, and then selects the memory; color and Wi-Fi band from the
+available options.
 
 .. image:: ./media/variants.png
    :align: center

ecommerce/shopper_experience.rst

@@ -7,6 +7,7 @@ Get paid
 
    shopper_experience/payment
    shopper_experience/paypal
+   shopper_experience/authorize
    shopper_experience/wire_transfer
    shopper_experience/payment_acquirer
    shopper_experience/portal

ecommerce/shopper_experience/authorize.rst

@@ -0,0 +1,77 @@
+==================================
+How to get paid with Authorize.Net
+==================================
+
+Authorize.Net is one of the most popular eCommerce payment platforms in North America.
+Unlike most of the other payment acquirers compatible with Odoo, 
+Authorize.Net can be used as `payment gateway <https://www.authorize.net/solutions/merchantsolutions/pricing/?p=gwo>`__ only.
+That way you can use the `payment processor or merchant <https://www.authorize.net/partners/resellerprogram/processorlist/>`__ that you like.
+
+
+Create an Authorize.Net account
+===============================
+
+* Create an `Authorize.Net account <https://www.authorize.net>`__ 
+  by clicking 'Get Started'.
+* In the pricing page, press *Sign up now* if you want to use Authorize.net as
+  both payment gateway and merchant. If you want to use your own merchant, press
+  the related option.
+
+  .. image:: media/authorize01.png
+    :align: center
+
+* Go through the registration steps. 
+* The account is set as a test account by default. You can use this test
+  account to process a test transaction from Odoo.
+* Once ready, switch to **Production** mode. 
+
+
+Set up Odoo
+===========
+* Activate Authorize.Net in Odoo from :menuselection:`Website or Sales or Accounting 
+  --> Settings --> Payment Acquirers`.
+* Enter both your **Login ID** 
+  and your **API Transaction Key**. 
+
+  .. image:: media/authorize02.png
+    :align: center
+
+  To get those credentials in Authorize.Net, you can rely on
+  *API Login ID and Transaction Key* video of 
+  `Authorize.Net Video Tutorials <https://www.authorize.net/videos/>`__.
+  Such videos give meaningful insights about how to set up your
+  Authorize.Net account according to your needs.
+
+
+Go live
+=======
+Your configuration is now ready! 
+You can make Authorize.Net visible on your merchant interface
+and activate the **Production** mode.
+
+.. image:: media/paypal_live.png
+    :align: center
+
+.. note:: Credentials provided by Authorize.net are different for both
+   test and production mode. Don't forget to update them in Odoo when you
+   turn on the production mode.
+
+
+Assess Authorize.Net as payment solution
+========================================
+You can test and assess Authorize.Net for free by creating a `developer account <https://developer.authorize.net>`__.
+
+Once the account created you receive sandbox credentials.
+Enter them in Odoo as explained here above and make sure 
+you are still in *Test* mode.
+
+You can also log in to `Authorize.Net sandbox platform <https://sandbox.authorize.net/>`__
+to configure your sandbox account.
+
+To perform ficticious transactions you can use fake card numbers
+provided in the `Authorize.Net Testing Guide <https://developer.authorize.net/hello_world/testing_guide/>`__. 
+
+.. seealso::
+
+  * :doc:`payment`
+  * :doc:`payment_acquirer`

ecommerce/shopper_experience/paypal.rst

@@ -2,8 +2,8 @@
 How to get paid with Paypal
 ===========================
 
-Paypal is the easiest online payment method to configure. 
-It is also the only one without any subscription free.
+Paypal is the easiest online payment acquirer to configure. 
+It is also the only one without any subscription fee.
 We definitely advise it to any starter.
 
 
@@ -70,8 +70,8 @@ Set up your Paypal account
      :align: center
 
 
-Set up Paypal's payment method in Odoo
-======================================
+Set up Odoo
+===========
 * Open Paypal setup form in :menuselection:`Website or Sales or Accounting 
   --> Settings --> Payment Acquirers+`. Enter both your **Email ID** 
   and your **Merchant ID** and check **Use IPN**.
@@ -152,4 +152,4 @@ You can test the entire payment flow thanks to Paypal Sandbox accounts.
 .. seealso::
 
   * :doc:`payment`
-  * :doc:`payment_acquirer`
+  * :doc:`payment_acquirer`

general/base_import/import_faq.rst

@@ -10,7 +10,7 @@ contacts, products, bank statements, journal entries and even orders!
 
 Open the view of the object you want to populate and click *Import*.
 
-.. image:: media/import_button.gif
+.. image:: media/import_button.png
     :align: center
 
 There you are provided with templates you can easily populate

inventory/management/delivery/scheduled_dates.rst

@@ -12,7 +12,7 @@ are dependent on the different leads times configured in Odoo.
 Configuring lead times
 ======================
 
-Configuring **lead times** is a first essentiel move in order to compute
+Configuring **lead times** is a first essential move in order to compute
 scheduled dates. Lead times are the delays (in term of delivery,
 manufacturing, ...) promised to your different partners and/or clients.
 

legal/terms/i18n/enterprise_fr.rst

@@ -161,7 +161,7 @@ Ce service est fourni par le biais d'une plateforme automatisée, afin de permet
 d'effectuer des migration sans intervention humain, dès lors qu’une version précédente de la
 base de données du Client a été migrée avec succès pour une Version Couverte donnée.
 Le client peut soumettre des demandes de migration successives pour une base de données,
-et accepte de soumettre au moins 1 demande de mifration de test avant de soumettre la demande de
+et accepte de soumettre au moins 1 demande de migration de test avant de soumettre la demande de
 migration finale.
 
 Le service de migration est limité à la conversion et à l'adaptation techniques de la base
@@ -527,4 +527,4 @@ DU LOGICIEL, OU A TOUTE AUTRE MANIPULATION RELATIVE AU LOGICIEL.
 
 .. raw:: html
 
-    </tt>
+    </tt>

legal/terms/partnership.rst

@@ -214,7 +214,7 @@ For _____________,
 
 
 
-.. _appendix_a:
+.. _appendix_p_a:
 
 10 Appendix A: Odoo Enterprise Edition License
 ==============================================

locale/es/LC_MESSAGES/accounting.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: Cristóbal Martí Oliver <info@moblesmarti.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,7 +99,6 @@ msgstr ""
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:23
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31
 msgid "Configuration"
 msgstr "Configuración"
@@ -1032,7 +1031,6 @@ msgstr ""
 
 #: ../../accounting/bank/misc/batch.rst:124
 #: ../../accounting/payables/pay/sepa.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:134
 msgid "Troubleshooting"
 msgstr "Solución de problemas"
 
@@ -1977,6 +1975,11 @@ msgstr ""
 "En la pestaña Asientos de Diarios, la cuenta Débito y Crédito preestablecida"
 " puede ser configurada también como la moneda del diario"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "Tipo"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr ""
@@ -1995,14 +1998,26 @@ msgstr ""
 msgid "Select 'General' for miscellaneous operations journals."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Company"
+msgstr "Compañía"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
 msgstr "Compañía relacionada con este diario"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Short Code"
+msgstr "Código corto"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
 msgstr "Los asientos de este diario será nombrados usando este prefijo."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Dedicated Refund Sequence"
+msgstr "Secuencia de factura rectificativa dedicada"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
@@ -2011,6 +2026,10 @@ msgstr ""
 "Marque esta casilla si no quiere compartir la misma secuencia para facturas "
 "y facturas rectificativas hechas desde este diario"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Entry Sequence"
+msgstr "Secuencia del asiento"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the journal "
@@ -2019,6 +2038,10 @@ msgstr ""
 "Este campo contiene información relacionada con la numeración de los "
 "asientos de este diario."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Refund Entry Sequence"
+msgstr "Secuencia de asiento rectificativo"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the refund "
@@ -2027,18 +2050,34 @@ msgstr ""
 "Este campo contiene la información relativa a la numeración de los asientos "
 "rectificativos de este diario."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Debit Account"
+msgstr "Cuenta deudora por defecto"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for debit amount"
 msgstr "Actúa como una cuenta por defecto para importes en el debe."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Credit Account"
+msgstr "Cuenta acreedora por defecto"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for credit amount"
 msgstr "Actúa como una cuenta por defecto para los importes en el haber."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Currency"
+msgstr "Moneda"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
 msgstr "La divisa utilizada para introducir asientos."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Debit Methods"
+msgstr "Métodos de débito"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for collecting money. Odoo modules offer various payments "
@@ -2049,6 +2088,10 @@ msgstr ""
 "facilidades de pago, pero usted siempre puede usar el método de pago "
 "'Manual' para gestionar pagos por fuera del software."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Payment Methods"
+msgstr "Métodos de pago"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for sending money. Odoo modules offer various payments "
@@ -2059,6 +2102,10 @@ msgstr ""
 "facilidades de pago, pero usted siempre puede usar el método de pago "
 "'Manual' para gestionar pagos por fuera del software."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Group Invoice Lines"
+msgstr "Agrupar líneas de factura"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
@@ -2067,6 +2114,10 @@ msgstr ""
 "Si esta opción está marcada, el sistema tratará de agrupar las líneas del "
 "asiento cuando se generen desde facturas."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Profit Account"
+msgstr "Cuenta de beneficios"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a profit when the ending balance of a cash register differs"
@@ -2075,6 +2126,10 @@ msgstr ""
 "Usado para registrar una ganancia cuando el saldo final de un registro de "
 "caja difiere de lo que el sistema calcula"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Loss Account"
+msgstr "Cuenta de pérdidas"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a loss when the ending balance of a cash register differs "
@@ -2083,10 +2138,18 @@ msgstr ""
 "Usado para registrar una pérdida cuando el saldo final de un registro de "
 "caja difiere de lo que el sistema calcula"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Show journal on dashboard"
+msgstr "Mostrar diario en el tablero"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
 msgstr "Si este diario debe mostrarse en el tablero o no"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Printing Payment Method Selected"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Technical feature used to know whether check printing was enabled as payment"
@@ -2095,19 +2158,36 @@ msgstr ""
 "Campo técnico usado para saber si la impresión de cheques se habilitó como "
 "método de pago."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Sequence"
+msgstr "Secuencia de los cheques"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Checks numbering sequence."
 msgstr "Secuencia de numeración de los cheques."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Manual Numbering"
+msgstr "Numeración manual"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check this option if your pre-printed checks are not numbered."
 msgstr "Marque esta opción si sus cheques pre-impresos no están numerados."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Next Check Number"
+msgstr "Nº del próximo cheque"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Sequence number of the next printed check."
 msgstr "Número de secuencia del próximo cheque impreso."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Active in Point of Sale"
+msgstr "Activo en Punto de Venta"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if this journal define a payment method that can be used in a"
@@ -2116,6 +2196,10 @@ msgstr ""
 "Marca esta casilla de selección si este diario define un método de pago que "
 "puede ser utilizado en el punto de venta."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Amount Authorized Difference"
+msgstr "Importe de la diferencia permitida"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field depicts the maximum difference allowed between the ending balance"
@@ -2367,6 +2451,10 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Explicación de los campos:"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Status"
+msgstr "Estado"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "When an asset is created, the status is 'Draft'."
 msgstr "Cuando un activo es creado, el estado es 'Borrador'."
@@ -2388,22 +2476,42 @@ msgstr ""
 "última línea de depreciación es publicada, el activo automáticamente va a "
 "ese estado."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Category"
+msgstr "Categoría"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Category of asset"
 msgstr "Categoría del activo"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Date"
+msgstr "Fecha"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Date of asset"
 msgstr "Fecha del activo"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Gross Value"
+msgstr "Valor bruto"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Gross value of asset"
 msgstr "Valor bruto del activo"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Salvage Value"
+msgstr "Valor de rescate"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Es el importe que prevee tener que no puede depreciar"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Computation Method"
+msgstr "Método de cálculo"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Choose the method to use to compute the amount of depreciation lines."
 msgstr ""
@@ -2420,6 +2528,10 @@ msgid ""
 msgstr ""
 "Decreciente: Calculado en base de: Valor Residual * Factor Decreciente"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Time Method Based On"
+msgstr "Método de tiempo basado en"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Choose the method to use to compute the dates and number of depreciation "
@@ -2444,6 +2556,10 @@ msgstr ""
 "Fecha de Cierre: Elija el tiempo entre 2 depreciaciones y la fecha en que "
 "las depreciaciones no irán por encima de."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Prorata Temporis"
+msgstr "Tiempo prorrateado"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
@@ -2453,10 +2569,18 @@ msgstr ""
 "Indica que el primer asiento de amortización tiene que ser realizado desde "
 "la compra en vez desde el 1 de Enero / Empieza en la fecha del año fiscal."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Depreciations"
+msgstr "Número de depreciaciones"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The number of depreciations needed to depreciate your asset"
 msgstr "El número de amortizaciones para amortizar el activo"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Months in a Period"
+msgstr "Número de meses en un periodo"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The amount of time between two depreciations, in months"
 msgstr "La cantidad de tiempo entre dos amortizaciones, en meses"
@@ -4374,15 +4498,27 @@ msgstr ""
 "legales específicos de cada país, y establecer las reglas para cerrar un "
 "ejercicio fiscal y generar los apuntes de apertura."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Tags"
+msgstr "Etiquetas"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
 msgstr "Etiquetas opcionales a asignar en informes de ventas"
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Account Currency"
+msgstr "Cuenta de la moneda"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
 msgstr ""
 "Fuerza a todos los movimientos de esta cuenta a tener la moneda de la misma."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Internal Type"
+msgstr "Tipo interno"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "The 'Internal Type' is used for features available on different types of "
@@ -4393,6 +4529,10 @@ msgstr ""
 "tipos de cuentas: el tipo liquidez es para efectivo o cuentas bancarias, "
 "pagable/pendiente de pago es para cuentas de proveedores/clientes."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Allow Reconciliation"
+msgstr "Permitir conciliación"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "Check this box if this account allows invoices & payments matching of "
@@ -9418,10 +9558,18 @@ msgstr ""
 msgid "Explanation of the fields of the payment screen:"
 msgstr "Explicación de los campos en la pantalla de pago: "
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Has Invoices"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used for usability purposes"
 msgstr "Campo técnico utilizado por usabilidad"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Hide Payment Method"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to hide the payment method if the selected journal has "
@@ -9430,6 +9578,10 @@ msgstr ""
 "Campo técnico utilizado para ocultar el método de pago si el diario "
 "seleccionado tiene únicamente como disponible el 'manual'"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Code"
+msgstr "Código"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to adapt the interface to the payment type selected."
@@ -9437,6 +9589,10 @@ msgstr ""
 "Campo técnico utilizado para adaptar la interfaz al tipo de pago "
 "seleccionado."
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Check Number"
+msgstr "Número de cheque"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "The selected journal is configured to print check numbers. If your pre-"
@@ -12343,8 +12499,8 @@ msgstr ":doc:`recording`"
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:167
 #: ../../accounting/receivables/customer_payments/recording.rst:128
-msgid ":doc:`paypal`"
-msgstr ":doc:`paypal`"
+msgid ":doc:`../../bank/feeds/paypal`"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:169
 #: ../../accounting/receivables/customer_payments/recording.rst:130
@@ -12653,260 +12809,6 @@ msgstr ""
 "Puede obtener el DDV de su compañía desde el reporte Resumen Ejecutivo bajo "
 "Reportes (revisar el KPI días promedio de deudores)."
 
-#: ../../accounting/receivables/customer_payments/paypal.rst:3
-msgid "How to accept paypal payments on invoices?"
-msgstr "¿Cómo aceptar pagos paypal en facturas?"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:5
-msgid ""
-"The \"Paypal Payment Acquirer\" module allows you to accept payments via "
-"paypal, for your sales orders, invoices, or online orders. As paypal accepts"
-" payments through credit cards (VISA, Mastercard, …), you will be able to "
-"process most payment methods."
-msgstr ""
-"El módulo \"Comprador de Pagos Paypal\" le permite aceptar pagos vía paypal,"
-" para sus órdenes de venta, facturas, u órdenes en línea. Como paypal acepta"
-" pagos a través de tarjetas de crédito (VISA, Mastercard, ...), Ud. podrá "
-"procesar la mayoría de métodos de pago."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:10
-msgid "Paypal support two modes:"
-msgstr "Paypal soporta dos modos:"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:12
-msgid ""
-"Paypal Merchant Account: the user is redirected to paypal to do the payment "
-"(either with a credit card or a paypal account)"
-msgstr ""
-"Cuenta Comerciante Paypal: el usuario es redirigido a paypal para hacer el "
-"pago (ya sea con una tarjeta de crédito o una cuenta paypal)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:15
-msgid ""
-"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to "
-"paypal and the payment can be done in the background. This method is mostly "
-"used for subscription businesses where you need to charge your customers "
-"periodically."
-msgstr ""
-"PayPal PayFlow Pro (S2S, Server 2 Server): el usuario no es redirigido a "
-"paypal y el pago puede ser hecho en segundo plano. Este método es usado más "
-"que todo para suscripciones de negocio donde necesita cargar a sus clientes "
-"periódicamente."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:20
-msgid "As of today, Odoo only support the normal Paypal Merchant Account."
-msgstr "Hasta hoy, Odoo solo soporta la Cuenta Comerciante Paypal normal."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:26
-msgid "Install the \"PayPal Payment Acquirer\" module"
-msgstr "Instalar el módulo \"Comprador de Pagos Paypal\""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:28
-msgid "Start by installing the **PayPal Payment Acquirer** module."
-msgstr "Empezar instalando el módulo **Comprador de Pagos Paypal**."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:30
-msgid ""
-"Once the module is installed, you should see a new payment acquirer in the "
-"Setting application, menu \"Payment Acquirers\"."
-msgstr ""
-"Una vez el módulo esta instalado, deberá ver un nuevo comprador de pago en "
-"la aplicación Ajustes, menú \"Comprador de Pagos\"."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:36
-msgid ""
-"By default, Paypal is configured to work in a test environment, out-of-the-"
-"box. It means you can already test the full order to payment flow with the "
-"paypal sandbox, without having to configure the next steps."
-msgstr ""
-"Por defecto, Paypal es configurado para trabajar en un ambiente de prueba, "
-"fuera de la caja. Lo que significa que ya puede probar la órden completa "
-"para el flujo de pago con la caja de arena de paypal, sin tener que "
-"configuar los siguientes pasos."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:42
-msgid "Creating and configuring a PayPal merchant account"
-msgstr "Crear y configurar una cuenta de comerciante Paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:45
-msgid "Create a basic Paypal account"
-msgstr "Crear una cuenta Paypal básica"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:47
-msgid "Existing or newly created Personal Paypal account can be used."
-msgstr ""
-"Las cuentas Paypal Personales existentes o recientemente creadas pueden ser "
-"usadas."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:49
-msgid "Or upgrade your account to Business account (merchant) if needed"
-msgstr ""
-"O actualice su cuenta a cuenta de Negocios (Comerciante) si es necesario"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:55
-msgid "Paypal Account Summary page"
-msgstr "Página de resumen de la Cuenta Paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:58
-msgid "Paypal Configuration"
-msgstr "Configuración Paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:60
-msgid ""
-"Access \"Seller preferences\" menu from `PayPal website "
-"<https://www.paypal.com/myaccount/home>`__"
-msgstr ""
-"Acceso al menú \"Preferencias del vendedor\" desde `sitio web PayPal "
-"<https://www.paypal.com/myaccount/home>`__"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:66
-msgid ""
-"Access \"Website preferences\" and configure Auto Return (Payment Data "
-"Transfer must be left to Off)"
-msgstr ""
-"Ingrese a las \"Preferencias del sitio Web\" y configure Auto Devolución (la"
-" Transferencia de Datos de Pagos debe ser dejada en Apagado)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:69
-msgid "**Database name**: yourcompany"
-msgstr "**Nombre base de datos**: sucompañía"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:70
-#: ../../accounting/receivables/customer_payments/paypal.rst:88
-msgid "**Website URL**: https://yourcompany.odoo.com/"
-msgstr "**Website URL**: https://yourcompany.odoo.com/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:71
-msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation"
-msgstr "**Devolución URL**: https://yourcompany.odoo.com/shop/confirmation"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:76
-msgid "These settings will redirect your buyer to your web confirmation page."
-msgstr ""
-"Estos ajustes redirigirán a su comprador a su página web de confirmación."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:80
-msgid "Access and edit Instant payment notifications settings - IPN"
-msgstr ""
-"Ingresar y editar los ajustes para Notificaciones de Pago Instantáneas - IPN"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:85
-msgid "Example"
-msgstr "Ejemplo"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:87
-msgid "**Database name**: \"yourcompany\""
-msgstr "**Nombre base de datos**: \"sucompañía\""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:89
-msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-msgstr ""
-"**Notificación URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:91
-msgid ""
-"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you"
-" use the odoo.com domain, we advise you to use HTTPS."
-msgstr ""
-"Verifique que su URL de Notificación use el protocolo correcto (HTTP / "
-"HTTPS). Si usa el dominio odoo.com, le recomendamos usar HTTPS."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:94
-msgid ""
-"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> "
-"Language Encoding --> More Options --> More selling tools`"
-msgstr ""
-"Configurar la codificación a UTF-8 desde el menú :menuselection:`Ajustes -->"
-" Lenguaje de Codificación --> Más Opciones --> Más herramientas de ventas`"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:103
-msgid ""
-"Record your Merchant Paypal ID (personal or business account both will have "
-"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> "
-"Account Options`."
-msgstr ""
-"Registrar su ID de Comerciante Paypal (cuenta personal o de negocios ambas "
-"lo tienen) será ingresado en el backend de Odoo :menuselection:`Paypal "
-"Ajustes --> Opciones de Cuenta`."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:111
-msgid ""
-"If you want your customers to be able to pay through Paypal while not having"
-" a Paypal account- following setting \"Paypal Account Optional\" needs to be"
-" set to **ON**. All users will be able to choose Credit/debit card payment "
-"option - Paypal account not required."
-msgstr ""
-"Si quiere que sus clientes puedan pagar a través de Paypal mientras no tiene"
-" una cuenta Paypal- los siguientes ajustes \"Cuenta Paypal Opcional\" "
-"necesita ser configurada a **Encendido**. Todos los usuarios podrán elegir "
-"la opción de pago con tarjeta Crédito/débito - Cuenta Paypal no es "
-"requerido."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:120
-msgid "Setup your Paypal Payment Acquirer account credentials in Odoo"
-msgstr "Instalar sus credenciales de cuenta Comprador de Pagos Paypal en Odoo"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:122
-msgid ""
-":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`"
-msgstr ""
-":menuselection:`Ajustes --> Pagos --> Compradores de Pagos --> Paypal`"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:124
-msgid "**Paypal Email ID**: your paypal account email address"
-msgstr "**Paypal Email ID**: su dirección de email en su cuenta paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:126
-msgid "**Paypal Merchant ID**: ID retrieved at previous step"
-msgstr "**Paypal Comerciante ID**: ID traído del paso anterior"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:136
-msgid ""
-"If your eCommerce customer gets this Error Message after completing Paypal "
-"payment instead of being redirected to your database:"
-msgstr ""
-"Si su cliente de comercio electrónico obtiene este Mensaje de Error después "
-"de haber completado el pago Paypal en lugar de ser redireccionado a su base "
-"de datos:"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:142
-msgid ""
-"Verify the settings you have `configured in Paypal <WebsitePreferences_>`_:"
-msgstr ""
-"Verifique los ajustes que ha `configurado en Paypal <WebsitePreferences_>`_:"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:144
-msgid ""
-"Auto Return should be on (the value can be quite generic, like "
-"<odoo_instance>/shop/confirmation; the correct URL will be set for each "
-"transaction)"
-msgstr ""
-"La Auto Devolución debe estar encendida (el valor puede ser algo genérico, "
-"como <odoo_instance>/shop/confirmation; la URL correcta debe ser configurada"
-" para cada transacción)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:148
-msgid "Payment Data Transfer should be off"
-msgstr "La Transferencia de Datos de Pago debe estar apagada"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:150
-msgid ""
-"On-premise databases must be accessible through classic HTTP/HTTPS ports "
-"(80/443) for Paypal to work correctly, usually through a reverse proxy. "
-"Contact your integrating partner if you are unsure this is the case. "
-"Databases hosted on odoo.com are already configured correctly."
-msgstr ""
-"Las bases de datos En-sitio debe ser accesibles a través de los clásicos "
-"puertos HTTP/HTTPS (80/443) para que Paypal funcione correctamente, "
-"usualmente a través de un proxy inverso. Contacte a su asociado integrador "
-"si esta poco seguro de que este sea el caso. Las bases de datos alojadas en "
-"odoo.com ya estan configuradas correctamente."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:157
-#: ../../accounting/receivables/customer_payments/recording.rst:127
-msgid ":doc:`credit_cards`"
-msgstr ":doc:`credit_cards`"
-
 #: ../../accounting/receivables/customer_payments/recording.rst:3
 msgid "What are the different ways to record a payment?"
 msgstr "¿Cuáles son las diferentes formas de registrar un pago?"
@@ -13120,6 +13022,10 @@ msgstr ""
 "a cuenta. No haga este proceso de nuevo en la otra cuenta bancaria o "
 "terminará con dos entradas de diario para la misma transacción."
 
+#: ../../accounting/receivables/customer_payments/recording.rst:127
+msgid ":doc:`credit_cards`"
+msgstr ":doc:`credit_cards`"
+
 #: ../../accounting/receivables/getting_paid.rst:3
 msgid "How to get paid?"
 msgstr "¿Cómo obtener pagos?"

locale/es/LC_MESSAGES/discuss.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Antonio Trueba <atgayol@gmail.com>, 2017\n"
+"Last-Translator: Ruben Dario Machado <ruben@vauxoo.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,146 +23,238 @@ msgid "Discuss"
 msgstr "Debates"
 
 #: ../../discuss/email_servers.rst:3
-msgid "How to use my own email servers to send and receive messages in Odoo"
+msgid "How to use my own email servers to send and receive email in Odoo"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:6
 msgid "When is it needed"
-msgstr ""
+msgstr "Cuando sea necesario"
 
 #: ../../discuss/email_servers.rst:7
-msgid "You need it if you use Odoo Community or Enterprise."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:10
-msgid "What if I use Odoo Online"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:11
 msgid ""
-"You are done! Odoo Online comes up with an embedded and ready-to-use email "
-"server (*@yourcompany.odoo.com*). We recommend to keep this default setting "
-"as is as it is really convenient."
+"Using your own email servers is required to send and receive messages in "
+"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email "
+"solution that works straight away. However you can still use your own email "
+"servers with the online edition. Some insights are provided here below."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:14
+msgid "How to set it up"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"Indeed, while it is branded by Odoo, the visible source of any message sent "
-"from Odoo will be your personal email address (your Odoo login). Your "
-"contacts will therefore trust your messages."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:20
-msgid "How does it work when a contact replies to an email sent from Odoo"
+"As a system admin, go to :menuselection:`Settings --> General Settings` and "
+"check *External Email Servers* (watch out: this checkbox only shows up after"
+" Odoo 10). Then, go through the following steps."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:21
 msgid ""
-"Default reply-to is a generic address used to automatically route any "
-"incoming email to the discussion thread of the origin business object "
-"(opportunity, order, task, etc.) and to the inbox of all its followers. By "
-"default this address is \"catchall@\" but it can be changed. Thanks to it, "
-"you get a perfect message thread in Odoo and you don't pollute your external"
-" email box with Odoo-related topics."
+"Office 365 doesn't allow external hosts like Odoo. Consequently you can't "
+"use Office 365 email servers to send or receive messages in Odoo."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:29
-msgid "How to use my own email servers"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:30
-msgid ""
-"You need to be a system admin to set this up. Go to :menuselection:`Settings"
-" --> General Settings` and check *External Email Servers* (watch out: this "
-"checkbox only shows up after Odoo 10). Then, go through the following steps."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:36
+#: ../../discuss/email_servers.rst:26
 msgid "Set an outgoing email server for outbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:37
+#: ../../discuss/email_servers.rst:27
 msgid ""
 "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, "
 "etc.) as well as your admin credentials. Once all the information has been "
 "filled out, click on *Test Connection*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:45
+#: ../../discuss/email_servers.rst:35
 msgid "Set an incoming email server for inbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:46
+#: ../../discuss/email_servers.rst:36
 msgid ""
 "Fill out the form according to your email provider’s settings. Leave the "
 "*Actions to Perform on Incoming Mails* blank. Once all the information has "
 "been filled out, click on *TEST & CONFIRM*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:53
+#: ../../discuss/email_servers.rst:43
 msgid ""
 "By default inbound messages are fetched every 5 minutes. You can change this"
 " value in developer mode. Go to :menuselection:`Settings --> Technical --> "
 "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:59
+#: ../../discuss/email_servers.rst:49
 msgid "Set the domain name"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:60
+#: ../../discuss/email_servers.rst:50
 msgid ""
 "Enter the domain name of your email servers (e.g. mycompany.com) in General "
 "Settings."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:67
+#: ../../discuss/email_servers.rst:57
 msgid "Create a catchall address"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:68
+#: ../../discuss/email_servers.rst:58
+msgid ""
+"When a contact replies to an email sent from Odoo, the *reply-to* address is"
+" a generic address used to route the reply to the right discussion thread in"
+" Odoo (opportunity, order, task, etc.) and to the inbox of all its "
+"followers. By default this address is \"catchall@\" but it can be changed."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:63
 msgid ""
 "Create a catchall address in your email server settings. We advise you to "
 "use \"catchall@\" so that everything works out straight away. If you want to"
 " use another alias, you have extra steps in Odoo:"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:72
+#: ../../discuss/email_servers.rst:67
 msgid "Activate the developer mode from your Settings Dashboard."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:77
+#: ../../discuss/email_servers.rst:72
 msgid ""
 "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> "
 "Parameters --> System Parameters` and enter your custom catchall alias in "
 "*mail.catchall.alias*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:84
+#: ../../discuss/email_servers.rst:79
 msgid "You can edit the email alias used for bounced messages the same way."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:87
-msgid "How to perfectly combine Odoo Discuss and my traditional email tool"
+#: ../../discuss/email_servers.rst:82
+msgid "How to use my own email servers with Odoo Online"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:88
+#: ../../discuss/email_servers.rst:83
+msgid ""
+"Odoo Online comes up with an embedded and ready-to-use email server "
+"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it "
+"is really convenient. Indeed, while it is Odoo-labelled, the visible source "
+"of any message sent from Odoo will be your personal email address (your Odoo"
+" login). Your contacts will therefore trust your messages."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:90
+msgid ""
+"You can still use your own email servers if you want your contacts to see "
+"your historic email address when they reply to your messages or if you want "
+"to manage the reputation of your email servers yourself."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:94
+msgid "There are 2 methods:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:96
+msgid ""
+"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to"
+" receive emails in Odoo in real time thanks to the Odoo email server. Create"
+" a catchall address in your email server settings. Then apply following "
+"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. "
+"That's it you're ready to go!"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:102
+msgid ""
+"**Use a catchall mailbox** to exclusively use your own email server. That "
+"way you can also manage your email server reputation (blacklisting, etc). "
+"However, incoming messages are fetched from the email server thanks to a "
+"cron running every hour. This is the shortest time lap for crons in Online "
+"instances. If you opt for this solution, simply follow the procedure of "
+"above section."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:111
+msgid "How to be SPF-compliant when using external email servers in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:112
+msgid ""
+"Sender Policy Framework (SPF) is an email-validation system that checks that"
+" incoming mail from a domain comes from a host authorized by that domain's "
+"administrator. Such a security system is used in most email servers. If you "
+"don't comply with it, your emails sent from Odoo will be likely flagged as "
+"spam."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:118
+msgid ""
+"To be SPF-compliant, you need to authorize Odoo as a sending host in your "
+"domain name settings:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:121
+msgid "Sign in to your domain’s account at your domain host."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:122
+msgid "Locate the page for updating your domain’s DNS records."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:123
+msgid ""
+"If no TXT record is set, create one with following definition: v=spf1 "
+"include:_spf.odoo.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:125
+msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:127
+msgid "e.g. for a Gmail server it should be:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:129
+msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:131
+msgid ""
+"Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to "
+"create or modify TXT records in your own domain registrar."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:134
+msgid ""
+"Your new SPF record can take up to 48 hours to go into effect, but this "
+"usually happens more quickly."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:137
+msgid ""
+"Adding more than one SPF record for a domain can cause problems with mail "
+"delivery and spam classification. Instead, we recommend using only one SPF "
+"record by modifying it to authorize Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:142
+msgid "How to choose between Odoo and my traditional email box"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:143
 msgid ""
 "Odoo Discuss is a perfect tool to send and read messages related to business"
-" objects. But it doesn't aim to replace a full-featured email software "
-"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
+" documents. However it doesn't aim to replace a full-featured email solution"
+" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
 "both systems without mingling them: What is related to Odoo business objects"
-" or applications goes into Odoo; What is not stays into your external email "
-"boxes."
+" or applications goes into Odoo; What is not can be managed into your "
+"external email box."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:95
+#: ../../discuss/email_servers.rst:150
 msgid ""
 "To do so, create specific email aliases to use in Odoo (to generate leads or"
 " opportunities, helpdesk tickets, etc.). If you take an email alias already "
 "used for messaging outside of Odoo, incoming messages will land into both "
-"systems. This will negatively impact your productivity when it comes to "
-"process them."
+"systems. This will negatively impact your productivity."
 msgstr ""
 
 #: ../../discuss/mail_twitter.rst:3

locale/es/LC_MESSAGES/ecommerce.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2017\n"
+"Last-Translator: Antonio Trueba <atgayol@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -655,23 +655,21 @@ msgid "Launch my website"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience.rst:3
-msgid "Improve shopper experience"
+msgid "Get paid"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:3
-msgid "How to set up payment methods"
+msgid "How to get paid with payment acquirers"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:5
 msgid ""
-"To collect payments, you can either request your customers to process it "
-"manually (e.g. wire transfer) or redirect them to payment acquirers. The "
-"payment process described hereunder is common to both eCommerce and online "
-"quotations."
+"Odoo embeds several payment methods to get paid on eCommerce, Sales and "
+"Invoicing apps."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:10
-msgid "Payment methods"
+msgid "What are the payment methods available"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:13
@@ -681,451 +679,561 @@ msgstr ""
 #: ../../ecommerce/shopper_experience/payment.rst:15
 msgid ""
 "Wire Transfer is the default payment method available. The aim is providing "
-"your customers with your bank details so that they can pay via their bank. "
-"This is very easy to start with but slow and inefficient process-wise. Opt "
-"for online acquirers as soon as you can!"
+"your customers with your bank details so they can pay on their own via their"
+" bank. This is very easy to start with but slow and inefficient process-"
+"wise. Opt for online acquirers as soon as you can!"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:21
-msgid ""
-"For B2B users: you can create new manually-processed payment methods (check,"
-" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it."
+msgid "Payment acquirers"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:25
-msgid "Online payment acquirers"
+#: ../../ecommerce/shopper_experience/payment.rst:23
+msgid ""
+"Redirect your customers to payment platforms to collect money effortless and"
+" track the payment status (call-back). Odoo supports more and more platforms"
+" over time:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:27
-msgid ""
-"Redirect your customers to payment acquirer platforms to collect money "
-"effortless. Odoo supports more and more platforms over time: Paypal, "
-"Ingenico, Authorize.net, etc. Once the payment accepted, orders are "
-"confirmed in Odoo so that the delivery & invoicing processes are triggered "
-"automatically."
+msgid "`Paypal <paypal.html>`__"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:28
+msgid "Ingenico"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:29
+msgid "Authorize.net"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:30
+msgid "Adyen"
+msgstr "Adyen"
+
+#: ../../ecommerce/shopper_experience/payment.rst:31
+msgid "Buckaroo"
+msgstr "Buckaroo"
+
+#: ../../ecommerce/shopper_experience/payment.rst:32
+msgid "PayUmoney"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:33
-msgid "Custom (advanced)"
-msgstr ""
+msgid "Sips"
+msgstr "Sips"
 
-#: ../../ecommerce/shopper_experience/payment.rst:35
-msgid ""
-"Can be used to request payments to any payment acquirer not listed in Odoo."
+#: ../../ecommerce/shopper_experience/payment.rst:34
+msgid "Stripe"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:38
-msgid "Edit a payment method"
+msgid "How to go live"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:40
 msgid ""
-"To make payment methods intuitive for your customers feel free to customize "
-"them by editing:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:42
-msgid "the name,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:44
-msgid "the picture,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:46
-msgid ""
-"the notification messages (thank you & next step, error, cancellation)."
+"Once the payment method ready, make it visible in the payment interface and "
+"activate the **Production** mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:48
+msgid "How to let customers save and reuse credit cards"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:49
 msgid ""
-"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`"
-" to do so."
+"To ease the payment of returning customers, you can let them save and reuse "
+"a credit card if they want to. If so, a payment token will be saved in Odoo."
+" This option is available with Ingenico and Authorize.net."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:51
-msgid "Generic setup"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:53
-msgid "Review the elements here above."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:55
-msgid "Enter your credentials (online acquirers only)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:57
-msgid "Choose your order confirmation preference (see below)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:59
-msgid "Publish the payment method."
+#: ../../ecommerce/shopper_experience/payment.rst:54
+#: ../../ecommerce/shopper_experience/payment.rst:68
+msgid "You can turn this on from the acquirer configuration form."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:61
-msgid "Test the payment flow in *Test* mode (default mode)."
+msgid "How to debit credit cards to pay subscriptions"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:63
-msgid "Switch to *Production* mode."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:65
+#: ../../ecommerce/shopper_experience/payment.rst:62
 msgid ""
-"Se your default payment acquirer in :menuselection:`Accounting --> "
-"Configuration --> Settings`. It will be auto-selected for your customers "
-"when they enter the payment screen."
+"`Odoo Subscription <https://www.odoo.com/page/subscriptions>`__ allows to "
+"bill services automatically on a recurring basis. Along with it, you can "
+"have an automatic debit of the customer's credit card."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:69
+#: ../../ecommerce/shopper_experience/payment.rst:66
+msgid "This option is available with Ingenico and Authorize.net."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:73
 msgid ""
-"Rely on the documentation related to your payment acquirer to go through "
-"step 2, 5 and 6. Some acquirers provides you with specific credentials for "
-"test and production modes (Paypal). Others let you switch mode in their "
-"setup interface (Authorize.net)."
+"That way a payment token will be recorded when the customer goes for the "
+"subscription and an automatic debit will occur whenever an invoice is issued"
+" from the subscription."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:74
+#: ../../ecommerce/shopper_experience/payment.rst:79
+msgid "How to use other acquirers (advanced)"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:81
 msgid ""
-"With Ingenico and Authorize.net, you can let your customers save and reuse a"
-" payment card to accelerate the process on next checkouts. See *Store Card "
-"Data* in Configuration tab."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:78
-msgid "Payment flow"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:80
-msgid ""
-"When choosing the payment method, the customer is taken to the payment "
-"acquirer interface to process the payment."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:83
-msgid ""
-"Once done he is taken back to Odoo's confirmation page. The transaction "
-"status shows up:"
+"Odoo can submit single payment requests and redirect to any payment "
+"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction"
+" status. So you will confirm orders manually once you get paid."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:85
-msgid ""
-"*Pending*: the order will be confirmed as soon as you authorize the "
-"transaction in the acquirer interface."
+msgid "How to:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:87
-msgid "*Confirmed*: the payment has been authorized automatically."
+msgid "Switch to developer mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:89
-msgid ""
-"A confirmation email is sent to the customer with a copy of the order in "
-"pdf. It shows the payment status."
+msgid "Take the **Custom** payment method."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:91
-msgid "Launch the delivery and invoicing from:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:93
 msgid ""
-"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:95
-msgid ""
-"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales "
-"Orders`."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:97
-msgid ""
-"For internal tracking purposes, a link to the transaction status is provided"
-" in the sales order."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:100
-msgid ""
-"If the customer cancels the payment while on the payment acquirer form, it "
-"is taken back to the store page (or online quotation) in order to reprocess "
-"the order. The payment is marked as *Cancelled* in Odoo."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:105
-msgid ""
-"You can edit the confirmation email template from :menuselection:`Website "
-"Admin --> Configuration --> Settings`."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:109
-msgid "Order confirmation preferences"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:111
-msgid "There are 4 different behaviors available for any payment acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:114
-msgid "No automatic confirmation"
-msgstr "Sin confirmación automática"
-
-#: ../../ecommerce/shopper_experience/payment.rst:116
-msgid ""
-"This is the default mode for *Wire Transfer*. It means Odoo does not confirm"
-" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid "
-"Order*). Once you get the payment, you are expected to confirm the order "
-"manually to pursue the process (delivery, invoicing)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:121
-msgid ""
-"Authorize the amount and confirm the SO on acquirer confirmation (capture "
-"manually)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:123
-msgid ""
-"Odoo confirms the order as soon as the payment success notification comes "
-"in. To get the money however, you need to capture it from your payment "
-"transaction. In lots of countries you are indeed requested to deliver your "
-"goods before capturing the amount."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:128
-msgid ""
-"Authorize & capture the amount and confirm the SO on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:130
-msgid ""
-"This is the default mode for payment acquirers. The amount is captured "
-"automatically."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:133
-msgid ""
-"For B2B: if you use a manual payment method like *Wire Transfer* and don't "
-"expect any upfront payment to launch the delivery, switch to this mode as "
-"well."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:137
-msgid ""
-"Authorize & capture the amount, confirm the SO and auto-validate the invoice"
-" on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:139
-msgid ""
-"If you invoice upfront and not at the delivery, switch to this last mode to "
-"automate everything. You are requested to select a Payment Journal to record"
-" such payments (see "
-":doc:`../../accounting/receivables/customer_payments/credit_cards`)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:144
-msgid "Custom payment acquirers (advanced)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:146
-msgid ""
-"Odoo can submit payment requests and redirect to any payment acquirer. In "
-"such a case, you need to confirm the sale manually in Odoo once you get paid"
-" because Odoo cannot read any payment status sent by the acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:150
-msgid "To configure this:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:152
-msgid "switch to developer mode,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:154
-msgid "edit the *Custom* payment method,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:156
-msgid ""
-"set up the payment form (S2S Form Template) as instructed by your payment "
+"Set up the payment form (S2S Form Template) as instructed by your payment "
 "acquirer. You can start from *default_acquirer_button* that you can "
 "duplicate."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:160
-msgid "Recurring payments & Installment plans"
+#: ../../ecommerce/shopper_experience/payment.rst:96
+msgid "Other configurations"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:162
+#: ../../ecommerce/shopper_experience/payment.rst:98
 msgid ""
-"The Ingenico integration allows you to process and manage recurring payments"
-" from Odoo Subscriptions app out-of-the-box (more information coming soon)."
+"Odoo can also be used for more advanced payment processes like installment "
+"plans (e.g. `Paypal Installment Plans "
+"<https://developer.paypal.com/docs/classic/paypal-payments-standard"
+"/integration-guide/installment_buttons>`__)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:165
+#: ../../ecommerce/shopper_experience/payment.rst:102
 msgid ""
-"With some customization, Odoo can also trigger installment plans if this is "
-"permitted by your payment acquirer’s API:"
+"Such a customization service is made on-demand by our technical experts "
+"based on your own requirements. A business advisor can reach you out for "
+"such matter. `Contact us. <https://www.odoo.com/page/contactus>`__"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:168
-msgid ""
-"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic"
-"/paypal-payments-standard/integration-guide/installment_buttons)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:170
-msgid ""
-"Such a service is made on-demand by our technical experts based on your own "
-"requirements. Ask our business advisors at info@odoo.com."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:175
+#: ../../ecommerce/shopper_experience/payment.rst:109
 msgid ":doc:`paypal`"
 msgstr ":doc:`paypal`"
 
+#: ../../ecommerce/shopper_experience/payment.rst:110
+msgid ":doc:`wire_transfer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:111
+#: ../../ecommerce/shopper_experience/paypal.rst:155
+msgid ":doc:`payment_acquirer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3
+msgid "How to manage orders paid with payment acquirers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5
+msgid ""
+"Odoo confirms orders automatically as soon as the payment is authorized by a"
+" payment acquirer. This triggers the delivery. If you invoice based on "
+"ordered quantities, you are also requested to invoice the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12
+msgid "What are the payment status"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13
+msgid ""
+"At anytime, the salesman can check the transaction status from the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18
+msgid "*Draft*: transaction under processing."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20
+msgid ""
+"*Pending*: the payment acquirer keeps the transaction on hold and you need "
+"to authorize it from the acquirer interface."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23
+msgid ""
+"*Authorized*: the payment has been authorized but not yet captured. In Odoo,"
+" the order is already confirmed. Once the delivery done, you can capture the"
+" amount from the acquirer interface (or from Odoo if you use Authorize.net)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28
+msgid ""
+"*Done*: the payment is authorized and captured. The order has been "
+"confirmed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30
+msgid ""
+"*Error*: an error has occured during the transaction. The customer needs to "
+"retry the payment. The order is still in draft."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34
+msgid ""
+"*Cancelled*: when the customer cancels the payment in the payment acquirer "
+"form. They are taken back to Odoo in order to modify the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37
+msgid ""
+"Specific messages are provided to your customers for every payment status, "
+"when they are redirected to Odoo after the transaction. To edit such "
+"messages, go to the *Messages* tab of the payment method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44
+msgid "Auto-validate invoices at order"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46
+msgid ""
+"When the order is confirmed you can also have an invoice automatically "
+"issued and paid. This fully-automated made for businesses that invoice "
+"orders straight on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53
+msgid ""
+"If you choose this mode you are requested to select a payment journal in "
+"order to record payments in your books. This payment is automatically "
+"reconcilied with the invoice, marking it as paid. Select your **bank "
+"account** if you get paid immediately on your bank account. If you don't you"
+" can create a specific journal for the payment acquirer (type = Bank). That "
+"way, you can track online payments in an intermediary account of your books "
+"until you get paid into your bank account (see `How to register credit card "
+"payments "
+"<../../accounting/receivables/customer_payments/credit_cards.html>`__)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64
+msgid "Capture the payment after the delivery"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65
+msgid ""
+"With this mode, the order is confirmed but the amount is kept on hold. Once "
+"the delivery processed, you can capture the payment from Odoo. This mode is "
+"only available with Authorize.net."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72
+msgid ""
+"To capture the payment, open the transaction from the order. Then click "
+"*Capture Transaction*."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78
+msgid ""
+"With other payment acquirers, you can manage the capture in their own "
+"interfaces, not from Odoo."
+msgstr ""
+
 #: ../../ecommerce/shopper_experience/paypal.rst:3
-msgid "How to collect payments with Paypal"
+msgid "How to get paid with Paypal"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:5
 msgid ""
-"Paypal is the easiest payment method to configure. It is also the only one "
-"without any subscription free."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/paypal.rst:9
-msgid "Setup your Paypal account"
+"Paypal is the easiest online payment method to configure. It is also the "
+"only one without any subscription free. We definitely advise it to any "
+"starter."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:11
-msgid ""
-"1. Create a business account at Paypal.com (see: https://www.paypal.com/in"
-"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-"
-"outside) or upgrade your account to Business account (merchant) if you have "
-"a basic account."
+msgid "Set up your Paypal account"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:15
+#: ../../ecommerce/shopper_experience/paypal.rst:13
 msgid ""
-"2. Log in to your account at Paypal.com and go to :menuselection:`My Account"
-" --> Profile --> My Selling Tools`. There click *PayPal button language "
-"encoding* under *More Selling Tools* section. Then, click *More Options* and"
-" replace the two default encoding formats by *UTF-8*."
+"Create a `Paypal Business Account <https://www.paypal.com>`__ or upgrade "
+"your account to *Business account* if you have a basic account."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:20
-msgid "Open Paypal setup form in Odoo and enter your *Email ID*."
+#: ../../ecommerce/shopper_experience/paypal.rst:16
+msgid ""
+"Log in to `Paypal <https://www.paypal.com>`__ and open the settings of your "
+"**Profile**."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:22
-msgid ""
-"4. The Paypal Merchant ID is not mandatory (extra verification level). It is"
-" provided in Paypal under :menuselection:`My Account --> Overview`."
+msgid "Now enter the menu **My selling tools**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:25
-msgid ""
-"5. Configure the IPN feedback (Paypal contacting your Odoo instance without "
-"needing the redirection). The setting can be found in "
-":menuselection:`Profile --> My Selling Tools --> Instant payment "
-"notification`. Activate it and set it to "
-"<odoo_instance_url>/payment/paypal/ipn."
+#: ../../ecommerce/shopper_experience/paypal.rst:27
+msgid "Let's start with the **Website Preferences**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:30
+#: ../../ecommerce/shopper_experience/paypal.rst:29
 msgid ""
-"6. To test the workflow, you can create sandbox accounts by logging in at "
-"https://developer.paypal.com/webapps/developer/applications/myapps with the "
-"same Paypal credentials. Two default sandbox accounts are automatically "
-"generated when you register to Paypal: one is a buyer, the  other is a "
-"shopper."
+"Turn on **Auto Return** and enter the **Return URL**: "
+"<odoo_instance_url>/shop/confirmation. Verify that this address uses the "
+"correct protocol (HTTP/HTTPS)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:35
+#: ../../ecommerce/shopper_experience/paypal.rst:36
 msgid ""
-"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com "
-"(same password than real account) and apply the same format change."
+"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is "
+"generated. You will be later requested to enter it in Odoo."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:39
+#: ../../ecommerce/shopper_experience/paypal.rst:43
 msgid ""
-"To automatically redirect your customers when the payment is completed, go "
-"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to "
-"<odoo_instance_url>/shop/confirmation. Verify that your *Notify URL* uses "
-"the correct protocol (HTTP/HTTPS)."
+"Then, get back to your profile to activate the **Instant Payment "
+"Notification (IPN)** in *My selling tools*."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:44
-msgid ""
-"If you want your customers to pay without creating a Paypal account, *Paypal"
-" Account Optional* needs to be turned on."
+#: ../../ecommerce/shopper_experience/paypal.rst:46
+msgid "Enter the **Notification URL**: <odoo_instance_url>/payment/paypal/ipn"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:48
+#: ../../ecommerce/shopper_experience/paypal.rst:51
+msgid ""
+"Now you must change the encoding format of the payment request sent by Odoo "
+"to Paypal. To do so, get back to *My selling tools* and click **PayPal "
+"button language encoding** in *More Selling Tools* section."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:58
+msgid ""
+"Then, click *More Options* and set the two default encoding formats as "
+"**UTF-8**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:66
+msgid ""
+"If you want your customers to pay without creating a Paypal account, "
+"**Paypal Account Optional** needs to be turned on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:74
+msgid "Set up Paypal's payment method in Odoo"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:75
+msgid ""
+"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->"
+" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your "
+"**Merchant ID** and check **Use IPN**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:82
+msgid ""
+"They are both provided in your Paypal profile, under :menuselection:`My "
+"business info`."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:85
+msgid ""
+"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so,"
+" open the *Settings* and activate the **Developer Mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:91
+msgid ""
+"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System"
+" Parameters` and create a parameter with following values:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:94
+msgid "Key: payment_paypal.pdt_token"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:95
+msgid "Value: your Paypal *Identity Token*"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:102
+msgid "Go live"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:103
+msgid ""
+"Your configuration is now ready! You can make Paypal visible on your "
+"merchant interface and activate the **Production mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:112
 msgid "Transaction fees"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:50
+#: ../../ecommerce/shopper_experience/paypal.rst:114
 msgid ""
 "You can charge an extra to the customer to cover the transaction fees Paypal"
 " charges you. Once redirected to Paypal, your customer sees an extra applied"
 " to the order amount."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:53
+#: ../../ecommerce/shopper_experience/paypal.rst:117
 msgid ""
-"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. "
-"Default fees are the ones charged by Paypal."
+"To activate this, go to the *Configuration* tab of Paypal config form in "
+"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:123
+msgid ""
+"To apply the right fees for your country, please refer to `Paypal Fees "
+"<https://www.paypal.com/webapps/mpp/paypal-fees>`__."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:128
+msgid "Test the payment flow"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:130
+msgid ""
+"You can test the entire payment flow thanks to Paypal Sandbox accounts."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:132
+msgid ""
+"Log in to `Paypal Developer Site <https://developer.paypal.com>`__ with your"
+" Paypal credentials. This will create two sandbox accounts:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:136
+msgid ""
+"A business account (to use as merchant, e.g. "
+"pp.merch01-facilitator@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:137
+msgid ""
+"A default personal account (to use as shopper, e.g. "
+"pp.merch01-buyer@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:139
+msgid ""
+"Log in to `Paypal Sandbox <https://www.sandbox.paypal.com>`__ with the "
+"merchant account and follow the same configuration instructions."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:142
+msgid ""
+"Enter your sandbox credentials in Odoo and make sure Paypal is still set on "
+"*Test* mode. Also, make sure the confirmation mode of Paypal is not "
+"*Authorize & capture the amount, confirm the SO and auto-validate the "
+"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be "
+"automatically generated when the transaction is completed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:150
+msgid "Run a test transaction from Odoo using the sandbox personal account."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:154
+msgid ":doc:`payment`"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:3
-msgid "How customers can access their portal"
+msgid "How customers can access their customer account"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:5
 msgid ""
-"It has never been so easy for your customers to access their documents "
-"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC."
-" With eCommerce and Online Quotation apps, your customers are requested to "
-"create a portal account (name, email, password only) from the very first "
-"order confirmation or online quotation email they get from you."
+"It has never been so easy for your customers to access their customer "
+"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are"
+" suggested to sign up (name, email, password) when the order is placed, and "
+"not before. Indeed, nothing is more annoying than going through a signup "
+"process before buying something."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:12
+#: ../../ecommerce/shopper_experience/portal.rst:14
 msgid "Sign up"
 msgstr "Registrarse"
 
-#: ../../ecommerce/shopper_experience/portal.rst:14
+#: ../../ecommerce/shopper_experience/portal.rst:16
 msgid ""
-"When clicking the link in the email or when clicking *Sign up* in the "
-"checkout process, your customer is directed to the *Sign up* page."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/portal.rst:21
-msgid "Customer account"
+"The invitation to sign up shows up when the customer wants to visualize the "
+"order from order confirmation email."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:23
+msgid "Customer account"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/portal.rst:25
 msgid ""
-"Once logged in the customer will access his account by clicking *My Account*"
+"Once logged in the customer will access the account by clicking *My Account*"
 " in the login dropdown menu."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:29
+#: ../../ecommerce/shopper_experience/portal.rst:31
 msgid ""
-"From the portal menu all the customer history can be reviewed. The main "
-"address (billing) can also be modified."
+"THere they find all their history. The main address (billing) can also be "
+"modified."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:36
+#: ../../ecommerce/shopper_experience/portal.rst:37
 msgid ""
-"If a portal user is a contact of a company (*Company* field set in customer "
-"detail form), this last will see all the documents of the company and all "
-"its other contacts through the portal."
+"If the customer is set as a contact of a company in your address book, they "
+"will see all the documents whose the customer belongs to this company."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:3
+msgid "How to get paid with wire transfers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:5
+msgid ""
+"**Wire Transfer** is the default payment method available. The aim is "
+"providing your customers with your bank details so they can pay on their "
+"own. This is very easy to start with but slow and inefficient process-wise. "
+"Opt for payment acquirers as soon as you can!"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:13
+msgid "How to provide customers with payment instructions"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:14
+msgid ""
+"Put your payment instructions in the **Thanks Message** of your payment "
+"method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:19
+msgid "They will appear to the customers when they place an order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:26
+msgid "How to manage an order once you get paid"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:28
+msgid ""
+"Whenever a customer pays by wire transfer, the order stays in an "
+"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get "
+"paid, you confirm the order manually to launch the delivery."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:35
+msgid "How to create other manual payment methods"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:37
+msgid ""
+"If you manage a B2B business, you can create other manually-processed "
+"payment methods like paying by check. To do so, just rename *Wire Transfer* "
+"or duplicate it."
 msgstr ""
 
 #: ../../ecommerce/taxes.rst:3

locale/es/LC_MESSAGES/general.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sergio Flores <vitavitae1@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
@@ -23,8 +23,8 @@ msgid "General"
 msgstr "General"
 
 #: ../../general/auth.rst:3
-msgid "Authentification"
-msgstr ""
+msgid "Authentication"
+msgstr "Autentificación"
 
 #: ../../general/auth/google.rst:3
 msgid "How to allow users to sign in with their Google account"
@@ -84,64 +84,196 @@ msgid ""
 msgstr ""
 
 #: ../../general/base_import.rst:3
-msgid "BASE IMPORT"
+msgid "Data Import"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:3
+msgid "How to adapt an import template"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:5
+msgid ""
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:11
+msgid "How to customize the file"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:13
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:15
+#: ../../general/base_import/import_faq.rst:26
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:20
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field of the system. If so, find the "
+"corresponding field using the search."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:27
+msgid ""
+"Then, use the label you found in your import template in order to make it "
+"work straight away the very next time you try to import."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:31
+msgid "Why an “ID” column"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:33
+msgid ""
+"The **ID** (External ID) is an unique identifier for the line item. Feel "
+"free to use the one of your previous software to ease the transition to "
+"Odoo."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:36
+msgid ""
+"Setting an ID is not mandatory when importing but it helps in many cases:"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:38
+msgid ""
+"Update imports: you can import the same file several times without creating "
+"duplicates;"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:39
+msgid "Import relation fields (see here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:42
+msgid "How to import relation fields"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:44
+msgid ""
+"An Odoo object is always related to many other objects (e.g. a product is "
+"linked to product categories, attributes, vendors, etc.). To import those "
+"relations you need to import the records of the related object first from "
+"their own list menu."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:48
+msgid ""
+"You can do it using either the name of the related record or its ID. The ID "
+"is expected when two records have the same name. In such a case add \" / "
+"ID\" at the end of the column title (e.g. for product attributes: Product "
+"Attributes / Attribute / ID)."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:3
-msgid "Import CSV file to Odoo"
+msgid "How to import data into Odoo"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:8
-msgid "Frequently Asked Questions"
-msgstr "Preguntas más frecuentes"
+#: ../../general/base_import/import_faq.rst:6
+msgid "How to start"
+msgstr ""
 
-#: ../../general/base_import/import_faq.rst:12
-msgid "Need to import data from an other application?"
-msgstr "¿Se necesita importar datos desde otra aplicación?"
-
-#: ../../general/base_import/import_faq.rst:14
+#: ../../general/base_import/import_faq.rst:7
 msgid ""
-"In order to re-create relationships between different records, you should "
-"use the unique identifier from the original application and map it to the "
-"**ID** (External ID) column in Odoo. When you import an other record that "
-"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
-"unique identifier."
+"You can import data on any Odoo's business object using either Excel (.xlsx)"
+" or CSV (.csv) formats: contacts, products, bank statements, journal entries"
+" and even orders!"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:11
+msgid "Open the view of the object you want to populate and click *Import*."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:16
 msgid ""
-"The **ID** (External ID) will also be used to update the original import if "
-"you need to re-import modified data later, it's thus good practice to "
-"specify it whenever possible."
+"There you are provided with templates you can easily populate with your own "
+"data. Such templates can be imported in one click; The data mapping is "
+"already done."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:21
-msgid "I cannot find the field I want to map my column to?"
+#: ../../general/base_import/import_faq.rst:22
+msgid "How to adapt the template"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:23
-msgid ""
-"Odoo try to find with some heuristic, based on the first ten lines of the "
-"files, the type of field for each columns inside your file. For example if "
-"you have a column only containing numbers, only the fields that are of type "
-"integer will be displayed for you to choose from. While this behaviour might"
-" be good and easy for most cases scenarios, it is also possible that it goes"
-" wrong sometimes or that you want to map your column to a field that is not "
-"proposed by default."
+#: ../../general/base_import/import_faq.rst:24
+msgid "Add, remove and sort columns to fit at best your data structure."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:25
-msgid ""
-"If that happens, you just have to check the **Show all fields for completion"
-" (advanced)** option, you will then be able to choose from the complete list"
-" of fields for each columns."
+msgid "We advise to not remove the **ID** one (see why in the next section)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:30
+#: ../../general/base_import/import_faq.rst:31
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field in Odoo. Don't worry! You can map new "
+"columns manually when you test the import. Search the list for the "
+"corresponding field."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:39
+msgid ""
+"Then, use this field's label in your file in order to make it work straight "
+"on the very next time."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:44
+msgid "How to import from another application"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:46
+msgid ""
+"In order to re-create relationships between different records, you should "
+"use the unique identifier from the original application and map it to the "
+"**ID** (External ID) column in Odoo. When you import another record that "
+"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
+"unique identifier. You can also find this record using its name but you will"
+" be stuck if at least 2 records have the same name."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:54
+msgid ""
+"The **ID** will also be used to update the original import if you need to "
+"re-import modified data later, it's thus good practice to specify it "
+"whenever possible."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:60
+msgid "I cannot find the field I want to map my column to"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:62
+msgid ""
+"Odoo tries to find with some heuristic, based on the first ten lines of the "
+"files, the type of field for each column inside your file. For example if "
+"you have a column only containing numbers, only the fields that are of type "
+"*Integer* will be displayed for you to choose from. While this behavior "
+"might be good and easy for most cases, it is also possible that it goes "
+"wrong or that you want to map your column to a field that is not proposed by"
+" default."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:71
+msgid ""
+"If that happens, you just have to check the ** Show fields of relation "
+"fields (advanced)** option, you will then be able to choose from the "
+"complete list of fields for each column."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:79
 msgid "Where can I change the date import format?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:32
+#: ../../general/base_import/import_faq.rst:81
 msgid ""
 "Odoo can automatically detect if a column is a date and it will try to guess"
 " the date format from a set of most used date format. While this process can"
@@ -151,7 +283,7 @@ msgid ""
 " day and which one is the month in a date like '01-03-2016'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:34
+#: ../../general/base_import/import_faq.rst:83
 msgid ""
 "To view which date format Odoo has found from your file you can check the "
 "**Date Format** that is shown when clicking on **Options** under the file "
@@ -159,7 +291,7 @@ msgid ""
 " the *ISO 8601* to define the format."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:37
+#: ../../general/base_import/import_faq.rst:86
 msgid ""
 "If you are importing an excel (.xls, .xlsx) file, you can use date cells to "
 "store dates as the display of dates in excel is different from the way it is"
@@ -167,11 +299,11 @@ msgid ""
 "whatever your locale date format is."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:42
+#: ../../general/base_import/import_faq.rst:91
 msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:44
+#: ../../general/base_import/import_faq.rst:93
 msgid ""
 "Yes, we fully support numbers with parenthesis to represent negative sign as"
 " well as numbers with currency sign attached to them. Odoo also "
@@ -181,56 +313,56 @@ msgid ""
 "crash."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:46
+#: ../../general/base_import/import_faq.rst:95
 msgid ""
 "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:48
+#: ../../general/base_import/import_faq.rst:97
 msgid "32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:49
+#: ../../general/base_import/import_faq.rst:98
 msgid "32000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:50
+#: ../../general/base_import/import_faq.rst:99
 msgid "32,000.00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:51
+#: ../../general/base_import/import_faq.rst:100
 msgid "-32000.00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:52
+#: ../../general/base_import/import_faq.rst:101
 msgid "(32000.00)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:53
+#: ../../general/base_import/import_faq.rst:102
 msgid "$ 32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:54
+#: ../../general/base_import/import_faq.rst:103
 msgid "(32000.00 €)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:56
+#: ../../general/base_import/import_faq.rst:105
 msgid "Example that will not work:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:58
+#: ../../general/base_import/import_faq.rst:107
 msgid "ABC 32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:59
+#: ../../general/base_import/import_faq.rst:108
 msgid "$ (32.000,00)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:64
+#: ../../general/base_import/import_faq.rst:113
 msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:66
+#: ../../general/base_import/import_faq.rst:115
 msgid ""
 "By default the Import preview is set on commas as field separators and "
 "quotation marks as text delimiters. If your csv file does not have these "
@@ -238,20 +370,20 @@ msgid ""
 " CSV file bar after you select your file)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:68
+#: ../../general/base_import/import_faq.rst:117
 msgid ""
 "Note that if your CSV file has a tabulation as separator, Odoo will not "
 "detect the separations. You will need to change the file format options in "
 "your spreadsheet application. See the following question."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:73
+#: ../../general/base_import/import_faq.rst:122
 msgid ""
 "How can I change the CSV file format options when saving in my spreadsheet "
 "application?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:75
+#: ../../general/base_import/import_faq.rst:124
 msgid ""
 "If you edit and save CSV files in speadsheet applications, your computer's "
 "regional settings will be applied for the separator and delimiter. We "
@@ -260,17 +392,17 @@ msgid ""
 "filter settings' > Save)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:77
+#: ../../general/base_import/import_faq.rst:126
 msgid ""
 "Microsoft Excel will allow you to modify only the encoding when saving (in "
 "'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:82
+#: ../../general/base_import/import_faq.rst:131
 msgid "What's the difference between Database ID and External ID?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:84
+#: ../../general/base_import/import_faq.rst:133
 msgid ""
 "Some fields define a relationship with another object. For example, the "
 "country of a contact is a link to a record of the 'Country' object. When you"
@@ -280,58 +412,58 @@ msgid ""
 "import."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:86
+#: ../../general/base_import/import_faq.rst:135
 msgid ""
 "For example, to reference the country of a contact, Odoo proposes you 3 "
 "different fields to import:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:88
+#: ../../general/base_import/import_faq.rst:137
 msgid "Country: the name or code of the country"
 msgstr "País: el nombre o código del país"
 
-#: ../../general/base_import/import_faq.rst:89
+#: ../../general/base_import/import_faq.rst:138
 msgid ""
 "Country/Database ID: the unique Odoo ID for a record, defined by the ID "
 "postgresql column"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:90
+#: ../../general/base_import/import_faq.rst:139
 msgid ""
 "Country/External ID: the ID of this record referenced in another application"
 " (or the .XML file that imported it)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:92
+#: ../../general/base_import/import_faq.rst:141
 msgid "For the country Belgium, you can use one of these 3 ways to import:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:94
+#: ../../general/base_import/import_faq.rst:143
 msgid "Country: Belgium"
 msgstr "País: Bélgica"
 
-#: ../../general/base_import/import_faq.rst:95
+#: ../../general/base_import/import_faq.rst:144
 msgid "Country/Database ID: 21"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:96
+#: ../../general/base_import/import_faq.rst:145
 msgid "Country/External ID: base.be"
 msgstr "País/Id. externo: base.be"
 
-#: ../../general/base_import/import_faq.rst:98
+#: ../../general/base_import/import_faq.rst:147
 msgid ""
 "According to your need, you should use one of these 3 ways to reference "
 "records in relations. Here is when you should use one or the other, "
 "according to your need:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:100
+#: ../../general/base_import/import_faq.rst:149
 msgid ""
 "Use Country: This is the easiest way when your data come from CSV files that"
 " have been created manually."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:101
+#: ../../general/base_import/import_faq.rst:150
 msgid ""
 "Use Country/Database ID: You should rarely use this notation. It's mostly "
 "used by developers as it's main advantage is to never have conflicts (you "
@@ -339,13 +471,13 @@ msgid ""
 "Database ID)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:102
+#: ../../general/base_import/import_faq.rst:151
 msgid ""
 "Use Country/External ID: Use External ID when you import data from a third "
 "party application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:104
+#: ../../general/base_import/import_faq.rst:153
 msgid ""
 "When you use External IDs, you can import CSV files with the \"External ID\""
 " column to define the External ID of each record you import. Then, you will "
@@ -354,23 +486,23 @@ msgid ""
 "Products and their Categories."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:106
+#: ../../general/base_import/import_faq.rst:155
 msgid ""
 "`CSV file for categories "
 "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:108
+#: ../../general/base_import/import_faq.rst:157
 msgid ""
 "`CSV file for Products "
 "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:112
+#: ../../general/base_import/import_faq.rst:161
 msgid "What can I do if I have multiple matches for a field?"
 msgstr "¿Qué puedo hacer si tengo múltiples coincidencias para un campo?"
 
-#: ../../general/base_import/import_faq.rst:114
+#: ../../general/base_import/import_faq.rst:163
 msgid ""
 "If for example you have two product categories with the child name "
 "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other "
@@ -381,20 +513,20 @@ msgid ""
 "the duplicates' values or your product category hierarchy."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:116
+#: ../../general/base_import/import_faq.rst:165
 msgid ""
 "However if you do not wish to change your configuration of product "
 "categories, we recommend you use make use of the external ID for this field "
 "'Category'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:121
+#: ../../general/base_import/import_faq.rst:170
 msgid ""
 "How can I import a many2many relationship field (e.g. a customer that has "
 "multiple tags)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:123
+#: ../../general/base_import/import_faq.rst:172
 msgid ""
 "The tags should be separated by a comma without any spacing. For example, if"
 " you want your customer to be linked to both tags 'Manufacturer' and "
@@ -402,19 +534,19 @@ msgid ""
 " of your CSV file."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:125
+#: ../../general/base_import/import_faq.rst:174
 msgid ""
 "`CSV file for Manufacturer, Retailer "
 "<../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:130
+#: ../../general/base_import/import_faq.rst:179
 msgid ""
 "How can I import a one2many relationship (e.g. several Order Lines of a "
 "Sales Order)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:132
+#: ../../general/base_import/import_faq.rst:181
 msgid ""
 "If you want to import sales order having several order lines; for each order"
 " line, you need to reserve a specific row in the CSV file. The first order "
@@ -425,41 +557,41 @@ msgid ""
 "you can import, based on demo data."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:135
+#: ../../general/base_import/import_faq.rst:184
 msgid ""
 "`File for some Quotations "
 "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:137
+#: ../../general/base_import/import_faq.rst:186
 msgid ""
 "The following CSV file shows how to import purchase orders with their "
 "respective purchase order lines:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:139
+#: ../../general/base_import/import_faq.rst:188
 msgid ""
 "`Purchase orders with their respective purchase order lines "
 "<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:141
+#: ../../general/base_import/import_faq.rst:190
 msgid ""
 "The following CSV file shows how to import customers and their respective "
 "contacts:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:143
+#: ../../general/base_import/import_faq.rst:192
 msgid ""
 "`Customers and their respective contacts "
 "<../../_static/example_files/o2m_customers_contacts.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:148
+#: ../../general/base_import/import_faq.rst:197
 msgid "Can I import several times the same record?"
 msgstr "¿Se puede importar varias veces el mismo registro?"
 
-#: ../../general/base_import/import_faq.rst:150
+#: ../../general/base_import/import_faq.rst:199
 msgid ""
 "If you import a file that contains one of the column \"External ID\" or "
 "\"Database ID\", records that have already been imported will be modified "
@@ -469,17 +601,17 @@ msgid ""
 "depending if it's new or not."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:152
+#: ../../general/base_import/import_faq.rst:201
 msgid ""
 "This feature allows you to use the Import/Export tool of Odoo to modify a "
 "batch of records in your favorite spreadsheet application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:157
+#: ../../general/base_import/import_faq.rst:206
 msgid "What happens if I do not provide a value for a specific field?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:159
+#: ../../general/base_import/import_faq.rst:208
 msgid ""
 "If you do not set all fields in your CSV file, Odoo will assign the default "
 "value for every non defined fields. But if you set fields with empty values "
@@ -487,11 +619,11 @@ msgid ""
 "assigning the default value."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:164
+#: ../../general/base_import/import_faq.rst:213
 msgid "How to export/import different tables from an SQL application to Odoo?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:166
+#: ../../general/base_import/import_faq.rst:215
 msgid ""
 "If you need to import data from different tables, you will have to recreate "
 "relations between records belonging to different tables. (e.g. if you import"
@@ -499,7 +631,7 @@ msgid ""
 "person and the company they work for)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:168
+#: ../../general/base_import/import_faq.rst:217
 msgid ""
 "To manage relations between tables, you can use the \"External ID\" "
 "facilities of Odoo. The \"External ID\" of a record is the unique identifier"
@@ -509,7 +641,7 @@ msgid ""
 "'company_1', 'person_1' instead of '1')"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:170
+#: ../../general/base_import/import_faq.rst:219
 msgid ""
 "As an example, suppose you have a SQL database with two tables you want to "
 "import: companies and persons. Each person belong to one company, so you "
@@ -519,27 +651,27 @@ msgid ""
 "PostgreSQL database</a>)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:172
+#: ../../general/base_import/import_faq.rst:221
 msgid ""
 "We will first export all companies and their \"External ID\". In PSQL, write"
 " the following command:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:178
+#: ../../general/base_import/import_faq.rst:227
 msgid "This SQL command will create the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:185
+#: ../../general/base_import/import_faq.rst:234
 msgid ""
 "To create the CSV file for persons, linked to companies, we will use the "
 "following SQL command in PSQL:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:191
+#: ../../general/base_import/import_faq.rst:240
 msgid "It will produce the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:199
+#: ../../general/base_import/import_faq.rst:248
 msgid ""
 "As you can see in this file, Fabien and Laurence are working for the Bigees "
 "company (company_1) and Eric is working for the Organi company. The relation"
@@ -549,7 +681,7 @@ msgid ""
 " who shared the same ID 1 in the orignial database)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:201
+#: ../../general/base_import/import_faq.rst:250
 msgid ""
 "The two files produced are ready to be imported in Odoo without any "
 "modifications. After having imported these two CSV files, you will have 4 "

locale/es/LC_MESSAGES/inventory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Julián Andrés Osorio López <mcjulian1107@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
@@ -920,6 +920,10 @@ msgstr ""
 "Crear ** para establecer los valores de las existencias mínimas y máximas "
 "para un producto determinado."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Active"
+msgstr "Activo"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
@@ -928,11 +932,19 @@ msgstr ""
 "Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin"
 " eliminarla."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Product Unit of Measure"
+msgstr "Unidad de medida del producto"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
 "Unidad de medida por defecto utilizada para todas las operaciones de stock."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Procurement Group"
+msgstr "Grupo de abastecimiento"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Moves created through this orderpoint will be put in this procurement group."
@@ -944,6 +956,10 @@ msgstr ""
 "movimientos generados por las reglas de abastecimiento serán agrupados en un"
 " gran albarán."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Minimum Quantity"
+msgstr "Cantidad mínima"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity specified for this field,"
@@ -954,6 +970,10 @@ msgstr ""
 "especificada en este campo, Odoo generará un abastecimiento para llevar la "
 "cantidad prevista a la cantidad máxima."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Maximum Quantity"
+msgstr "Cantidad máxima"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity, Odoo generates a "
@@ -964,6 +984,10 @@ msgstr ""
 "generará un abastecimiento para llevar la cantidad prevista a la cantidad "
 "especificada como aquí como máxima."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Quantity Multiple"
+msgstr "Múltiplo de la cantidad"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "The procurement quantity will be rounded up to this multiple.  If it is 0, "
@@ -972,6 +996,10 @@ msgstr ""
 "La cantidad a abastecer se redondeará a este múltiplo. Si es 0, se utilizará"
 " la cantidad exacta."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Lead Time"
+msgstr "Plazo de entrega"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Number of days after the orderpoint is triggered to receive the products or "

locale/es/LC_MESSAGES/point_of_sale.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2017\n"
+"Last-Translator: Carles Antoli <carlesantoli@hotmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2413,18 +2413,34 @@ msgstr ""
 "Puede configurar cada punto de venta de acuerdo a su sistema operativo, "
 "ubicación,..."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Point of Sale Name"
+msgstr "Nombre del TPV"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "An internal identification of the point of sale"
 msgstr "Identificación interna del TPV"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Journal"
+msgstr "Diario de ventas"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to post sales entries."
 msgstr "Diario contable usado para contabilizar los asientos."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoice Journal"
+msgstr "Diario de factura"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to create invoices."
 msgstr "Diario contable utilizado para crear facturas."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Group Journal Items"
+msgstr "Agrupar apuntes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Check this if you want to group the Journal Items by Product while closing a"
@@ -2433,6 +2449,10 @@ msgstr ""
 "Marque esta casilla si quiere agrupar los apuntes contable por producto en "
 "el cierre de sesión."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcodes"
+msgstr "Códigos de barras"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Defines what kind of barcodes are available and how they are assigned to "
@@ -2441,6 +2461,10 @@ msgstr ""
 "Define que tipo de códigos de barra están disponibles y como se asignan a "
 "productos, clientes y cajeros"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Order IDs Sequence"
+msgstr "Secuencia de identificadores del pedido"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "This sequence is automatically created by Odoo but you can change it to "
@@ -2449,18 +2473,34 @@ msgstr ""
 "La secuencia es creada automáticamente por Odoo, pero puede cambiarla para "
 "personalizar los números de referencia de sus pedidos."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Channel"
+msgstr "Canal de Ventas"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "This Point of sale's sales will be related to this Sales Channel."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Virtual KeyBoard"
+msgstr "Teclado virtual"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables an integrated Virtual Keyboard"
 msgstr "Habilitar un teclado virtual integrado"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoicing"
+msgstr "Facturación"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables invoice generation from the Point of Sale"
 msgstr "Habilitar generación de facturas desde el TPV"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Prefill Cash Payment"
+msgstr "Llenado previo pago en efectivo"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The payment input will behave similarily to bank payment input, and will be "
@@ -2469,6 +2509,10 @@ msgstr ""
 "La entrada de pago se comportará similarmente a la entrada de pago bancario "
 ", y se auto rellenará con la cantidad exacta debido"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Start Category"
+msgstr "Categoría inicial"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The point of sale will display this product category by default. If no "
@@ -2477,6 +2521,10 @@ msgstr ""
 "El punto de venta mostrará esta categoría de productos por defecto. Si no se"
 " especifica una categoría, todos los productos disponibles se mostrarán"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Tip Product"
+msgstr "Producto Propina"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The product used to encode the customer tip. Leave empty if you do not "
@@ -2485,6 +2533,10 @@ msgstr ""
 "El producto utilizado para codificar la propina del cliente. Dejar en blanco"
 " si usted no acepta propina ."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Include Taxes in Prices"
+msgstr "Incluir Impuestos en los precios"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The displayed prices will always include all taxes, even if the taxes have "
@@ -2493,16 +2545,28 @@ msgstr ""
 "Los precios mostrados no siempre incluyen todos los impuestos , incluso si "
 "los impuestos se han configurado de forma diferente"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Large Scrollbars"
+msgstr "Barras de desplazamiento grandes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "For imprecise industrial touchscreens"
 msgstr "Para pantallas táctiles industriales imprecisas"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Display Category Pictures"
+msgstr "Mostrar Imágenes de Categoría"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The product categories will be displayed with pictures."
 msgstr ""
 "El punto de venta mostrará esta categoría de Productos por Defecto . Si no "
 "se ESPECIFICA Una categoría , Todos los Productos Disponibles se mostrarán"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "IP Address"
+msgstr "Dirección IP"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The hostname or ip address of the hardware proxy, Will be autodetected if "
@@ -2511,27 +2575,51 @@ msgstr ""
 "El nombre de equipo o la dirección IP del proxy hardware. Será autodetectado"
 " si se deja vacío"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcode Scanner"
+msgstr "Lector de códigos de barras"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enable barcode scanning with a remotely connected barcode scanner"
 msgstr ""
 "Habilitar escaneado de código de barras con un escáner remoto conectado"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Electronic Scale"
+msgstr "Balanza electrónica"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Electronic Scale integration"
 msgstr "Habilitar integración de una balanza electrónica"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cashdrawer"
+msgstr "Cajón de monedas"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Automatically open the cashdrawer"
 msgstr "Abrir automáticamente el cajón de monedas"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Receipt Printer"
+msgstr "Impresora de recibos"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Bypass browser printing and prints via the hardware proxy"
 msgstr "Saltar impresión del navegador e imprimir vía el proxy hardware"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Automatic Receipt Printing"
+msgstr "Impresión automática del recibo"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The receipt will automatically be printed at the end of each order"
 msgstr "El recibo se imprimirá automáticamente al final de cada orden"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Skip Receipt Screen"
+msgstr "Saltar Pantalla de Recibo"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The receipt screen will be skipped if the receipt can be printed "
@@ -2540,30 +2628,58 @@ msgstr ""
 "Se omitirá la pantalla de recibo si el recibo se puede imprimir de forma "
 "automática."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Header"
+msgstr "Encabezado"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a header in the printed receipt"
 msgstr "Un texto corto que se insertará como cabecera en el recibo impreso"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Footer"
+msgstr "Pie de página"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a footer in the printed receipt"
 msgstr "Un texto corto que se insertará como pie en el recibo impreso"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cash Control"
+msgstr "Control de efectivo"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Check the amount of the cashbox at opening and closing."
 msgstr "Revisar la cantidad en caja al inicio y al cierre."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Splitting"
+msgstr "Separación de la cuenta"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Bill Splitting in the Point of Sale"
 msgstr "Habilita la separación de cuentas en el TPV"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Printing"
+msgstr "Impresión de la cuenta"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allows to print the Bill before payment"
 msgstr "Permitir imprimir la cuenta antes del pago"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Orderline Notes"
+msgstr "Notas de la Línea de Pedido"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allow custom notes on Orderlines"
 msgstr "Permite notas en las líneas de pedido"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Restaurant Floors"
+msgstr "Pisos del Restaurante"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The restaurant floors served by this point of sale"
 msgstr "Los pisos del restaurante atendidos en este punto de venta"
@@ -3476,11 +3592,19 @@ msgstr ""
 "Puede estar hecho para todos los productos o para cada uno en específico. "
 "Haga clic en **Agregar elemento**."
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Active"
+msgstr "Activo"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
 msgstr "Si no está marcado, la tarifa podrá ocultarse sin eliminarla."
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Selectable"
+msgstr "Seleccionable"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid "Allow the end user to choose this price list"
 msgstr "Permitirle al usuario escoger esta lista de precios"

locale/es/LC_MESSAGES/purchase.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Miguel Orueta <mo@landoo.es>, 2017\n"
+"Last-Translator: Alejandro Die Sanchis <marketing@domatix.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2111,10 +2111,18 @@ msgstr ""
 " marcha, haga clic en **Crear y Editar**. En el campo **Fecha de pedido**, "
 "seleccione la fecha en la que desea continuar con el orden real."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Shipment"
+msgstr "Envío"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Incoming Shipments"
 msgstr "Envíos a recibir"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Vendor Reference"
+msgstr "Referencia de proveedor"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the sales order or bid sent by the vendor. It's used to do the "
@@ -2126,6 +2134,10 @@ msgstr ""
 "esta referencia se suele escribir en la orden de entrega enviado por el "
 "proveedor."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Order Date"
+msgstr "Fecha de pedido"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Depicts the date where the Quotation should be validated and converted into "
@@ -2134,16 +2146,28 @@ msgstr ""
 "Representa la fecha en que el presupuesto debe ser validado y se convierte "
 "en una orden de compra."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Source Document"
+msgstr "Documento origen"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the document that generated this purchase order request (e.g. a"
 " sales order or an internal procurement request)"
 msgstr ""
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Deliver To"
+msgstr "Entregar a"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "This will determine picking type of incoming shipment"
 msgstr "Esto determinará el tipo de albarán de la recepción"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Drop Ship Address"
+msgstr "Dirección Drop Ship"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Put an address if you want to deliver directly from the vendor to the "
@@ -2152,10 +2176,18 @@ msgstr ""
 "Ponga una dirección si desea entregar directamente desde el proveedor al "
 "cliente. De lo contrario, mantenga vacía para entregar a su propia compañía."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Destination Location Type"
+msgstr "Tipo de ubicación de destino"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Technical field used to display the Drop Ship Address"
 msgstr "Campo técnico utilizado para mostrar la dirección de envió directo"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "International Commercial Terms are a series of predefined commercial terms "

locale/es/LC_MESSAGES/sales.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: José Vicente <txusev@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
@@ -937,16 +937,11 @@ msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:66
 msgid ""
-"There are different ways to track the service related to a sale order or "
+"There are different ways to track the service related to a sales order or "
 "product sold. With the above configuration, you can only sell one support "
 "contract per order. If your customer orders several service contracts on "
 "timesheet, you will have to split the quotation into several orders."
 msgstr ""
-"Hay diferentes maneras de seguir el servicio relacionado con una orden de "
-"venta o producto vendido. Con la configuración anterior, sólo se puede "
-"vender un contrato de soporte por pedido. Si sus pedidos de clientes de "
-"varios contratos de servicios en parte de horas, que tendrá que dividir el "
-"presupuesto en varios órdenes."
 
 #: ../../sales/invoicing/services/support.rst:72
 msgid ""
@@ -966,21 +961,16 @@ msgid "Managing support contract"
 msgstr "La gestión de contrato de soporte"
 
 #: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sale Orders"
-msgstr "Órdenes de Citas y Ventas"
+msgid "Quotations and Sales Orders"
+msgstr "Presupuestos y pedidos de venta"
 
 #: ../../sales/invoicing/services/support.rst:83
 msgid ""
-"Once the product is created, you can create a quotation or a sale order with"
-" the related product. Once the quotation is confirmed and transformed into a"
-" sale order, your users will be able to record services related to this "
-"support contract using the timesheet application."
+"Once the product is created, you can create a quotation or a sales order "
+"with the related product. Once the quotation is confirmed and transformed "
+"into a sales order, your users will be able to record services related to "
+"this support contract using the timesheet application."
 msgstr ""
-"Una vez que el productos es creado, usted puede crear una cotización o una "
-"orden de venta con el producto relacionado. Una vez que la cotización está "
-"confirmada y se transformó en una orden de venta, los usuarios podrán grabar"
-" los servicios relacionados con el contrato de soporte utilizando la "
-"aplicación de la hoja de horas."
 
 #: ../../sales/invoicing/services/support.rst:93
 msgid "Timesheets"
@@ -1001,8 +991,8 @@ msgstr ""
 "vendido."
 
 #: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sale order"
-msgstr "Control de entrega de apoyo en la orden de venta"
+msgid "Control delivered support on the sales order"
+msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:106
 msgid ""
@@ -1025,30 +1015,14 @@ msgstr "Sobreventa y renovación"
 #: ../../sales/invoicing/services/support.rst:118
 msgid ""
 "If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, the sale order "
-"**Invoicing Status** is automatically set to **Upselling**. This means you "
-"have an opportunity to sell an extra contract to the customer since he used "
-"all his quota of service."
+"equal to the number of hours the customer purchased, you are suggested to "
+"sell an extra contract to the customer since they used all their quota of "
+"service. Periodically (ideally once every two weeks), you should check the "
+"sales order that are in such a case. To do so, go to :menuselection:`Sales "
+"--> Invoicing --> Orders to Upsell`."
 msgstr ""
-"Si el número de horas que trabajó sobre el contrato de soporte es mayor o "
-"igual que el número de horas que el cliente compró, la orden de venta de "
-"**Estado de Facturación** se ajusta automáticamente a **Vendiendo**. Esto "
-"significa que usted tiene la oportunidad de vender un contrato adicional "
-"para el cliente ya que él usó toda su cuota de servicio."
 
-#: ../../sales/invoicing/services/support.rst:124
-msgid ""
-"Periodically (ideally once every two weeks), you should check the sales "
-"order that are in an upselling status. To do this, go to the "
-":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter"
-" to get all orders that are in upselling."
-msgstr ""
-"Periódicamente (idealmente una vez cada dos semanas), usted debe comprobar "
-"la orden de venta que se encuentran en un estado de vendiendo. Para ello, "
-"vaya a :menuselection:`Ventas --> Orden de Venta` y usar el filtro de "
-"**Vendiendo** para obtener todos los pedidos que están en vendidos."
-
-#: ../../sales/invoicing/services/support.rst:130
+#: ../../sales/invoicing/services/support.rst:127
 msgid ""
 "If you use Odoo CRM, a good practice is to create an opportunity for every "
 "sale order in upselling invoice status so that you easily track your "
@@ -1058,26 +1032,20 @@ msgstr ""
 "que cada orden de venta en estado vendiendo de la factura, seguirá "
 "fácilmente su esfuerzo de mejorarar una venta."
 
-#: ../../sales/invoicing/services/support.rst:134
+#: ../../sales/invoicing/services/support.rst:131
 msgid ""
 "If you sell an extra support contract, you can either add a new line on the "
-"existing sale order (thus, you continue to timesheet on the same order) or "
+"existing sales order (thus, you continue to timesheet on the same order) or "
 "create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sale order as **Upselling**, you can set the sale "
-"order as done and it will disappear from your upselling list."
+"contract). To unmark the sales order as **Upselling**, you can set the sales"
+" order as done and it will disappear from your upselling list."
 msgstr ""
-"Si usted vende un contrato de soporte adicional, puede añadir una nueva "
-"línea en la orden de venta existente (por lo tanto, continúa de parte de "
-"horas en el mismo orden) o crea una nueva orden (por lo tanto, la gente verá"
-" su hoja de horas en el nuevo contrato). Para desmarcar la orden de venta "
-"como **Vendiendo**, puede establecer la orden de la venta como hecho y va a "
-"desaparecer de su lista de vendiendo."
 
-#: ../../sales/invoicing/services/support.rst:141
+#: ../../sales/invoicing/services/support.rst:138
 msgid "Special Configuration"
 msgstr "Configuración Especial"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/services/support.rst:140
 msgid ""
 "When creating the product form, you may set a different approach to track "
 "the service:"
@@ -1085,33 +1053,23 @@ msgstr ""
 "Al crear la forma del producto, es posible establecer un enfoque diferente "
 "para realizar el seguimiento del servicio:"
 
-#: ../../sales/invoicing/services/support.rst:146
+#: ../../sales/invoicing/services/support.rst:143
 msgid ""
 "**Create task and track hours**: in this mode, a task is created for every "
-"sale order line. Then when you do the timesheet, you don't record hours on a"
-" sale order/contract, but you record hours on a task (that represents the "
+"sales order line. Then when you do the timesheet, you don't record hours on "
+"a sales order/contract, but you record hours on a task (that represents the "
 "contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sale order."
+"service contracts within the same sales order."
 msgstr ""
-"**Crear tareas y seguimiento de horas**: en este modo, se crea una tarea "
-"para cada línea de la orden de venta. Entonces, cuando usted hace la hoja de"
-" tiempos, no grabar las horas en una orden de venta/contrato, pero ustedes "
-"registrarán las horas en una tarea (que representa el contrato). La ventaja "
-"de esta solución es que permite vender varios contratos de servicio dentro "
-"de la misma orden de venta."
 
-#: ../../sales/invoicing/services/support.rst:153
+#: ../../sales/invoicing/services/support.rst:150
 msgid ""
 "**Manually**: you can use this mode if you don't record timesheets in Odoo. "
 "The number of hours you worked on a specific contract can be recorded "
-"manually on the sale order line directly, in the delivered quantity field."
+"manually on the sales order line directly, in the delivered quantity field."
 msgstr ""
-"**Manualmente**: usted puede utilizar este modo si no desea registrar las "
-"hojas de horas en Odoo. El número de horas de Odoo trabajado está "
-"especificado en el contrato y puede ser registrado manualmente en la orden "
-"de venta en una línea directamente, en el campo de la cantidad entregada."
 
-#: ../../sales/invoicing/services/support.rst:159
+#: ../../sales/invoicing/services/support.rst:156
 msgid ":doc:`../../../inventory/settings/products/uom`"
 msgstr ":doc:`../../../inventory/settings/products/uom`"
 
@@ -1382,15 +1340,11 @@ msgstr ":menuselection:`Orden de Comercio electrónico --> Factura`"
 
 #: ../../sales/overview/main_concepts/invoicing.rst:69
 msgid ""
-"An eCommerce order will also trigger the creation of the order when it is "
+"An eCommerce order will also trigger the creation of the invoice when it is "
 "fully paid. If you allow paying orders by check or wire transfer, Odoo only "
 "creates an order and the invoice will be triggered once the payment is "
 "received."
 msgstr ""
-"Una orden de comercio electrónico también se activará la creación de la "
-"orden cuando está totalmente pagada. Si usted permite que el pago de pedidos"
-" por cheque o transferencia bancaria, Odoo sólo creará un pedido y la "
-"factura se activará una vez que se recibe el pago."
 
 #: ../../sales/overview/main_concepts/invoicing.rst:75
 msgid "Creating an invoice manually"
@@ -1709,140 +1663,76 @@ msgid "Manage your products"
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:3
-msgid "How to import my products"
+msgid "How to import products with categories and variants"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:6
-msgid "How to start"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:8
-msgid "Download the following import templates:"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:10
+#: ../../sales/products_prices/products/import.rst:5
 msgid ""
-"Partners: customers, vendors (no relation field, can be imported as is)"
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:11
-msgid "Products (no relation field, can be imported as is)"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:12
-msgid "Product Website Categories"
+msgid "How to customize the file"
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:13
-msgid "Product Attributes & Values"
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:14
-msgid "Products with Categories & Attributes (3 & 4 must be imported first)"
+#: ../../sales/products_prices/products/import.rst:15
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:16
 msgid ""
-"Download link: "
-"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing"
+"Don't change labels of columns you want to import. Otherwise Odoo won't "
+"recognize them anymore and you will have to map them on your own in the "
+"import screen."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:18
 msgid ""
-"You can open them with any spreadsheets software (Microsoft Office, "
-"OpenOffice, Google Drive, etc.)."
+"To add new columns,Feel free to add new columns but the fields need to exist"
+" in Odoo. If Odoo fails in matching the column name with a field, you can "
+"make it manually when importing by browsing a list of available fields."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:21
-msgid "How to customize the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:23
-msgid ""
-"Remove columns you don't need. Don't remove the first one (called *ID*, see "
-"why here below)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:25
-msgid ""
-"Don't change labels of columns you want to import. Otherwse Odoo won't match"
-" the columns automatically."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:27
-msgid ""
-"Feel free to add new columns but the fields need to exist in Odoo. If Odoo "
-"fails in matching the column name with a field, you can make it manually "
-"when importing by browsing a list of available fields."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:30
-msgid "Once modified, keep your file in .csv format."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:33
-msgid "How to import the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:35
-msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:36
-msgid "Switch to list view (top-right corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:37
-msgid "Click the *Import* button (top-left corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:38
-msgid ""
-"Make sure all the columns match an existing field. If not select it manually"
-" from the drop-down list."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:40
-msgid "Press * Validate* to test the import."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:41
-msgid ""
-"If you get \"Everything seems valid.\" as result message, press *Import* to "
-"process the real import. Otherwise correct the issues spotted during the "
-"test."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:45
+#: ../../sales/products_prices/products/import.rst:24
 msgid "Why an “ID” column"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:47
+#: ../../sales/products_prices/products/import.rst:26
 msgid ""
 "The ID is an unique identifier for the line item. Feel free to use the one "
 "of your previous software to ease the transition to Odoo."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:50
+#: ../../sales/products_prices/products/import.rst:29
 msgid ""
 "Setting an ID is not mandatory when importing but it helps in many cases:"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:52
+#: ../../sales/products_prices/products/import.rst:31
 msgid ""
 "Update imports: you can import the same file several times without creating "
 "duplicates;"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:53
+#: ../../sales/products_prices/products/import.rst:32
 msgid "Import relation fields (see here below)."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:56
+#: ../../sales/products_prices/products/import.rst:35
 msgid "How to import relation fields"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:58
+#: ../../sales/products_prices/products/import.rst:37
 msgid ""
 "An Odoo object is always related to many other objects (e.g. a product is "
 "linked to product categories, attributes, vendors, etc.). To import those "
@@ -1850,7 +1740,7 @@ msgid ""
 "their own list menu."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:62
+#: ../../sales/products_prices/products/import.rst:41
 msgid ""
 "You can do it using either the name of the related record or its ID. The ID "
 "is expected when two records have the same name. In such a case add \" / "

locale/es/LC_MESSAGES/website.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-20 15:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: RGB Consulting <odoo@rgbconsulting.com>, 2017\n"
+"Last-Translator: Luis M. Ontalba <luis.martinez@tecnativa.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1499,7 +1499,7 @@ msgstr ""
 
 #: ../../website/publish/domain_name.rst:15
 msgid "Simple and obvious"
-msgstr ""
+msgstr "Simple y obvio"
 
 #: ../../website/publish/domain_name.rst:16
 msgid "Easy to remember and spell"
@@ -1507,7 +1507,7 @@ msgstr "Fácilmente de recordar y pronunciar"
 
 #: ../../website/publish/domain_name.rst:17
 msgid "The shorter the better"
-msgstr ""
+msgstr "Cuanto más corto mejor"
 
 #: ../../website/publish/domain_name.rst:18
 msgid "Avoid special characters"

locale/fr/LC_MESSAGES/accounting.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Cyrille de Lambert <cdelambert@teclib.com>, 2017\n"
+"Last-Translator: leemannd <denis.leemann@camptocamp.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,7 +99,6 @@ msgstr ""
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:23
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31
 msgid "Configuration"
 msgstr "Configuration"
@@ -1049,7 +1048,6 @@ msgstr ""
 
 #: ../../accounting/bank/misc/batch.rst:124
 #: ../../accounting/payables/pay/sepa.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:134
 msgid "Troubleshooting"
 msgstr "Dépannage"
 
@@ -1963,6 +1961,11 @@ msgstr ""
 "Dans l'onglet Pièces Comptables, les comptes de débit et de crédit par "
 "défaut peuvent être configurés, de même que la devise du journal"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "Type"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr ""
@@ -1981,14 +1984,26 @@ msgstr ""
 msgid "Select 'General' for miscellaneous operations journals."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Company"
+msgstr "Société"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
 msgstr "Société associée à ce journal"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Short Code"
+msgstr "Code"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
 msgstr "Les pièces comptables de ce journal seront nommées avec ce préfixe."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Dedicated Refund Sequence"
+msgstr "Séquence dédiée aux avoirs"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
@@ -1997,6 +2012,10 @@ msgstr ""
 "Cochez cette case si vous ne souhaitez pas partager une même numérotation "
 "pour les factures et avoirs de ce journal"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Entry Sequence"
+msgstr "Séquence d'écriture"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the journal "
@@ -2005,6 +2024,10 @@ msgstr ""
 "Cet champ contient les informations relatives à la numérotation des "
 "écritures de ce journal."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Refund Entry Sequence"
+msgstr "Séquence d'écriture d'avoir"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the refund "
@@ -2013,18 +2036,34 @@ msgstr ""
 "Ce champ contient les informations relatives à la numérotation des entrées "
 "d'avoir de ce journal."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Debit Account"
+msgstr "Compte de débit par défaut"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for debit amount"
 msgstr "Ça sert de compte par défaut pour les montants en débit"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Credit Account"
+msgstr "Compte de crédit par défaut"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for credit amount"
 msgstr "Sert de compte par défaut pour le crédit"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Currency"
+msgstr "Devise"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
 msgstr "La devise utilisée pour entrer les relevés"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Debit Methods"
+msgstr "Méthodes de débit"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for collecting money. Odoo modules offer various payments "
@@ -2036,6 +2075,10 @@ msgstr ""
 "la méthode de paiement \"Manuelle\" afin de pouvoir gérer les paiements en "
 "dehors du logiciel. "
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Payment Methods"
+msgstr "Moyens de paiement"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for sending money. Odoo modules offer various payments "
@@ -2047,6 +2090,10 @@ msgstr ""
 "la méthode de paiement \"Manuelle\" afin de pouvoir gérer les paiements en "
 "dehors du logiciel. "
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Group Invoice Lines"
+msgstr "Grouper les lignes de facture"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
@@ -2055,6 +2102,10 @@ msgstr ""
 "Si cette case est cochée, le système essaiera de grouper les lignes "
 "comptables lorsqu'il les créera à partir des factures."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Profit Account"
+msgstr "Compte de profit"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a profit when the ending balance of a cash register differs"
@@ -2063,6 +2114,10 @@ msgstr ""
 "Utilisé pour enregistrer un profit lorsque le solde final de la caisse est "
 "différent de ce qui a été calculé par le système"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Loss Account"
+msgstr "Compte de perte"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a loss when the ending balance of a cash register differs "
@@ -2071,10 +2126,18 @@ msgstr ""
 "Utilisé pour enregistrer une perte lorsque le solde final de la caisse est "
 "différent de ce qui a été calculé par le système"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Show journal on dashboard"
+msgstr "Montrer le journal dans le tableau de bord"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
 msgstr "Si ce journal doit être affiché sur le tableau de bord ou non."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Printing Payment Method Selected"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Technical feature used to know whether check printing was enabled as payment"
@@ -2083,20 +2146,37 @@ msgstr ""
 "Fonction technique utilisée afin de savoir si l'impression du chèque a été "
 "activée comme méthode de paiement."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Sequence"
+msgstr "Séquence chèque"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Checks numbering sequence."
 msgstr "Séquence de numérotation des chèques."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Manual Numbering"
+msgstr "Numérotation manuelle"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check this option if your pre-printed checks are not numbered."
 msgstr ""
 "Cochez cette option si vos chèques pré-imprimés ne sont pas numérotés."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Next Check Number"
+msgstr "Numéro de chèque suivant"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Sequence number of the next printed check."
 msgstr "Numéro de séquence du prochain chèque imprimé."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Active in Point of Sale"
+msgstr "Activé dans le point de vente"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if this journal define a payment method that can be used in a"
@@ -2105,6 +2185,10 @@ msgstr ""
 "Cochez cette case si ce journal défini une méthode de paiement qui peut être"
 " utilisée dans le point de vente."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Amount Authorized Difference"
+msgstr "Montant d'écart autorisé"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field depicts the maximum difference allowed between the ending balance"
@@ -2358,6 +2442,10 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Explication des champs :"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Status"
+msgstr "État"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "When an asset is created, the status is 'Draft'."
 msgstr "Lorsqu'une immobilisation est créée, le statut est « Brouillon »."
@@ -2379,22 +2467,42 @@ msgstr ""
 "est terminé. Si la dernière ligne de l'amortissement est comptabilisée, "
 "l'immobilisation passe automatiquement dans ce statut."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Category"
+msgstr "Catégorie"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Category of asset"
 msgstr "Catégorie d'immobilisation"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Date"
+msgstr "Date "
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Date of asset"
 msgstr "Date de l'immobilisation"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Gross Value"
+msgstr "Valeur brute"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Gross value of asset"
 msgstr "Valeur brute des immobilisations"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Salvage Value"
+msgstr "Valeur résiduelle"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr "Il s'agit de la part non dépréciable de l'immobilisation."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Computation Method"
+msgstr "Méthode de calcul"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Choose the method to use to compute the amount of depreciation lines."
 msgstr ""
@@ -2414,6 +2522,10 @@ msgstr ""
 "* Dégressif : Calculé sur la base de: Valeur résiduelle * Taux "
 "d'amortissement Dégressif"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Time Method Based On"
+msgstr "Méthode temporelle basée sur"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Choose the method to use to compute the dates and number of depreciation "
@@ -2438,6 +2550,10 @@ msgstr ""
 "* Date de fin : Choisissez le temps entre 2 amortissements et la date au "
 "delà de laquelle les amortissements cesseront."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Prorata Temporis"
+msgstr "Prorata temporis"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
@@ -2447,11 +2563,19 @@ msgstr ""
 "Indiquez si le premier amortissement doit être calculé à partir de la date "
 "d'achat ou à partir du 1er janvier / premier jour de l'exercice comptable."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Depreciations"
+msgstr "Nombre d'amortissements"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 "Le nombre d'amortissements nécessaire pour amortir votre immobilisation"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Months in a Period"
+msgstr "Nombre de mois dans une période"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The amount of time between two depreciations, in months"
 msgstr "La durée entre deux amortissements, en mois"
@@ -4388,17 +4512,29 @@ msgstr ""
 "pour gérer les clôtures d'exercices (et établir les écritures "
 "correspondantes)"
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Tags"
+msgstr "Étiquettes"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
 msgstr ""
 "Étiquettes optionnelles que vous pourriez assigner pour des rapports "
 "personnalisés"
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Account Currency"
+msgstr "Devise du compte"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
 msgstr ""
 "Oblige toutes les écritures de ce compte à avoir cette devise secondaire."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Internal Type"
+msgstr "Type interne"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "The 'Internal Type' is used for features available on different types of "
@@ -4410,6 +4546,10 @@ msgstr ""
 "les comptes banquaires, payabls/recevables par les comptes des "
 "vendeurs/clients"
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Allow Reconciliation"
+msgstr "Autoriser le lettrage"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "Check this box if this account allows invoices & payments matching of "
@@ -9439,10 +9579,18 @@ msgstr ""
 msgid "Explanation of the fields of the payment screen:"
 msgstr "Explication des champs de l'écran de paiement :"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Has Invoices"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used for usability purposes"
 msgstr "Champ technique utilisé à des fins ergonomiques"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Hide Payment Method"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to hide the payment method if the selected journal has "
@@ -9451,6 +9599,10 @@ msgstr ""
 "Champ technique utilisé pour cacher la méthode de paiement si le journal "
 "sélectionné a seulement une méthode possible qui est \"manuelle\""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Code"
+msgstr "Code"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to adapt the interface to the payment type selected."
@@ -9458,6 +9610,10 @@ msgstr ""
 "Champ technique utilisé pour adapter l'interface au type de paiement "
 "sélectionné ."
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Check Number"
+msgstr "Numéro de chèque"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "The selected journal is configured to print check numbers. If your pre-"
@@ -12421,8 +12577,8 @@ msgstr ":doc:`recording`"
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:167
 #: ../../accounting/receivables/customer_payments/recording.rst:128
-msgid ":doc:`paypal`"
-msgstr ":doc:`paypal`"
+msgid ":doc:`../../bank/feeds/paypal`"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:169
 #: ../../accounting/receivables/customer_payments/recording.rst:130
@@ -12730,268 +12886,6 @@ msgstr ""
 "Vous pouvez obtenir le DMP de votre entreprise dans le rapport Note de "
 "Synthèse (vérifier les ICP jours moyens débiteurs)."
 
-#: ../../accounting/receivables/customer_payments/paypal.rst:3
-msgid "How to accept paypal payments on invoices?"
-msgstr "Comment accepter les paiements PayPal des factures?"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:5
-msgid ""
-"The \"Paypal Payment Acquirer\" module allows you to accept payments via "
-"paypal, for your sales orders, invoices, or online orders. As paypal accepts"
-" payments through credit cards (VISA, Mastercard, …), you will be able to "
-"process most payment methods."
-msgstr ""
-"Le module « Intermédiaire de paiement PayPal » vous permet d'accepter les "
-"paiements par PayPal, pour vos commandes client, vos factures, ou vos "
-"commandes en ligne. Comme PayPal accepte les paiements par cartes de crédit "
-"(VISA, Mastercard, ...), vous serez en mesure de traiter la plupart des "
-"méthodes de paiement."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:10
-msgid "Paypal support two modes:"
-msgstr "Paypal prend en charge deux modes de fonctionnement :"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:12
-msgid ""
-"Paypal Merchant Account: the user is redirected to paypal to do the payment "
-"(either with a credit card or a paypal account)"
-msgstr ""
-"Compte marchand PayPal : l'utilisateur est redirigé vers PayPal pour faire "
-"le paiement (avec une carte de crédit ou un compte PayPal)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:15
-msgid ""
-"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to "
-"paypal and the payment can be done in the background. This method is mostly "
-"used for subscription businesses where you need to charge your customers "
-"periodically."
-msgstr ""
-"PayPal PayFlow Pro (S2S, Serveur 2 Serveur): l'utilisateur n'est pas "
-"redirigé vers PayPal et le paiement peut être fait en arrière-plan. Cette "
-"méthode est surtout utilisée par les entreprises vendant des abonnements qui"
-" doivent facturer périodiquement leurs clients."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:20
-msgid "As of today, Odoo only support the normal Paypal Merchant Account."
-msgstr "À ce jour, Odoo ne supporte que la méthode Compte Marchand PayPal."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:26
-msgid "Install the \"PayPal Payment Acquirer\" module"
-msgstr "Installez le module « Intermédiaire de paiement PayPal »"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:28
-msgid "Start by installing the **PayPal Payment Acquirer** module."
-msgstr ""
-"Commencez par installer le module **Intermédiaire de paiement PayPal**"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:30
-msgid ""
-"Once the module is installed, you should see a new payment acquirer in the "
-"Setting application, menu \"Payment Acquirers\"."
-msgstr ""
-"Une fois le module installé, vous devriez trouver un nouvel intermédiaire de"
-" paiement en allant dans :menuselection:`Configuration -->Intermédiaires de "
-"paiement`."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:36
-msgid ""
-"By default, Paypal is configured to work in a test environment, out-of-the-"
-"box. It means you can already test the full order to payment flow with the "
-"paypal sandbox, without having to configure the next steps."
-msgstr ""
-"Par défaut, PayPal est configuré pour fonctionner dans un environnement de "
-"test, out-of-the-box. Cela signifie que vous pouvez déjà tester le "
-"cheminement complet de la commande au paiement avec le bac à sable PayPal, "
-"sans avoir à configurer les prochaines étapes."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:42
-msgid "Creating and configuring a PayPal merchant account"
-msgstr "Création et configuration d'un compte marchand PayPal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:45
-msgid "Create a basic Paypal account"
-msgstr "Créer un compte de base PayPal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:47
-msgid "Existing or newly created Personal Paypal account can be used."
-msgstr ""
-"Un compte personnel PayPal existant ou nouvellement créé peut être utilisé."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:49
-msgid "Or upgrade your account to Business account (merchant) if needed"
-msgstr ""
-"Et transformez votre compte en un compte Business (marchand) si nécessaire"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:55
-msgid "Paypal Account Summary page"
-msgstr "Extrait de la page de gestion de compte PayPal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:58
-msgid "Paypal Configuration"
-msgstr "Configuration Paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:60
-msgid ""
-"Access \"Seller preferences\" menu from `PayPal website "
-"<https://www.paypal.com/myaccount/home>`__"
-msgstr ""
-"Accéder au menu \"Préférences de vendeur\" sur le `site PayPal "
-"<https://www.paypal.com/myaccount/home>` __"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:66
-msgid ""
-"Access \"Website preferences\" and configure Auto Return (Payment Data "
-"Transfer must be left to Off)"
-msgstr ""
-"Allez à \"Website preferences\" and activez Auto Return (Payment Data "
-"Transfer doit être laissé à Off)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:69
-msgid "**Database name**: yourcompany"
-msgstr "**Nom de la base de données** : yourcompany"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:70
-#: ../../accounting/receivables/customer_payments/paypal.rst:88
-msgid "**Website URL**: https://yourcompany.odoo.com/"
-msgstr "**URL du site web**: https://yourcompany.odoo.com/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:71
-msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation"
-msgstr "**URL de retour**: https://yourcompany.odoo.com/shop/confirmation"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:76
-msgid "These settings will redirect your buyer to your web confirmation page."
-msgstr ""
-"Ces paramètres redirigerons votre acheteur vers votre page web de "
-"confirmation."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:80
-msgid "Access and edit Instant payment notifications settings - IPN"
-msgstr ""
-"Accédez et modifiez les réglages de notification instantanée de paiement - "
-"IPN"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:85
-msgid "Example"
-msgstr "Exemple"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:87
-msgid "**Database name**: \"yourcompany\""
-msgstr "**Nom de la base de données** : \"yourcompany\""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:89
-msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-msgstr ""
-"**URL de notification**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:91
-msgid ""
-"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you"
-" use the odoo.com domain, we advise you to use HTTPS."
-msgstr ""
-"Vérifiez que votre Notification URL utilise the bon protocole (HTTP / "
-"HTTPS). Si vous utilisez le domaine odoo.com, nous vous conseillons "
-"d'utiliser HTTPS."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:94
-msgid ""
-"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> "
-"Language Encoding --> More Options --> More selling tools`"
-msgstr ""
-"Définissez l'encodage à UTF-8 dans le menu :menuselection:`Paramètres --> "
-"Jeu de caractères --> Plus d'Options --> Plus d'outils vente`"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:103
-msgid ""
-"Record your Merchant Paypal ID (personal or business account both will have "
-"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> "
-"Account Options`."
-msgstr ""
-"Notez votre ID de marchand PayPal (un compte personnel comme un compte "
-"business en aura un), il devra être enregistré en retour dans Odoo "
-":menuselection:`Réglages PayPal --> Options du Compte`."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:111
-msgid ""
-"If you want your customers to be able to pay through Paypal while not having"
-" a Paypal account- following setting \"Paypal Account Optional\" needs to be"
-" set to **ON**. All users will be able to choose Credit/debit card payment "
-"option - Paypal account not required."
-msgstr ""
-"Si vous voulez que vos clients puissent payer avec Paypal sans avoir de "
-"compte Paypal, le paramètre \"Compte Paypal Facultatif\" doit être réglé sur"
-" **ON**. Tous les utilisateurs pourrront alors choisir l'option de paiement "
-"par carte de crédit. Un compte Paypal ne sera pas nécessaire."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:120
-msgid "Setup your Paypal Payment Acquirer account credentials in Odoo"
-msgstr ""
-"Configurez les informations d'identification de votre compte « Intermédiaire"
-" de paiement Paypal » dans Odoo"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:122
-msgid ""
-":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`"
-msgstr ""
-":menuselection:`Configuration --> Paiements --> Intermédiaires de paiement "
-"--> Paypal`"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:124
-msgid "**Paypal Email ID**: your paypal account email address"
-msgstr ""
-"**Email du compte Paypal** : l'adresse de courriel de votre compte paypal"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:126
-msgid "**Paypal Merchant ID**: ID retrieved at previous step"
-msgstr "**ID de marchand Paypal**: ID noté à une étape précédente"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:136
-msgid ""
-"If your eCommerce customer gets this Error Message after completing Paypal "
-"payment instead of being redirected to your database:"
-msgstr ""
-"Si votre client eCommerce reçoit ce message d'erreur après avoir terminé le "
-"paiement PayPal au lieu d'être redirigé vers votre site :"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:142
-msgid ""
-"Verify the settings you have `configured in Paypal <WebsitePreferences_>`_:"
-msgstr ""
-"Vérifiez les réglages que vous avez `configurés dans Paypal "
-"<WebsitePreferences_>`_:"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:144
-msgid ""
-"Auto Return should be on (the value can be quite generic, like "
-"<odoo_instance>/shop/confirmation; the correct URL will be set for each "
-"transaction)"
-msgstr ""
-"Auto Return doit être sur On (la valeur peut être assez générique, comme "
-"<odoo_instance>/shop/confirmation, l'URL correcte sera définie pour chaque "
-"transaction)"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:148
-msgid "Payment Data Transfer should be off"
-msgstr "Payment Data Transfer doit être sur off"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:150
-msgid ""
-"On-premise databases must be accessible through classic HTTP/HTTPS ports "
-"(80/443) for Paypal to work correctly, usually through a reverse proxy. "
-"Contact your integrating partner if you are unsure this is the case. "
-"Databases hosted on odoo.com are already configured correctly."
-msgstr ""
-"Les bases de données sur-site doivent être accessibles par le biais des "
-"ports classiques HTTP/HTTPS (80/443) pour que Paypal fonctionne "
-"correctement, généralement par le biais d'un proxy inverse. Contactez votre "
-"partenaire intégrateur si vous n'êtes pas sûr que ce soit le cas. Les bases "
-"de données hébergées sur odoo.com sont déjà correctement configurées."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:157
-#: ../../accounting/receivables/customer_payments/recording.rst:127
-msgid ":doc:`credit_cards`"
-msgstr ":doc:`credit_cards`"
-
 #: ../../accounting/receivables/customer_payments/recording.rst:3
 msgid "What are the different ways to record a payment?"
 msgstr "Quelles sont les différentes façons d'enregistrer un paiement ?"
@@ -13206,6 +13100,10 @@ msgstr ""
 "Pour faire un transfert interne d'un compte bancaire à un autre, depuis le tableau de bord sélectionnez « Tranfert interne » sur la carte du compte bancaire à débiter. Puis dans l'écran d'enregistrement des paiements, sélectionnez le compte à créditer.\n"
 "Ne refaites pas la même opération à partir du compte bancaire à créditer, ou vous allez créer deux pièces comptables qui vont s'annuler pour la même transaction."
 
+#: ../../accounting/receivables/customer_payments/recording.rst:127
+msgid ":doc:`credit_cards`"
+msgstr ":doc:`credit_cards`"
+
 #: ../../accounting/receivables/getting_paid.rst:3
 msgid "How to get paid?"
 msgstr "Comment se faire payer ?"

locale/fr/LC_MESSAGES/applications.po

@@ -20,4 +20,4 @@ msgstr ""
 
 #: ../../applications.rst:3
 msgid "Applications"
-msgstr "Candidatures"
+msgstr "Applications"

locale/fr/LC_MESSAGES/discuss.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -23,7 +23,7 @@ msgid "Discuss"
 msgstr "Discussions"
 
 #: ../../discuss/email_servers.rst:3
-msgid "How to use my own email servers to send and receive messages in Odoo"
+msgid "How to use my own email servers to send and receive email in Odoo"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:6
@@ -31,138 +31,230 @@ msgid "When is it needed"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:7
-msgid "You need it if you use Odoo Community or Enterprise."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:10
-msgid "What if I use Odoo Online"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:11
 msgid ""
-"You are done! Odoo Online comes up with an embedded and ready-to-use email "
-"server (*@yourcompany.odoo.com*). We recommend to keep this default setting "
-"as is as it is really convenient."
+"Using your own email servers is required to send and receive messages in "
+"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email "
+"solution that works straight away. However you can still use your own email "
+"servers with the online edition. Some insights are provided here below."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:14
+msgid "How to set it up"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"Indeed, while it is branded by Odoo, the visible source of any message sent "
-"from Odoo will be your personal email address (your Odoo login). Your "
-"contacts will therefore trust your messages."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:20
-msgid "How does it work when a contact replies to an email sent from Odoo"
+"As a system admin, go to :menuselection:`Settings --> General Settings` and "
+"check *External Email Servers* (watch out: this checkbox only shows up after"
+" Odoo 10). Then, go through the following steps."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:21
 msgid ""
-"Default reply-to is a generic address used to automatically route any "
-"incoming email to the discussion thread of the origin business object "
-"(opportunity, order, task, etc.) and to the inbox of all its followers. By "
-"default this address is \"catchall@\" but it can be changed. Thanks to it, "
-"you get a perfect message thread in Odoo and you don't pollute your external"
-" email box with Odoo-related topics."
+"Office 365 doesn't allow external hosts like Odoo. Consequently you can't "
+"use Office 365 email servers to send or receive messages in Odoo."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:29
-msgid "How to use my own email servers"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:30
-msgid ""
-"You need to be a system admin to set this up. Go to :menuselection:`Settings"
-" --> General Settings` and check *External Email Servers* (watch out: this "
-"checkbox only shows up after Odoo 10). Then, go through the following steps."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:36
+#: ../../discuss/email_servers.rst:26
 msgid "Set an outgoing email server for outbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:37
+#: ../../discuss/email_servers.rst:27
 msgid ""
 "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, "
 "etc.) as well as your admin credentials. Once all the information has been "
 "filled out, click on *Test Connection*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:45
+#: ../../discuss/email_servers.rst:35
 msgid "Set an incoming email server for inbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:46
+#: ../../discuss/email_servers.rst:36
 msgid ""
 "Fill out the form according to your email provider’s settings. Leave the "
 "*Actions to Perform on Incoming Mails* blank. Once all the information has "
 "been filled out, click on *TEST & CONFIRM*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:53
+#: ../../discuss/email_servers.rst:43
 msgid ""
 "By default inbound messages are fetched every 5 minutes. You can change this"
 " value in developer mode. Go to :menuselection:`Settings --> Technical --> "
 "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:59
+#: ../../discuss/email_servers.rst:49
 msgid "Set the domain name"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:60
+#: ../../discuss/email_servers.rst:50
 msgid ""
 "Enter the domain name of your email servers (e.g. mycompany.com) in General "
 "Settings."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:67
+#: ../../discuss/email_servers.rst:57
 msgid "Create a catchall address"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:68
+#: ../../discuss/email_servers.rst:58
+msgid ""
+"When a contact replies to an email sent from Odoo, the *reply-to* address is"
+" a generic address used to route the reply to the right discussion thread in"
+" Odoo (opportunity, order, task, etc.) and to the inbox of all its "
+"followers. By default this address is \"catchall@\" but it can be changed."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:63
 msgid ""
 "Create a catchall address in your email server settings. We advise you to "
 "use \"catchall@\" so that everything works out straight away. If you want to"
 " use another alias, you have extra steps in Odoo:"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:72
+#: ../../discuss/email_servers.rst:67
 msgid "Activate the developer mode from your Settings Dashboard."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:77
+#: ../../discuss/email_servers.rst:72
 msgid ""
 "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> "
 "Parameters --> System Parameters` and enter your custom catchall alias in "
 "*mail.catchall.alias*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:84
+#: ../../discuss/email_servers.rst:79
 msgid "You can edit the email alias used for bounced messages the same way."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:87
-msgid "How to perfectly combine Odoo Discuss and my traditional email tool"
+#: ../../discuss/email_servers.rst:82
+msgid "How to use my own email servers with Odoo Online"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:88
+#: ../../discuss/email_servers.rst:83
+msgid ""
+"Odoo Online comes up with an embedded and ready-to-use email server "
+"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it "
+"is really convenient. Indeed, while it is Odoo-labelled, the visible source "
+"of any message sent from Odoo will be your personal email address (your Odoo"
+" login). Your contacts will therefore trust your messages."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:90
+msgid ""
+"You can still use your own email servers if you want your contacts to see "
+"your historic email address when they reply to your messages or if you want "
+"to manage the reputation of your email servers yourself."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:94
+msgid "There are 2 methods:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:96
+msgid ""
+"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to"
+" receive emails in Odoo in real time thanks to the Odoo email server. Create"
+" a catchall address in your email server settings. Then apply following "
+"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. "
+"That's it you're ready to go!"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:102
+msgid ""
+"**Use a catchall mailbox** to exclusively use your own email server. That "
+"way you can also manage your email server reputation (blacklisting, etc). "
+"However, incoming messages are fetched from the email server thanks to a "
+"cron running every hour. This is the shortest time lap for crons in Online "
+"instances. If you opt for this solution, simply follow the procedure of "
+"above section."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:111
+msgid "How to be SPF-compliant when using external email servers in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:112
+msgid ""
+"Sender Policy Framework (SPF) is an email-validation system that checks that"
+" incoming mail from a domain comes from a host authorized by that domain's "
+"administrator. Such a security system is used in most email servers. If you "
+"don't comply with it, your emails sent from Odoo will be likely flagged as "
+"spam."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:118
+msgid ""
+"To be SPF-compliant, you need to authorize Odoo as a sending host in your "
+"domain name settings:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:121
+msgid "Sign in to your domain’s account at your domain host."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:122
+msgid "Locate the page for updating your domain’s DNS records."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:123
+msgid ""
+"If no TXT record is set, create one with following definition: v=spf1 "
+"include:_spf.odoo.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:125
+msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:127
+msgid "e.g. for a Gmail server it should be:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:129
+msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:131
+msgid ""
+"Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to "
+"create or modify TXT records in your own domain registrar."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:134
+msgid ""
+"Your new SPF record can take up to 48 hours to go into effect, but this "
+"usually happens more quickly."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:137
+msgid ""
+"Adding more than one SPF record for a domain can cause problems with mail "
+"delivery and spam classification. Instead, we recommend using only one SPF "
+"record by modifying it to authorize Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:142
+msgid "How to choose between Odoo and my traditional email box"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:143
 msgid ""
 "Odoo Discuss is a perfect tool to send and read messages related to business"
-" objects. But it doesn't aim to replace a full-featured email software "
-"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
+" documents. However it doesn't aim to replace a full-featured email solution"
+" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
 "both systems without mingling them: What is related to Odoo business objects"
-" or applications goes into Odoo; What is not stays into your external email "
-"boxes."
+" or applications goes into Odoo; What is not can be managed into your "
+"external email box."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:95
+#: ../../discuss/email_servers.rst:150
 msgid ""
 "To do so, create specific email aliases to use in Odoo (to generate leads or"
 " opportunities, helpdesk tickets, etc.). If you take an email alias already "
 "used for messaging outside of Odoo, incoming messages will land into both "
-"systems. This will negatively impact your productivity when it comes to "
-"process them."
+"systems. This will negatively impact your productivity."
 msgstr ""
 
 #: ../../discuss/mail_twitter.rst:3

locale/fr/LC_MESSAGES/ecommerce.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Clo <clo@odoo.com>, 2017\n"
+"Last-Translator: Melanie Bernard <mbe@odoo.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -655,23 +655,21 @@ msgid "Launch my website"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience.rst:3
-msgid "Improve shopper experience"
+msgid "Get paid"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:3
-msgid "How to set up payment methods"
+msgid "How to get paid with payment acquirers"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:5
 msgid ""
-"To collect payments, you can either request your customers to process it "
-"manually (e.g. wire transfer) or redirect them to payment acquirers. The "
-"payment process described hereunder is common to both eCommerce and online "
-"quotations."
+"Odoo embeds several payment methods to get paid on eCommerce, Sales and "
+"Invoicing apps."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:10
-msgid "Payment methods"
+msgid "What are the payment methods available"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:13
@@ -681,451 +679,561 @@ msgstr ""
 #: ../../ecommerce/shopper_experience/payment.rst:15
 msgid ""
 "Wire Transfer is the default payment method available. The aim is providing "
-"your customers with your bank details so that they can pay via their bank. "
-"This is very easy to start with but slow and inefficient process-wise. Opt "
-"for online acquirers as soon as you can!"
+"your customers with your bank details so they can pay on their own via their"
+" bank. This is very easy to start with but slow and inefficient process-"
+"wise. Opt for online acquirers as soon as you can!"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:21
-msgid ""
-"For B2B users: you can create new manually-processed payment methods (check,"
-" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it."
+msgid "Payment acquirers"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:25
-msgid "Online payment acquirers"
+#: ../../ecommerce/shopper_experience/payment.rst:23
+msgid ""
+"Redirect your customers to payment platforms to collect money effortless and"
+" track the payment status (call-back). Odoo supports more and more platforms"
+" over time:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:27
-msgid ""
-"Redirect your customers to payment acquirer platforms to collect money "
-"effortless. Odoo supports more and more platforms over time: Paypal, "
-"Ingenico, Authorize.net, etc. Once the payment accepted, orders are "
-"confirmed in Odoo so that the delivery & invoicing processes are triggered "
-"automatically."
+msgid "`Paypal <paypal.html>`__"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:28
+msgid "Ingenico"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:29
+msgid "Authorize.net"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:30
+msgid "Adyen"
+msgstr "Adyen"
+
+#: ../../ecommerce/shopper_experience/payment.rst:31
+msgid "Buckaroo"
+msgstr "Buckaroo"
+
+#: ../../ecommerce/shopper_experience/payment.rst:32
+msgid "PayUmoney"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:33
-msgid "Custom (advanced)"
-msgstr ""
+msgid "Sips"
+msgstr "Sips"
 
-#: ../../ecommerce/shopper_experience/payment.rst:35
-msgid ""
-"Can be used to request payments to any payment acquirer not listed in Odoo."
+#: ../../ecommerce/shopper_experience/payment.rst:34
+msgid "Stripe"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:38
-msgid "Edit a payment method"
+msgid "How to go live"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:40
 msgid ""
-"To make payment methods intuitive for your customers feel free to customize "
-"them by editing:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:42
-msgid "the name,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:44
-msgid "the picture,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:46
-msgid ""
-"the notification messages (thank you & next step, error, cancellation)."
+"Once the payment method ready, make it visible in the payment interface and "
+"activate the **Production** mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:48
+msgid "How to let customers save and reuse credit cards"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:49
 msgid ""
-"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`"
-" to do so."
+"To ease the payment of returning customers, you can let them save and reuse "
+"a credit card if they want to. If so, a payment token will be saved in Odoo."
+" This option is available with Ingenico and Authorize.net."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:51
-msgid "Generic setup"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:53
-msgid "Review the elements here above."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:55
-msgid "Enter your credentials (online acquirers only)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:57
-msgid "Choose your order confirmation preference (see below)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:59
-msgid "Publish the payment method."
+#: ../../ecommerce/shopper_experience/payment.rst:54
+#: ../../ecommerce/shopper_experience/payment.rst:68
+msgid "You can turn this on from the acquirer configuration form."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:61
-msgid "Test the payment flow in *Test* mode (default mode)."
+msgid "How to debit credit cards to pay subscriptions"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:63
-msgid "Switch to *Production* mode."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:65
+#: ../../ecommerce/shopper_experience/payment.rst:62
 msgid ""
-"Se your default payment acquirer in :menuselection:`Accounting --> "
-"Configuration --> Settings`. It will be auto-selected for your customers "
-"when they enter the payment screen."
+"`Odoo Subscription <https://www.odoo.com/page/subscriptions>`__ allows to "
+"bill services automatically on a recurring basis. Along with it, you can "
+"have an automatic debit of the customer's credit card."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:69
+#: ../../ecommerce/shopper_experience/payment.rst:66
+msgid "This option is available with Ingenico and Authorize.net."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:73
 msgid ""
-"Rely on the documentation related to your payment acquirer to go through "
-"step 2, 5 and 6. Some acquirers provides you with specific credentials for "
-"test and production modes (Paypal). Others let you switch mode in their "
-"setup interface (Authorize.net)."
+"That way a payment token will be recorded when the customer goes for the "
+"subscription and an automatic debit will occur whenever an invoice is issued"
+" from the subscription."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:74
+#: ../../ecommerce/shopper_experience/payment.rst:79
+msgid "How to use other acquirers (advanced)"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:81
 msgid ""
-"With Ingenico and Authorize.net, you can let your customers save and reuse a"
-" payment card to accelerate the process on next checkouts. See *Store Card "
-"Data* in Configuration tab."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:78
-msgid "Payment flow"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:80
-msgid ""
-"When choosing the payment method, the customer is taken to the payment "
-"acquirer interface to process the payment."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:83
-msgid ""
-"Once done he is taken back to Odoo's confirmation page. The transaction "
-"status shows up:"
+"Odoo can submit single payment requests and redirect to any payment "
+"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction"
+" status. So you will confirm orders manually once you get paid."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:85
-msgid ""
-"*Pending*: the order will be confirmed as soon as you authorize the "
-"transaction in the acquirer interface."
+msgid "How to:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:87
-msgid "*Confirmed*: the payment has been authorized automatically."
+msgid "Switch to developer mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:89
-msgid ""
-"A confirmation email is sent to the customer with a copy of the order in "
-"pdf. It shows the payment status."
+msgid "Take the **Custom** payment method."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:91
-msgid "Launch the delivery and invoicing from:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:93
 msgid ""
-"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:95
-msgid ""
-"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales "
-"Orders`."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:97
-msgid ""
-"For internal tracking purposes, a link to the transaction status is provided"
-" in the sales order."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:100
-msgid ""
-"If the customer cancels the payment while on the payment acquirer form, it "
-"is taken back to the store page (or online quotation) in order to reprocess "
-"the order. The payment is marked as *Cancelled* in Odoo."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:105
-msgid ""
-"You can edit the confirmation email template from :menuselection:`Website "
-"Admin --> Configuration --> Settings`."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:109
-msgid "Order confirmation preferences"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:111
-msgid "There are 4 different behaviors available for any payment acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:114
-msgid "No automatic confirmation"
-msgstr "Pas de confirmation automatique"
-
-#: ../../ecommerce/shopper_experience/payment.rst:116
-msgid ""
-"This is the default mode for *Wire Transfer*. It means Odoo does not confirm"
-" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid "
-"Order*). Once you get the payment, you are expected to confirm the order "
-"manually to pursue the process (delivery, invoicing)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:121
-msgid ""
-"Authorize the amount and confirm the SO on acquirer confirmation (capture "
-"manually)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:123
-msgid ""
-"Odoo confirms the order as soon as the payment success notification comes "
-"in. To get the money however, you need to capture it from your payment "
-"transaction. In lots of countries you are indeed requested to deliver your "
-"goods before capturing the amount."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:128
-msgid ""
-"Authorize & capture the amount and confirm the SO on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:130
-msgid ""
-"This is the default mode for payment acquirers. The amount is captured "
-"automatically."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:133
-msgid ""
-"For B2B: if you use a manual payment method like *Wire Transfer* and don't "
-"expect any upfront payment to launch the delivery, switch to this mode as "
-"well."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:137
-msgid ""
-"Authorize & capture the amount, confirm the SO and auto-validate the invoice"
-" on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:139
-msgid ""
-"If you invoice upfront and not at the delivery, switch to this last mode to "
-"automate everything. You are requested to select a Payment Journal to record"
-" such payments (see "
-":doc:`../../accounting/receivables/customer_payments/credit_cards`)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:144
-msgid "Custom payment acquirers (advanced)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:146
-msgid ""
-"Odoo can submit payment requests and redirect to any payment acquirer. In "
-"such a case, you need to confirm the sale manually in Odoo once you get paid"
-" because Odoo cannot read any payment status sent by the acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:150
-msgid "To configure this:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:152
-msgid "switch to developer mode,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:154
-msgid "edit the *Custom* payment method,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:156
-msgid ""
-"set up the payment form (S2S Form Template) as instructed by your payment "
+"Set up the payment form (S2S Form Template) as instructed by your payment "
 "acquirer. You can start from *default_acquirer_button* that you can "
 "duplicate."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:160
-msgid "Recurring payments & Installment plans"
+#: ../../ecommerce/shopper_experience/payment.rst:96
+msgid "Other configurations"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:162
+#: ../../ecommerce/shopper_experience/payment.rst:98
 msgid ""
-"The Ingenico integration allows you to process and manage recurring payments"
-" from Odoo Subscriptions app out-of-the-box (more information coming soon)."
+"Odoo can also be used for more advanced payment processes like installment "
+"plans (e.g. `Paypal Installment Plans "
+"<https://developer.paypal.com/docs/classic/paypal-payments-standard"
+"/integration-guide/installment_buttons>`__)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:165
+#: ../../ecommerce/shopper_experience/payment.rst:102
 msgid ""
-"With some customization, Odoo can also trigger installment plans if this is "
-"permitted by your payment acquirer’s API:"
+"Such a customization service is made on-demand by our technical experts "
+"based on your own requirements. A business advisor can reach you out for "
+"such matter. `Contact us. <https://www.odoo.com/page/contactus>`__"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:168
-msgid ""
-"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic"
-"/paypal-payments-standard/integration-guide/installment_buttons)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:170
-msgid ""
-"Such a service is made on-demand by our technical experts based on your own "
-"requirements. Ask our business advisors at info@odoo.com."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:175
+#: ../../ecommerce/shopper_experience/payment.rst:109
 msgid ":doc:`paypal`"
 msgstr ":doc:`paypal`"
 
+#: ../../ecommerce/shopper_experience/payment.rst:110
+msgid ":doc:`wire_transfer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:111
+#: ../../ecommerce/shopper_experience/paypal.rst:155
+msgid ":doc:`payment_acquirer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3
+msgid "How to manage orders paid with payment acquirers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5
+msgid ""
+"Odoo confirms orders automatically as soon as the payment is authorized by a"
+" payment acquirer. This triggers the delivery. If you invoice based on "
+"ordered quantities, you are also requested to invoice the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12
+msgid "What are the payment status"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13
+msgid ""
+"At anytime, the salesman can check the transaction status from the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18
+msgid "*Draft*: transaction under processing."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20
+msgid ""
+"*Pending*: the payment acquirer keeps the transaction on hold and you need "
+"to authorize it from the acquirer interface."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23
+msgid ""
+"*Authorized*: the payment has been authorized but not yet captured. In Odoo,"
+" the order is already confirmed. Once the delivery done, you can capture the"
+" amount from the acquirer interface (or from Odoo if you use Authorize.net)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28
+msgid ""
+"*Done*: the payment is authorized and captured. The order has been "
+"confirmed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30
+msgid ""
+"*Error*: an error has occured during the transaction. The customer needs to "
+"retry the payment. The order is still in draft."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34
+msgid ""
+"*Cancelled*: when the customer cancels the payment in the payment acquirer "
+"form. They are taken back to Odoo in order to modify the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37
+msgid ""
+"Specific messages are provided to your customers for every payment status, "
+"when they are redirected to Odoo after the transaction. To edit such "
+"messages, go to the *Messages* tab of the payment method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44
+msgid "Auto-validate invoices at order"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46
+msgid ""
+"When the order is confirmed you can also have an invoice automatically "
+"issued and paid. This fully-automated made for businesses that invoice "
+"orders straight on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53
+msgid ""
+"If you choose this mode you are requested to select a payment journal in "
+"order to record payments in your books. This payment is automatically "
+"reconcilied with the invoice, marking it as paid. Select your **bank "
+"account** if you get paid immediately on your bank account. If you don't you"
+" can create a specific journal for the payment acquirer (type = Bank). That "
+"way, you can track online payments in an intermediary account of your books "
+"until you get paid into your bank account (see `How to register credit card "
+"payments "
+"<../../accounting/receivables/customer_payments/credit_cards.html>`__)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64
+msgid "Capture the payment after the delivery"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65
+msgid ""
+"With this mode, the order is confirmed but the amount is kept on hold. Once "
+"the delivery processed, you can capture the payment from Odoo. This mode is "
+"only available with Authorize.net."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72
+msgid ""
+"To capture the payment, open the transaction from the order. Then click "
+"*Capture Transaction*."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78
+msgid ""
+"With other payment acquirers, you can manage the capture in their own "
+"interfaces, not from Odoo."
+msgstr ""
+
 #: ../../ecommerce/shopper_experience/paypal.rst:3
-msgid "How to collect payments with Paypal"
+msgid "How to get paid with Paypal"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:5
 msgid ""
-"Paypal is the easiest payment method to configure. It is also the only one "
-"without any subscription free."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/paypal.rst:9
-msgid "Setup your Paypal account"
+"Paypal is the easiest online payment method to configure. It is also the "
+"only one without any subscription free. We definitely advise it to any "
+"starter."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:11
-msgid ""
-"1. Create a business account at Paypal.com (see: https://www.paypal.com/in"
-"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-"
-"outside) or upgrade your account to Business account (merchant) if you have "
-"a basic account."
+msgid "Set up your Paypal account"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:15
+#: ../../ecommerce/shopper_experience/paypal.rst:13
 msgid ""
-"2. Log in to your account at Paypal.com and go to :menuselection:`My Account"
-" --> Profile --> My Selling Tools`. There click *PayPal button language "
-"encoding* under *More Selling Tools* section. Then, click *More Options* and"
-" replace the two default encoding formats by *UTF-8*."
+"Create a `Paypal Business Account <https://www.paypal.com>`__ or upgrade "
+"your account to *Business account* if you have a basic account."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:20
-msgid "Open Paypal setup form in Odoo and enter your *Email ID*."
+#: ../../ecommerce/shopper_experience/paypal.rst:16
+msgid ""
+"Log in to `Paypal <https://www.paypal.com>`__ and open the settings of your "
+"**Profile**."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:22
-msgid ""
-"4. The Paypal Merchant ID is not mandatory (extra verification level). It is"
-" provided in Paypal under :menuselection:`My Account --> Overview`."
+msgid "Now enter the menu **My selling tools**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:25
-msgid ""
-"5. Configure the IPN feedback (Paypal contacting your Odoo instance without "
-"needing the redirection). The setting can be found in "
-":menuselection:`Profile --> My Selling Tools --> Instant payment "
-"notification`. Activate it and set it to "
-"<odoo_instance_url>/payment/paypal/ipn."
+#: ../../ecommerce/shopper_experience/paypal.rst:27
+msgid "Let's start with the **Website Preferences**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:30
+#: ../../ecommerce/shopper_experience/paypal.rst:29
 msgid ""
-"6. To test the workflow, you can create sandbox accounts by logging in at "
-"https://developer.paypal.com/webapps/developer/applications/myapps with the "
-"same Paypal credentials. Two default sandbox accounts are automatically "
-"generated when you register to Paypal: one is a buyer, the  other is a "
-"shopper."
+"Turn on **Auto Return** and enter the **Return URL**: "
+"<odoo_instance_url>/shop/confirmation. Verify that this address uses the "
+"correct protocol (HTTP/HTTPS)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:35
+#: ../../ecommerce/shopper_experience/paypal.rst:36
 msgid ""
-"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com "
-"(same password than real account) and apply the same format change."
+"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is "
+"generated. You will be later requested to enter it in Odoo."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:39
+#: ../../ecommerce/shopper_experience/paypal.rst:43
 msgid ""
-"To automatically redirect your customers when the payment is completed, go "
-"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to "
-"<odoo_instance_url>/shop/confirmation. Verify that your *Notify URL* uses "
-"the correct protocol (HTTP/HTTPS)."
+"Then, get back to your profile to activate the **Instant Payment "
+"Notification (IPN)** in *My selling tools*."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:44
-msgid ""
-"If you want your customers to pay without creating a Paypal account, *Paypal"
-" Account Optional* needs to be turned on."
+#: ../../ecommerce/shopper_experience/paypal.rst:46
+msgid "Enter the **Notification URL**: <odoo_instance_url>/payment/paypal/ipn"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:48
+#: ../../ecommerce/shopper_experience/paypal.rst:51
+msgid ""
+"Now you must change the encoding format of the payment request sent by Odoo "
+"to Paypal. To do so, get back to *My selling tools* and click **PayPal "
+"button language encoding** in *More Selling Tools* section."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:58
+msgid ""
+"Then, click *More Options* and set the two default encoding formats as "
+"**UTF-8**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:66
+msgid ""
+"If you want your customers to pay without creating a Paypal account, "
+"**Paypal Account Optional** needs to be turned on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:74
+msgid "Set up Paypal's payment method in Odoo"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:75
+msgid ""
+"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->"
+" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your "
+"**Merchant ID** and check **Use IPN**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:82
+msgid ""
+"They are both provided in your Paypal profile, under :menuselection:`My "
+"business info`."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:85
+msgid ""
+"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so,"
+" open the *Settings* and activate the **Developer Mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:91
+msgid ""
+"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System"
+" Parameters` and create a parameter with following values:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:94
+msgid "Key: payment_paypal.pdt_token"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:95
+msgid "Value: your Paypal *Identity Token*"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:102
+msgid "Go live"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:103
+msgid ""
+"Your configuration is now ready! You can make Paypal visible on your "
+"merchant interface and activate the **Production mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:112
 msgid "Transaction fees"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:50
+#: ../../ecommerce/shopper_experience/paypal.rst:114
 msgid ""
 "You can charge an extra to the customer to cover the transaction fees Paypal"
 " charges you. Once redirected to Paypal, your customer sees an extra applied"
 " to the order amount."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:53
+#: ../../ecommerce/shopper_experience/paypal.rst:117
 msgid ""
-"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. "
-"Default fees are the ones charged by Paypal."
+"To activate this, go to the *Configuration* tab of Paypal config form in "
+"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:123
+msgid ""
+"To apply the right fees for your country, please refer to `Paypal Fees "
+"<https://www.paypal.com/webapps/mpp/paypal-fees>`__."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:128
+msgid "Test the payment flow"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:130
+msgid ""
+"You can test the entire payment flow thanks to Paypal Sandbox accounts."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:132
+msgid ""
+"Log in to `Paypal Developer Site <https://developer.paypal.com>`__ with your"
+" Paypal credentials. This will create two sandbox accounts:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:136
+msgid ""
+"A business account (to use as merchant, e.g. "
+"pp.merch01-facilitator@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:137
+msgid ""
+"A default personal account (to use as shopper, e.g. "
+"pp.merch01-buyer@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:139
+msgid ""
+"Log in to `Paypal Sandbox <https://www.sandbox.paypal.com>`__ with the "
+"merchant account and follow the same configuration instructions."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:142
+msgid ""
+"Enter your sandbox credentials in Odoo and make sure Paypal is still set on "
+"*Test* mode. Also, make sure the confirmation mode of Paypal is not "
+"*Authorize & capture the amount, confirm the SO and auto-validate the "
+"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be "
+"automatically generated when the transaction is completed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:150
+msgid "Run a test transaction from Odoo using the sandbox personal account."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:154
+msgid ":doc:`payment`"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:3
-msgid "How customers can access their portal"
+msgid "How customers can access their customer account"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:5
 msgid ""
-"It has never been so easy for your customers to access their documents "
-"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC."
-" With eCommerce and Online Quotation apps, your customers are requested to "
-"create a portal account (name, email, password only) from the very first "
-"order confirmation or online quotation email they get from you."
+"It has never been so easy for your customers to access their customer "
+"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are"
+" suggested to sign up (name, email, password) when the order is placed, and "
+"not before. Indeed, nothing is more annoying than going through a signup "
+"process before buying something."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:12
+#: ../../ecommerce/shopper_experience/portal.rst:14
 msgid "Sign up"
 msgstr "S'enregistrer"
 
-#: ../../ecommerce/shopper_experience/portal.rst:14
+#: ../../ecommerce/shopper_experience/portal.rst:16
 msgid ""
-"When clicking the link in the email or when clicking *Sign up* in the "
-"checkout process, your customer is directed to the *Sign up* page."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/portal.rst:21
-msgid "Customer account"
+"The invitation to sign up shows up when the customer wants to visualize the "
+"order from order confirmation email."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:23
+msgid "Customer account"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/portal.rst:25
 msgid ""
-"Once logged in the customer will access his account by clicking *My Account*"
+"Once logged in the customer will access the account by clicking *My Account*"
 " in the login dropdown menu."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:29
+#: ../../ecommerce/shopper_experience/portal.rst:31
 msgid ""
-"From the portal menu all the customer history can be reviewed. The main "
-"address (billing) can also be modified."
+"THere they find all their history. The main address (billing) can also be "
+"modified."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:36
+#: ../../ecommerce/shopper_experience/portal.rst:37
 msgid ""
-"If a portal user is a contact of a company (*Company* field set in customer "
-"detail form), this last will see all the documents of the company and all "
-"its other contacts through the portal."
+"If the customer is set as a contact of a company in your address book, they "
+"will see all the documents whose the customer belongs to this company."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:3
+msgid "How to get paid with wire transfers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:5
+msgid ""
+"**Wire Transfer** is the default payment method available. The aim is "
+"providing your customers with your bank details so they can pay on their "
+"own. This is very easy to start with but slow and inefficient process-wise. "
+"Opt for payment acquirers as soon as you can!"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:13
+msgid "How to provide customers with payment instructions"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:14
+msgid ""
+"Put your payment instructions in the **Thanks Message** of your payment "
+"method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:19
+msgid "They will appear to the customers when they place an order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:26
+msgid "How to manage an order once you get paid"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:28
+msgid ""
+"Whenever a customer pays by wire transfer, the order stays in an "
+"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get "
+"paid, you confirm the order manually to launch the delivery."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:35
+msgid "How to create other manual payment methods"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:37
+msgid ""
+"If you manage a B2B business, you can create other manually-processed "
+"payment methods like paying by check. To do so, just rename *Wire Transfer* "
+"or duplicate it."
 msgstr ""
 
 #: ../../ecommerce/taxes.rst:3

locale/fr/LC_MESSAGES/general.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -23,8 +23,8 @@ msgid "General"
 msgstr "Général"
 
 #: ../../general/auth.rst:3
-msgid "Authentification"
-msgstr ""
+msgid "Authentication"
+msgstr "Authentification"
 
 #: ../../general/auth/google.rst:3
 msgid "How to allow users to sign in with their Google account"
@@ -84,64 +84,196 @@ msgid ""
 msgstr ""
 
 #: ../../general/base_import.rst:3
-msgid "BASE IMPORT"
+msgid "Data Import"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:3
+msgid "How to adapt an import template"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:5
+msgid ""
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:11
+msgid "How to customize the file"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:13
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:15
+#: ../../general/base_import/import_faq.rst:26
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:20
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field of the system. If so, find the "
+"corresponding field using the search."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:27
+msgid ""
+"Then, use the label you found in your import template in order to make it "
+"work straight away the very next time you try to import."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:31
+msgid "Why an “ID” column"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:33
+msgid ""
+"The **ID** (External ID) is an unique identifier for the line item. Feel "
+"free to use the one of your previous software to ease the transition to "
+"Odoo."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:36
+msgid ""
+"Setting an ID is not mandatory when importing but it helps in many cases:"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:38
+msgid ""
+"Update imports: you can import the same file several times without creating "
+"duplicates;"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:39
+msgid "Import relation fields (see here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:42
+msgid "How to import relation fields"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:44
+msgid ""
+"An Odoo object is always related to many other objects (e.g. a product is "
+"linked to product categories, attributes, vendors, etc.). To import those "
+"relations you need to import the records of the related object first from "
+"their own list menu."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:48
+msgid ""
+"You can do it using either the name of the related record or its ID. The ID "
+"is expected when two records have the same name. In such a case add \" / "
+"ID\" at the end of the column title (e.g. for product attributes: Product "
+"Attributes / Attribute / ID)."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:3
-msgid "Import CSV file to Odoo"
+msgid "How to import data into Odoo"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:8
-msgid "Frequently Asked Questions"
-msgstr "Foire aux questions"
+#: ../../general/base_import/import_faq.rst:6
+msgid "How to start"
+msgstr ""
 
-#: ../../general/base_import/import_faq.rst:12
-msgid "Need to import data from an other application?"
-msgstr "Besoin d'importer des données d'une autre application ?"
-
-#: ../../general/base_import/import_faq.rst:14
+#: ../../general/base_import/import_faq.rst:7
 msgid ""
-"In order to re-create relationships between different records, you should "
-"use the unique identifier from the original application and map it to the "
-"**ID** (External ID) column in Odoo. When you import an other record that "
-"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
-"unique identifier."
+"You can import data on any Odoo's business object using either Excel (.xlsx)"
+" or CSV (.csv) formats: contacts, products, bank statements, journal entries"
+" and even orders!"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:11
+msgid "Open the view of the object you want to populate and click *Import*."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:16
 msgid ""
-"The **ID** (External ID) will also be used to update the original import if "
-"you need to re-import modified data later, it's thus good practice to "
-"specify it whenever possible."
+"There you are provided with templates you can easily populate with your own "
+"data. Such templates can be imported in one click; The data mapping is "
+"already done."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:21
-msgid "I cannot find the field I want to map my column to?"
+#: ../../general/base_import/import_faq.rst:22
+msgid "How to adapt the template"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:23
-msgid ""
-"Odoo try to find with some heuristic, based on the first ten lines of the "
-"files, the type of field for each columns inside your file. For example if "
-"you have a column only containing numbers, only the fields that are of type "
-"integer will be displayed for you to choose from. While this behaviour might"
-" be good and easy for most cases scenarios, it is also possible that it goes"
-" wrong sometimes or that you want to map your column to a field that is not "
-"proposed by default."
+#: ../../general/base_import/import_faq.rst:24
+msgid "Add, remove and sort columns to fit at best your data structure."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:25
-msgid ""
-"If that happens, you just have to check the **Show all fields for completion"
-" (advanced)** option, you will then be able to choose from the complete list"
-" of fields for each columns."
+msgid "We advise to not remove the **ID** one (see why in the next section)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:30
+#: ../../general/base_import/import_faq.rst:31
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field in Odoo. Don't worry! You can map new "
+"columns manually when you test the import. Search the list for the "
+"corresponding field."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:39
+msgid ""
+"Then, use this field's label in your file in order to make it work straight "
+"on the very next time."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:44
+msgid "How to import from another application"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:46
+msgid ""
+"In order to re-create relationships between different records, you should "
+"use the unique identifier from the original application and map it to the "
+"**ID** (External ID) column in Odoo. When you import another record that "
+"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
+"unique identifier. You can also find this record using its name but you will"
+" be stuck if at least 2 records have the same name."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:54
+msgid ""
+"The **ID** will also be used to update the original import if you need to "
+"re-import modified data later, it's thus good practice to specify it "
+"whenever possible."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:60
+msgid "I cannot find the field I want to map my column to"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:62
+msgid ""
+"Odoo tries to find with some heuristic, based on the first ten lines of the "
+"files, the type of field for each column inside your file. For example if "
+"you have a column only containing numbers, only the fields that are of type "
+"*Integer* will be displayed for you to choose from. While this behavior "
+"might be good and easy for most cases, it is also possible that it goes "
+"wrong or that you want to map your column to a field that is not proposed by"
+" default."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:71
+msgid ""
+"If that happens, you just have to check the ** Show fields of relation "
+"fields (advanced)** option, you will then be able to choose from the "
+"complete list of fields for each column."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:79
 msgid "Where can I change the date import format?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:32
+#: ../../general/base_import/import_faq.rst:81
 msgid ""
 "Odoo can automatically detect if a column is a date and it will try to guess"
 " the date format from a set of most used date format. While this process can"
@@ -151,7 +283,7 @@ msgid ""
 " day and which one is the month in a date like '01-03-2016'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:34
+#: ../../general/base_import/import_faq.rst:83
 msgid ""
 "To view which date format Odoo has found from your file you can check the "
 "**Date Format** that is shown when clicking on **Options** under the file "
@@ -159,7 +291,7 @@ msgid ""
 " the *ISO 8601* to define the format."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:37
+#: ../../general/base_import/import_faq.rst:86
 msgid ""
 "If you are importing an excel (.xls, .xlsx) file, you can use date cells to "
 "store dates as the display of dates in excel is different from the way it is"
@@ -167,11 +299,11 @@ msgid ""
 "whatever your locale date format is."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:42
+#: ../../general/base_import/import_faq.rst:91
 msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:44
+#: ../../general/base_import/import_faq.rst:93
 msgid ""
 "Yes, we fully support numbers with parenthesis to represent negative sign as"
 " well as numbers with currency sign attached to them. Odoo also "
@@ -181,56 +313,56 @@ msgid ""
 "crash."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:46
+#: ../../general/base_import/import_faq.rst:95
 msgid ""
 "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:48
+#: ../../general/base_import/import_faq.rst:97
 msgid "32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:49
+#: ../../general/base_import/import_faq.rst:98
 msgid "32000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:50
+#: ../../general/base_import/import_faq.rst:99
 msgid "32,000.00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:51
+#: ../../general/base_import/import_faq.rst:100
 msgid "-32000.00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:52
+#: ../../general/base_import/import_faq.rst:101
 msgid "(32000.00)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:53
+#: ../../general/base_import/import_faq.rst:102
 msgid "$ 32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:54
+#: ../../general/base_import/import_faq.rst:103
 msgid "(32000.00 €)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:56
+#: ../../general/base_import/import_faq.rst:105
 msgid "Example that will not work:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:58
+#: ../../general/base_import/import_faq.rst:107
 msgid "ABC 32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:59
+#: ../../general/base_import/import_faq.rst:108
 msgid "$ (32.000,00)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:64
+#: ../../general/base_import/import_faq.rst:113
 msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:66
+#: ../../general/base_import/import_faq.rst:115
 msgid ""
 "By default the Import preview is set on commas as field separators and "
 "quotation marks as text delimiters. If your csv file does not have these "
@@ -238,20 +370,20 @@ msgid ""
 " CSV file bar after you select your file)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:68
+#: ../../general/base_import/import_faq.rst:117
 msgid ""
 "Note that if your CSV file has a tabulation as separator, Odoo will not "
 "detect the separations. You will need to change the file format options in "
 "your spreadsheet application. See the following question."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:73
+#: ../../general/base_import/import_faq.rst:122
 msgid ""
 "How can I change the CSV file format options when saving in my spreadsheet "
 "application?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:75
+#: ../../general/base_import/import_faq.rst:124
 msgid ""
 "If you edit and save CSV files in speadsheet applications, your computer's "
 "regional settings will be applied for the separator and delimiter. We "
@@ -260,17 +392,17 @@ msgid ""
 "filter settings' > Save)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:77
+#: ../../general/base_import/import_faq.rst:126
 msgid ""
 "Microsoft Excel will allow you to modify only the encoding when saving (in "
 "'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:82
+#: ../../general/base_import/import_faq.rst:131
 msgid "What's the difference between Database ID and External ID?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:84
+#: ../../general/base_import/import_faq.rst:133
 msgid ""
 "Some fields define a relationship with another object. For example, the "
 "country of a contact is a link to a record of the 'Country' object. When you"
@@ -280,58 +412,58 @@ msgid ""
 "import."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:86
+#: ../../general/base_import/import_faq.rst:135
 msgid ""
 "For example, to reference the country of a contact, Odoo proposes you 3 "
 "different fields to import:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:88
+#: ../../general/base_import/import_faq.rst:137
 msgid "Country: the name or code of the country"
 msgstr "Pays : le nom ou code du pays"
 
-#: ../../general/base_import/import_faq.rst:89
+#: ../../general/base_import/import_faq.rst:138
 msgid ""
 "Country/Database ID: the unique Odoo ID for a record, defined by the ID "
 "postgresql column"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:90
+#: ../../general/base_import/import_faq.rst:139
 msgid ""
 "Country/External ID: the ID of this record referenced in another application"
 " (or the .XML file that imported it)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:92
+#: ../../general/base_import/import_faq.rst:141
 msgid "For the country Belgium, you can use one of these 3 ways to import:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:94
+#: ../../general/base_import/import_faq.rst:143
 msgid "Country: Belgium"
 msgstr "Pays : Belgique"
 
-#: ../../general/base_import/import_faq.rst:95
+#: ../../general/base_import/import_faq.rst:144
 msgid "Country/Database ID: 21"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:96
+#: ../../general/base_import/import_faq.rst:145
 msgid "Country/External ID: base.be"
 msgstr "Pays/Id. externe: base.be"
 
-#: ../../general/base_import/import_faq.rst:98
+#: ../../general/base_import/import_faq.rst:147
 msgid ""
 "According to your need, you should use one of these 3 ways to reference "
 "records in relations. Here is when you should use one or the other, "
 "according to your need:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:100
+#: ../../general/base_import/import_faq.rst:149
 msgid ""
 "Use Country: This is the easiest way when your data come from CSV files that"
 " have been created manually."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:101
+#: ../../general/base_import/import_faq.rst:150
 msgid ""
 "Use Country/Database ID: You should rarely use this notation. It's mostly "
 "used by developers as it's main advantage is to never have conflicts (you "
@@ -339,13 +471,13 @@ msgid ""
 "Database ID)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:102
+#: ../../general/base_import/import_faq.rst:151
 msgid ""
 "Use Country/External ID: Use External ID when you import data from a third "
 "party application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:104
+#: ../../general/base_import/import_faq.rst:153
 msgid ""
 "When you use External IDs, you can import CSV files with the \"External ID\""
 " column to define the External ID of each record you import. Then, you will "
@@ -354,23 +486,23 @@ msgid ""
 "Products and their Categories."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:106
+#: ../../general/base_import/import_faq.rst:155
 msgid ""
 "`CSV file for categories "
 "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:108
+#: ../../general/base_import/import_faq.rst:157
 msgid ""
 "`CSV file for Products "
 "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:112
+#: ../../general/base_import/import_faq.rst:161
 msgid "What can I do if I have multiple matches for a field?"
 msgstr "Que puis-je faire si j'ai plusieurs correspondances pour un champ ?"
 
-#: ../../general/base_import/import_faq.rst:114
+#: ../../general/base_import/import_faq.rst:163
 msgid ""
 "If for example you have two product categories with the child name "
 "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other "
@@ -381,20 +513,20 @@ msgid ""
 "the duplicates' values or your product category hierarchy."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:116
+#: ../../general/base_import/import_faq.rst:165
 msgid ""
 "However if you do not wish to change your configuration of product "
 "categories, we recommend you use make use of the external ID for this field "
 "'Category'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:121
+#: ../../general/base_import/import_faq.rst:170
 msgid ""
 "How can I import a many2many relationship field (e.g. a customer that has "
 "multiple tags)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:123
+#: ../../general/base_import/import_faq.rst:172
 msgid ""
 "The tags should be separated by a comma without any spacing. For example, if"
 " you want your customer to be linked to both tags 'Manufacturer' and "
@@ -402,19 +534,19 @@ msgid ""
 " of your CSV file."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:125
+#: ../../general/base_import/import_faq.rst:174
 msgid ""
 "`CSV file for Manufacturer, Retailer "
 "<../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:130
+#: ../../general/base_import/import_faq.rst:179
 msgid ""
 "How can I import a one2many relationship (e.g. several Order Lines of a "
 "Sales Order)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:132
+#: ../../general/base_import/import_faq.rst:181
 msgid ""
 "If you want to import sales order having several order lines; for each order"
 " line, you need to reserve a specific row in the CSV file. The first order "
@@ -425,41 +557,41 @@ msgid ""
 "you can import, based on demo data."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:135
+#: ../../general/base_import/import_faq.rst:184
 msgid ""
 "`File for some Quotations "
 "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:137
+#: ../../general/base_import/import_faq.rst:186
 msgid ""
 "The following CSV file shows how to import purchase orders with their "
 "respective purchase order lines:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:139
+#: ../../general/base_import/import_faq.rst:188
 msgid ""
 "`Purchase orders with their respective purchase order lines "
 "<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:141
+#: ../../general/base_import/import_faq.rst:190
 msgid ""
 "The following CSV file shows how to import customers and their respective "
 "contacts:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:143
+#: ../../general/base_import/import_faq.rst:192
 msgid ""
 "`Customers and their respective contacts "
 "<../../_static/example_files/o2m_customers_contacts.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:148
+#: ../../general/base_import/import_faq.rst:197
 msgid "Can I import several times the same record?"
 msgstr "Puis-je importer plusieurs fois le même enregistrement ?"
 
-#: ../../general/base_import/import_faq.rst:150
+#: ../../general/base_import/import_faq.rst:199
 msgid ""
 "If you import a file that contains one of the column \"External ID\" or "
 "\"Database ID\", records that have already been imported will be modified "
@@ -469,17 +601,17 @@ msgid ""
 "depending if it's new or not."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:152
+#: ../../general/base_import/import_faq.rst:201
 msgid ""
 "This feature allows you to use the Import/Export tool of Odoo to modify a "
 "batch of records in your favorite spreadsheet application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:157
+#: ../../general/base_import/import_faq.rst:206
 msgid "What happens if I do not provide a value for a specific field?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:159
+#: ../../general/base_import/import_faq.rst:208
 msgid ""
 "If you do not set all fields in your CSV file, Odoo will assign the default "
 "value for every non defined fields. But if you set fields with empty values "
@@ -487,11 +619,11 @@ msgid ""
 "assigning the default value."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:164
+#: ../../general/base_import/import_faq.rst:213
 msgid "How to export/import different tables from an SQL application to Odoo?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:166
+#: ../../general/base_import/import_faq.rst:215
 msgid ""
 "If you need to import data from different tables, you will have to recreate "
 "relations between records belonging to different tables. (e.g. if you import"
@@ -499,7 +631,7 @@ msgid ""
 "person and the company they work for)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:168
+#: ../../general/base_import/import_faq.rst:217
 msgid ""
 "To manage relations between tables, you can use the \"External ID\" "
 "facilities of Odoo. The \"External ID\" of a record is the unique identifier"
@@ -509,7 +641,7 @@ msgid ""
 "'company_1', 'person_1' instead of '1')"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:170
+#: ../../general/base_import/import_faq.rst:219
 msgid ""
 "As an example, suppose you have a SQL database with two tables you want to "
 "import: companies and persons. Each person belong to one company, so you "
@@ -519,27 +651,27 @@ msgid ""
 "PostgreSQL database</a>)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:172
+#: ../../general/base_import/import_faq.rst:221
 msgid ""
 "We will first export all companies and their \"External ID\". In PSQL, write"
 " the following command:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:178
+#: ../../general/base_import/import_faq.rst:227
 msgid "This SQL command will create the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:185
+#: ../../general/base_import/import_faq.rst:234
 msgid ""
 "To create the CSV file for persons, linked to companies, we will use the "
 "following SQL command in PSQL:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:191
+#: ../../general/base_import/import_faq.rst:240
 msgid "It will produce the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:199
+#: ../../general/base_import/import_faq.rst:248
 msgid ""
 "As you can see in this file, Fabien and Laurence are working for the Bigees "
 "company (company_1) and Eric is working for the Organi company. The relation"
@@ -549,7 +681,7 @@ msgid ""
 " who shared the same ID 1 in the orignial database)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:201
+#: ../../general/base_import/import_faq.rst:250
 msgid ""
 "The two files produced are ready to be imported in Odoo without any "
 "modifications. After having imported these two CSV files, you will have 4 "

locale/fr/LC_MESSAGES/inventory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xavier Belmere <Info@cartmeleon.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -789,6 +789,10 @@ msgstr ""
 "réapprovisionnement`. Là, cliquez sur **Créer** pour définir les valeurs de "
 "stock minimum et maximum pour un article donné."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Active"
+msgstr "Actif"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
@@ -797,11 +801,19 @@ msgstr ""
 "Si le champ \"Actif\" n'est pas coché, cela vous permettra de cacher les "
 "points de commande sans les supprimer."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Product Unit of Measure"
+msgstr "Unité de mesure d'article"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
 "Unité de mesure par défaut utilisée pour toutes les opérations de stock"
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Procurement Group"
+msgstr "Groupe d'approvisionnement"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Moves created through this orderpoint will be put in this procurement group."
@@ -813,6 +825,10 @@ msgstr ""
 " les règles d'approvisionnement seront regroupés en une seule grande "
 "préparation."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Minimum Quantity"
+msgstr "Quantité minimum"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity specified for this field,"
@@ -823,6 +839,10 @@ msgstr ""
 " champ, Odoo génère un approvisionnement pour ramener la quantité prévue à "
 "la quantité maxi."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Maximum Quantity"
+msgstr "Quantité maximale"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity, Odoo generates a "
@@ -833,6 +853,10 @@ msgstr ""
 "approvisionnement pour ramener la quantité prévue à la quantité indiquée "
 "ici."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Quantity Multiple"
+msgstr "Quantité multiple de"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "The procurement quantity will be rounded up to this multiple.  If it is 0, "
@@ -841,6 +865,10 @@ msgstr ""
 "La quantité à approvisionner sera arrondie à ce multiple. S'il est à 0, la "
 "quantité exacte sera utilisée."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Lead Time"
+msgstr "Délai"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Number of days after the orderpoint is triggered to receive the products or "

locale/fr/LC_MESSAGES/point_of_sale.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: matthieu gaillet <matthieu.gaillet@lebrass.be>, 2017\n"
+"Last-Translator: Adriana Ierfino <adriana.ierfino@savoirfairelinux.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1975,19 +1975,35 @@ msgid ""
 "location,..."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Point of Sale Name"
+msgstr "Nom du point de vente"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "An internal identification of the point of sale"
 msgstr "Une identification interne du point de vente"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Journal"
+msgstr "Journal de ventes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to post sales entries."
 msgstr ""
 "Journal de comptabilité utilisé pour enregistrer des écritures de vente."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoice Journal"
+msgstr "Journal de facturation"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to create invoices."
 msgstr "Journal des comptes utilisé pour la création de factures."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Group Journal Items"
+msgstr "Regrouper les éléments du journal"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Check this if you want to group the Journal Items by Product while closing a"
@@ -1996,6 +2012,10 @@ msgstr ""
 "Coché si vous voulez regrouper les éléments du journal par article lors de "
 "la fermeture d'une session."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcodes"
+msgstr "Codes-barres"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Defines what kind of barcodes are available and how they are assigned to "
@@ -2004,6 +2024,10 @@ msgstr ""
 "Definis quel type de code-barres sont disponibles et comment ils sont "
 "attribués aux produits, clients, et caissiers"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Order IDs Sequence"
+msgstr "Séquence des id. commandes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "This sequence is automatically created by Odoo but you can change it to "
@@ -2012,19 +2036,35 @@ msgstr ""
 "Cette séquence est créée automatiquement par Odoo, mais vous pouvez la "
 "changer pour personnaliser les références de vos commandes."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Channel"
+msgstr ""
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "This Point of sale's sales will be related to this Sales Channel."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Virtual KeyBoard"
+msgstr "Clavier virtuel"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables an integrated Virtual Keyboard"
 msgstr "Active le clavier virtuel intégré"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoicing"
+msgstr "Facturation"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables invoice generation from the Point of Sale"
 msgstr ""
 "Active la possibilité de générer des factures depuis le point de vente"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Prefill Cash Payment"
+msgstr "Pré-remplir le paiement en espèce"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The payment input will behave similarily to bank payment input, and will be "
@@ -2033,6 +2073,10 @@ msgstr ""
 "Ce paiement agira comme un paiement banquaire, et sera pré-rempli avec le "
 "montant exact "
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Start Category"
+msgstr "Catégorie de départ"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The point of sale will display this product category by default. If no "
@@ -2042,6 +2086,10 @@ msgstr ""
 " catégorie n'est pas spécifiée, tous les produits disponibles seront "
 "montrés. "
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Tip Product"
+msgstr "Produit pour pourboire"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The product used to encode the customer tip. Leave empty if you do not "
@@ -2050,6 +2098,10 @@ msgstr ""
 "Le produit utilisé pour encore le pourboire du client. Laissez vide si vous "
 "n'acceptez pas les pourboires."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Include Taxes in Prices"
+msgstr "Inclure les taxes dans les prix"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The displayed prices will always include all taxes, even if the taxes have "
@@ -2058,14 +2110,26 @@ msgstr ""
 "Les prix affichés contiendrons toujours toutes les taxes, même si les taxes "
 "ont été mises en place différemment"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Large Scrollbars"
+msgstr "Barres de défilement larges"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "For imprecise industrial touchscreens"
 msgstr "Pour les écrans tactiles industriels non-précis"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Display Category Pictures"
+msgstr "Afficher les photos des catégories"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The product categories will be displayed with pictures."
 msgstr "Les catégories de produits seront affichées avec des photos. "
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "IP Address"
+msgstr "Adresse IP"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The hostname or ip address of the hardware proxy, Will be autodetected if "
@@ -2074,28 +2138,52 @@ msgstr ""
 "Nom d'hôte ou adresse IP du proxy matériel. Laissez vide pour utiliser "
 "l'autodétection."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcode Scanner"
+msgstr "Lecteur de code-barres"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enable barcode scanning with a remotely connected barcode scanner"
 msgstr ""
 "Permet de scanner un code-barre avec un scanner de code-barre connecté sans-"
 "fil."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Electronic Scale"
+msgstr "Balance électronique"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Electronic Scale integration"
 msgstr "Active l'interface avec une balance électronique"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cashdrawer"
+msgstr "Tiroir-caisse"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Automatically open the cashdrawer"
 msgstr "Ouvre automatiquement le tiroir-caisse"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Receipt Printer"
+msgstr "Imprimante du reçu"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Bypass browser printing and prints via the hardware proxy"
 msgstr "Impression via le posbox"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Automatic Receipt Printing"
+msgstr "Impression automatique du reçu"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The receipt will automatically be printed at the end of each order"
 msgstr "Le reçu sera automatiquement imprimé à la fin de chaque commande. "
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Skip Receipt Screen"
+msgstr "Passer l'écran du reçu"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The receipt screen will be skipped if the receipt can be printed "
@@ -2103,31 +2191,59 @@ msgid ""
 msgstr ""
 "L'écran de reçu sera passé si le reçu peut être imprimé automatiquement. "
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Header"
+msgstr "Entête"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a header in the printed receipt"
 msgstr "Un texte court qui sera inséré comme en-tête dans le ticket de reçu"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Footer"
+msgstr "Bas de page"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a footer in the printed receipt"
 msgstr ""
 "Un texte court qui sera inséré comme pied de page dans le ticket de reçu"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cash Control"
+msgstr "Contrôle de caisse"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Check the amount of the cashbox at opening and closing."
 msgstr "Contrôle de caisse à l'ouverture et à la fermeture."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Splitting"
+msgstr "Partage d'addition"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Bill Splitting in the Point of Sale"
 msgstr "Autoriser le partage d'addition en Point de Vente"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Printing"
+msgstr "Impression de la Facture"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allows to print the Bill before payment"
 msgstr "Autoriser l'impression de la facture avant le paiement"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Orderline Notes"
+msgstr "Notes de commandes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allow custom notes on Orderlines"
 msgstr "Autoriser les notes personnalisées sur les lignes de commande"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Restaurant Floors"
+msgstr "Plans du restaurant"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The restaurant floors served by this point of sale"
 msgstr "Les étages du restaurant servis par ce point de vente"
@@ -2881,12 +2997,20 @@ msgid ""
 "all products or only on specific ones. Click on **Add an item**."
 msgstr ""
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Active"
+msgstr "Actif"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
 msgstr ""
 "Décocher cette case permet de masquer la liste de prix sans la supprimer."
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Selectable"
+msgstr "Sélectionnable"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid "Allow the end user to choose this price list"
 msgstr "Permettre à l'utilisateur final de choisir cette liste de prix"

locale/fr/LC_MESSAGES/purchase.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Nancy Bolognesi <nb@microcom.ca>, 2017\n"
+"Last-Translator: Fabrice Henrion <fhe@odoo.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2114,10 +2114,18 @@ msgstr ""
 "commande**, sélectionnez la date à laquelle vous souhaitez passer la "
 "commande."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Shipment"
+msgstr "Expédition"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Incoming Shipments"
 msgstr "Réceptions"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Vendor Reference"
+msgstr "Référence fournisseur"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the sales order or bid sent by the vendor. It's used to do the "
@@ -2129,6 +2137,10 @@ msgstr ""
 "articles, puisque cette référence est généralement écrite sur le bon de "
 "livraison envoyé par votre fournisseur."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Order Date"
+msgstr "Date de la commande"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Depicts the date where the Quotation should be validated and converted into "
@@ -2137,16 +2149,28 @@ msgstr ""
 "Représente la date où le devis devrait être validé et le converti en bon "
 "d'achat."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Source Document"
+msgstr "Document d'origine"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the document that generated this purchase order request (e.g. a"
 " sales order or an internal procurement request)"
 msgstr ""
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Deliver To"
+msgstr "Livrer à"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "This will determine picking type of incoming shipment"
 msgstr "Ceci déterminera le type de prélèvement de la réception"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Drop Ship Address"
+msgstr "Adresse de livraison directe"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Put an address if you want to deliver directly from the vendor to the "
@@ -2155,10 +2179,18 @@ msgstr ""
 "Ajoutez une adresse si vous voulez livrer directement du fournisseur au "
 "client. Sinon, laissez vide pour vous faire livrer à votre société."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Destination Location Type"
+msgstr "Type d'emplacement de destination"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Technical field used to display the Drop Ship Address"
 msgstr "Champ technique utilisé pour afficher l'adresse de livraison directe."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "International Commercial Terms are a series of predefined commercial terms "

locale/fr/LC_MESSAGES/sales.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucas Deliege <lud@odoo.com>, 2017\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -944,16 +944,11 @@ msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:66
 msgid ""
-"There are different ways to track the service related to a sale order or "
+"There are different ways to track the service related to a sales order or "
 "product sold. With the above configuration, you can only sell one support "
 "contract per order. If your customer orders several service contracts on "
 "timesheet, you will have to split the quotation into several orders."
 msgstr ""
-"Il existe différentes façons de suivre le service lié à un bon de commande "
-"ou à un article vendu. Avec la configuration ci-dessus, vous ne pouvez "
-"vendre qu'un contrat d'assistance par commande. Si votre client commande "
-"plusieurs contrats d'assistance sur feuilles de temps, vous devrez diviser "
-"le devis en plusieurs commandes."
 
 #: ../../sales/invoicing/services/support.rst:72
 msgid ""
@@ -973,21 +968,16 @@ msgid "Managing support contract"
 msgstr "Gestion d'un contrat d'assistance"
 
 #: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sale Orders"
-msgstr "Devis et Bons de Commande"
+msgid "Quotations and Sales Orders"
+msgstr "Devis et bons de commande"
 
 #: ../../sales/invoicing/services/support.rst:83
 msgid ""
-"Once the product is created, you can create a quotation or a sale order with"
-" the related product. Once the quotation is confirmed and transformed into a"
-" sale order, your users will be able to record services related to this "
-"support contract using the timesheet application."
+"Once the product is created, you can create a quotation or a sales order "
+"with the related product. Once the quotation is confirmed and transformed "
+"into a sales order, your users will be able to record services related to "
+"this support contract using the timesheet application."
 msgstr ""
-"Une fois que l'article est créé, vous pouvez créer un devis ou un bon de "
-"commande avec l'article correspondant. Une fois que le devis est confirmé et"
-" transformé en bon de commande, les utilisateurs seront en mesure "
-"d'enregistrer les services liés à ce contrat d'assistance en utilisant "
-"l'application de feuille de temps."
 
 #: ../../sales/invoicing/services/support.rst:93
 msgid "Timesheets"
@@ -1007,8 +997,8 @@ msgstr ""
 "services dès qu'il a été vendu."
 
 #: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sale order"
-msgstr "Contrôler l'assistance fournie sur le bon de commande"
+msgid "Control delivered support on the sales order"
+msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:106
 msgid ""
@@ -1031,32 +1021,14 @@ msgstr "Vente incitative et renouvellement"
 #: ../../sales/invoicing/services/support.rst:118
 msgid ""
 "If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, the sale order "
-"**Invoicing Status** is automatically set to **Upselling**. This means you "
-"have an opportunity to sell an extra contract to the customer since he used "
-"all his quota of service."
+"equal to the number of hours the customer purchased, you are suggested to "
+"sell an extra contract to the customer since they used all their quota of "
+"service. Periodically (ideally once every two weeks), you should check the "
+"sales order that are in such a case. To do so, go to :menuselection:`Sales "
+"--> Invoicing --> Orders to Upsell`."
 msgstr ""
-"Si le nombre d'heures que vous avez effectuées sur le contrat d'assistance "
-"est supérieur ou égal au nombre d'heures que le client a acheté, le ** "
-"Status de facturation** du bon de commande est automatiquement réglé sur "
-"**Vente incitative**. Cela signifie que vous avez la possibilité de vendre "
-"un contrat supplémentaire pour le client depuis qu'il a utilisé tout son "
-"quota d'assistance."
 
-#: ../../sales/invoicing/services/support.rst:124
-msgid ""
-"Periodically (ideally once every two weeks), you should check the sales "
-"order that are in an upselling status. To do this, go to the "
-":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter"
-" to get all orders that are in upselling."
-msgstr ""
-"Périodiquement (idéalement une fois toutes les deux semaines), vous devriez "
-"vérifier les bons de commande qui sont dans l'état upselling. Pour ce faire,"
-" allez au menu :menuselection:`Ventes --> Bons de commande` et utilisez le "
-"filtre **Upselling** pour obtenir toutes les commandes qui sont en "
-"upselling."
-
-#: ../../sales/invoicing/services/support.rst:130
+#: ../../sales/invoicing/services/support.rst:127
 msgid ""
 "If you use Odoo CRM, a good practice is to create an opportunity for every "
 "sale order in upselling invoice status so that you easily track your "
@@ -1066,26 +1038,20 @@ msgstr ""
 "opportunité pour chaque bon de commande en upselling afin que vous puissiez "
 "suivre facilement votre effort de vente incitative."
 
-#: ../../sales/invoicing/services/support.rst:134
+#: ../../sales/invoicing/services/support.rst:131
 msgid ""
 "If you sell an extra support contract, you can either add a new line on the "
-"existing sale order (thus, you continue to timesheet on the same order) or "
+"existing sales order (thus, you continue to timesheet on the same order) or "
 "create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sale order as **Upselling**, you can set the sale "
-"order as done and it will disappear from your upselling list."
+"contract). To unmark the sales order as **Upselling**, you can set the sales"
+" order as done and it will disappear from your upselling list."
 msgstr ""
-"Si vous vendez un contrat d'assistance supplémentaire, vous pouvez ajouter "
-"une nouvelle ligne au bon de commande existant (ainsi, vous continuez à "
-"pointer sur le même bon) ou créer une nouvelle commande (alors, les gens "
-"vont pointer leurs heures sur le nouveau contrat) . Pour sortir le bon de "
-"commande de l'état **Upselling**, vous pouvez définir le bon de commande "
-"comme terminé et il disparaîtra de votre liste de upselling."
 
-#: ../../sales/invoicing/services/support.rst:141
+#: ../../sales/invoicing/services/support.rst:138
 msgid "Special Configuration"
 msgstr "Configuration Spéciale"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/services/support.rst:140
 msgid ""
 "When creating the product form, you may set a different approach to track "
 "the service:"
@@ -1093,33 +1059,23 @@ msgstr ""
 "Lors de la création de la fiche article, vous pouvez définir une approche "
 "différente pour suivre l'assistance :"
 
-#: ../../sales/invoicing/services/support.rst:146
+#: ../../sales/invoicing/services/support.rst:143
 msgid ""
 "**Create task and track hours**: in this mode, a task is created for every "
-"sale order line. Then when you do the timesheet, you don't record hours on a"
-" sale order/contract, but you record hours on a task (that represents the "
+"sales order line. Then when you do the timesheet, you don't record hours on "
+"a sales order/contract, but you record hours on a task (that represents the "
 "contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sale order."
+"service contracts within the same sales order."
 msgstr ""
-"**Créer une tâche et suivre les heures** : dans ce mode, une tâche est créée"
-" pour chaque ligne de commande. Puis, quand vous faites la feuille de temps,"
-" vous n'enregistrez pas les heures sur un contrat / bon de commande, mais "
-"vous enregistrez les heures sur une tâche (qui représente le contrat). "
-"L'avantage de cette solution est qu'elle permet de vendre plusieurs contrats"
-" d'assistance dans le même bon de commande."
 
-#: ../../sales/invoicing/services/support.rst:153
+#: ../../sales/invoicing/services/support.rst:150
 msgid ""
 "**Manually**: you can use this mode if you don't record timesheets in Odoo. "
 "The number of hours you worked on a specific contract can be recorded "
-"manually on the sale order line directly, in the delivered quantity field."
+"manually on the sales order line directly, in the delivered quantity field."
 msgstr ""
-"**Manuellement** : vous pouvez utiliser ce mode si vous n'enregistrez pas de"
-" feuilles de temps dans Odoo. Le nombre d'heures travaillées sur un contrat "
-"spécifique peut être enregistré manuellement directement sur la ligne de "
-"commande, dans le champ quantité livrée."
 
-#: ../../sales/invoicing/services/support.rst:159
+#: ../../sales/invoicing/services/support.rst:156
 msgid ":doc:`../../../inventory/settings/products/uom`"
 msgstr ":doc:`../../../inventory/settings/products/uom`"
 
@@ -1387,16 +1343,11 @@ msgstr ":menuselection:`Commande eCommerce --> Facture`"
 
 #: ../../sales/overview/main_concepts/invoicing.rst:69
 msgid ""
-"An eCommerce order will also trigger the creation of the order when it is "
+"An eCommerce order will also trigger the creation of the invoice when it is "
 "fully paid. If you allow paying orders by check or wire transfer, Odoo only "
 "creates an order and the invoice will be triggered once the payment is "
 "received."
 msgstr ""
-"Une commande d'eCommerce déclenchera également la création de la commande "
-"lorqu'elle sera entièrement payée. Si vous autorisez le paiement des "
-"commandes par chèque ou par virement bancaire, Odoo ne créera que la "
-"commande, et la création de la facture ne sera déclenchée qu'une fois le "
-"paiement reçu."
 
 #: ../../sales/overview/main_concepts/invoicing.rst:75
 msgid "Creating an invoice manually"
@@ -1711,140 +1662,76 @@ msgid "Manage your products"
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:3
-msgid "How to import my products"
+msgid "How to import products with categories and variants"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:6
-msgid "How to start"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:8
-msgid "Download the following import templates:"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:10
+#: ../../sales/products_prices/products/import.rst:5
 msgid ""
-"Partners: customers, vendors (no relation field, can be imported as is)"
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:11
-msgid "Products (no relation field, can be imported as is)"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:12
-msgid "Product Website Categories"
+msgid "How to customize the file"
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:13
-msgid "Product Attributes & Values"
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:14
-msgid "Products with Categories & Attributes (3 & 4 must be imported first)"
+#: ../../sales/products_prices/products/import.rst:15
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:16
 msgid ""
-"Download link: "
-"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing"
+"Don't change labels of columns you want to import. Otherwise Odoo won't "
+"recognize them anymore and you will have to map them on your own in the "
+"import screen."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:18
 msgid ""
-"You can open them with any spreadsheets software (Microsoft Office, "
-"OpenOffice, Google Drive, etc.)."
+"To add new columns,Feel free to add new columns but the fields need to exist"
+" in Odoo. If Odoo fails in matching the column name with a field, you can "
+"make it manually when importing by browsing a list of available fields."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:21
-msgid "How to customize the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:23
-msgid ""
-"Remove columns you don't need. Don't remove the first one (called *ID*, see "
-"why here below)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:25
-msgid ""
-"Don't change labels of columns you want to import. Otherwse Odoo won't match"
-" the columns automatically."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:27
-msgid ""
-"Feel free to add new columns but the fields need to exist in Odoo. If Odoo "
-"fails in matching the column name with a field, you can make it manually "
-"when importing by browsing a list of available fields."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:30
-msgid "Once modified, keep your file in .csv format."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:33
-msgid "How to import the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:35
-msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:36
-msgid "Switch to list view (top-right corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:37
-msgid "Click the *Import* button (top-left corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:38
-msgid ""
-"Make sure all the columns match an existing field. If not select it manually"
-" from the drop-down list."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:40
-msgid "Press * Validate* to test the import."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:41
-msgid ""
-"If you get \"Everything seems valid.\" as result message, press *Import* to "
-"process the real import. Otherwise correct the issues spotted during the "
-"test."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:45
+#: ../../sales/products_prices/products/import.rst:24
 msgid "Why an “ID” column"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:47
+#: ../../sales/products_prices/products/import.rst:26
 msgid ""
 "The ID is an unique identifier for the line item. Feel free to use the one "
 "of your previous software to ease the transition to Odoo."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:50
+#: ../../sales/products_prices/products/import.rst:29
 msgid ""
 "Setting an ID is not mandatory when importing but it helps in many cases:"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:52
+#: ../../sales/products_prices/products/import.rst:31
 msgid ""
 "Update imports: you can import the same file several times without creating "
 "duplicates;"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:53
+#: ../../sales/products_prices/products/import.rst:32
 msgid "Import relation fields (see here below)."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:56
+#: ../../sales/products_prices/products/import.rst:35
 msgid "How to import relation fields"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:58
+#: ../../sales/products_prices/products/import.rst:37
 msgid ""
 "An Odoo object is always related to many other objects (e.g. a product is "
 "linked to product categories, attributes, vendors, etc.). To import those "
@@ -1852,7 +1739,7 @@ msgid ""
 "their own list menu."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:62
+#: ../../sales/products_prices/products/import.rst:41
 msgid ""
 "You can do it using either the name of the related record or its ID. The ID "
 "is expected when two records have the same name. In such a case add \" / "

locale/nl/LC_MESSAGES/accounting.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,7 +98,6 @@ msgstr ""
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:23
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31
 msgid "Configuration"
 msgstr "Instellingen"
@@ -874,7 +873,6 @@ msgstr ""
 
 #: ../../accounting/bank/misc/batch.rst:124
 #: ../../accounting/payables/pay/sepa.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:134
 msgid "Troubleshooting"
 msgstr "Problemen oplossen"
 
@@ -1587,6 +1585,11 @@ msgid ""
 "configured as well as the currency of the journal"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "Soort"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr ""
@@ -1605,14 +1608,26 @@ msgstr ""
 msgid "Select 'General' for miscellaneous operations journals."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Company"
+msgstr "Bedrijf"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
 msgstr "Bedrijf gerelateerd aan dit dagboek"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Short Code"
+msgstr "Korte code"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
 msgstr "De boekingen van dit dagboek worden aangeduid met deze prefix."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Dedicated Refund Sequence"
+msgstr "Specifieke reeks voor creditfacturen"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
@@ -1621,6 +1636,10 @@ msgstr ""
 "Vink deze optie aan als u niet dezelfde reeks wil delen voor facturen en "
 "credit facturen vanuit dit dagboek"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Entry Sequence"
+msgstr "Dagboek reeks"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the journal "
@@ -1629,6 +1648,10 @@ msgstr ""
 "Dit veld bevat de informatie gerelateerd aan de nummering van de boekingen "
 "in dit dagboek."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Refund Entry Sequence"
+msgstr "Begin reeks voor creditfacturen"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the refund "
@@ -1637,18 +1660,34 @@ msgstr ""
 "Dit veld bevat de informatie gerelateerd aan de nummering van de "
 "creditfacturen reeks van dit dagboek."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Debit Account"
+msgstr "Standaard debet grootboekrekening"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for debit amount"
 msgstr "Dit is de standaard rekening voor het debet bedrag"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Credit Account"
+msgstr "Standaard credit grootboekrekening"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for credit amount"
 msgstr "Dit is de standaard rekening voor het credit bedrag"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Currency"
+msgstr "Valuta"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
 msgstr "De gebruikte valuta"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Debit Methods"
+msgstr "Debet methoden"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for collecting money. Odoo modules offer various payments "
@@ -1660,6 +1699,10 @@ msgstr ""
 "betaling om betalingen af te handelen die niet standaard in de toepassing "
 "zijn opgenomen. "
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Payment Methods"
+msgstr "Betaalwijzes"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Means of payment for sending money. Odoo modules offer various payments "
@@ -1671,6 +1714,10 @@ msgstr ""
 "betaling om betalingen af te handelen die niet standaard in de toepassing "
 "zijn opgenomen. "
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Group Invoice Lines"
+msgstr "Groepeer factuurregels"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
@@ -1679,6 +1726,10 @@ msgstr ""
 "Als dit is aangevinkt, dan zal het systeem proberen de boekingsregels te "
 "groeperen bij het genereren vanaf facturen."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Profit Account"
+msgstr "Winst & Verlies rekening"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a profit when the ending balance of a cash register differs"
@@ -1687,6 +1738,10 @@ msgstr ""
 "Gebruikt om winst te registreren wanneer de eindsaldo van een kasregister "
 "verschilt van wat het systeem berekend"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Loss Account"
+msgstr "Verlies rekening"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a loss when the ending balance of a cash register differs "
@@ -1695,11 +1750,19 @@ msgstr ""
 "Gebruikt om verlies te registreren wanneer de eindsaldo van een kasregister "
 "verschilt van wat het systeem berekend"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Show journal on dashboard"
+msgstr "Toon dagboek in dashboard"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
 msgstr ""
 "Bepaalt of dit dagboek al dan niet getoond moet worden in het dashboard"
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Printing Payment Method Selected"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Technical feature used to know whether check printing was enabled as payment"
@@ -1708,20 +1771,37 @@ msgstr ""
 "Technische optie gebruikt om te weten of cheque afdrukken is opgezet als "
 "betaalmethode."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Sequence"
+msgstr "Controleer reeks"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Checks numbering sequence."
 msgstr "Cheques nummering reeks."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Manual Numbering"
+msgstr "Handmatige nummering"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check this option if your pre-printed checks are not numbered."
 msgstr ""
 "Vink deze optie aan als uw her-afgedrukte cheques niet genummerd zijn."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Next Check Number"
+msgstr "Volgende cheque numer"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Sequence number of the next printed check."
 msgstr "Reeksnummer van de volgende afgedrukte cheque."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Active in Point of Sale"
+msgstr "Actief in kassa"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if this journal define a payment method that can be used in a"
@@ -1730,6 +1810,10 @@ msgstr ""
 "Vink deze optie aan indien dit dagboek een betaalmethode is voor gebruik "
 "binnen de kassa."
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Amount Authorized Difference"
+msgstr "Toegestaan bedrag afwijking"
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field depicts the maximum difference allowed between the ending balance"
@@ -1928,6 +2012,10 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Verklaring van de velden:"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Status"
+msgstr "Status"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "When an asset is created, the status is 'Draft'."
 msgstr ""
@@ -1944,24 +2032,44 @@ msgid ""
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Category"
+msgstr "Categorie"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Category of asset"
 msgstr "Categorie van activa"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Date"
+msgstr "Datum"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Date of asset"
 msgstr "Datum van activa"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Gross Value"
+msgstr "Bruto waarde"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Gross value of asset"
 msgstr "Bruto waarde van activa"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Salvage Value"
+msgstr "Restwaarde"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 "Het is het bedrag dat u van plan bent te hebben, dat u niet kunt "
 "afschrijven."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Computation Method"
+msgstr "Berekeningsmethode"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Choose the method to use to compute the amount of depreciation lines."
 msgstr ""
@@ -1976,6 +2084,10 @@ msgid ""
 "* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Time Method Based On"
+msgstr "Tijdmethode gebaseerd op"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Choose the method to use to compute the dates and number of depreciation "
@@ -1994,6 +2106,10 @@ msgid ""
 "depreciations won't go beyond."
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Prorata Temporis"
+msgstr "Prorata Temporis"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
@@ -2004,10 +2120,18 @@ msgstr ""
 "zijn van de inkoopdatum in plaats van de eerste van januari / startdatum van"
 " het fiscale jaar"
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Depreciations"
+msgstr "Aantal afschrijvingen"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The number of depreciations needed to depreciate your asset"
 msgstr "Het aantal afschrijvingen nodig om de activa af te schrijven."
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Months in a Period"
+msgstr "Aantal maanden in de periode"
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The amount of time between two depreciations, in months"
 msgstr "De hoeveelheid tijd tussen twee afschrijvingen, in maanden"
@@ -3516,14 +3640,26 @@ msgstr ""
 "rapportagedoeleinden en bepaalt de handelswijze bij het afsluiten van het "
 "boekjaar en het openen van de balans."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Tags"
+msgstr "Labels"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
 msgstr "Optionele labels die u wilt toewijzen voor aangepaste rapportages"
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Account Currency"
+msgstr "Rekening valuta"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
 msgstr "Forceert alle boekingen voor deze rekening naar deze tweede valuta."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Internal Type"
+msgstr "Interne soort"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "The 'Internal Type' is used for features available on different types of "
@@ -3534,6 +3670,10 @@ msgstr ""
 "verschillende rekeningen: liquiditeit is voor kas- en bankrekeningen, "
 "crediteuren/debiteuren is voor leverancier-/klantfacturen."
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Allow Reconciliation"
+msgstr "Afletteren toestaan"
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "Check this box if this account allows invoices & payments matching of "
@@ -7719,10 +7859,18 @@ msgstr ""
 msgid "Explanation of the fields of the payment screen:"
 msgstr ""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Has Invoices"
+msgstr "Heeft facturen"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used for usability purposes"
 msgstr "Technisch veld gebruikt voor gebruiksvriendelijke doeleinden"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Hide Payment Method"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to hide the payment method if the selected journal has "
@@ -7731,6 +7879,10 @@ msgstr ""
 "Technisch veld gebruikt om de betalingsmethode te verbergen als het "
 "geselecteerde dagboek maar één betaalmethode heeft die 'handmatig' is"
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Code"
+msgstr "Code"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to adapt the interface to the payment type selected."
@@ -7738,6 +7890,10 @@ msgstr ""
 "Technisch veld dat gebruikt wordt om de interface te wijzigen naar de "
 "geselecteerde betalingsmethode."
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Check Number"
+msgstr "Controleer nummer"
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "The selected journal is configured to print check numbers. If your pre-"
@@ -10017,8 +10173,8 @@ msgstr ":doc:`recording`"
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:167
 #: ../../accounting/receivables/customer_payments/recording.rst:128
-msgid ":doc:`paypal`"
-msgstr ":doc:`paypal`"
+msgid ":doc:`../../bank/feeds/paypal`"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:169
 #: ../../accounting/receivables/customer_payments/recording.rst:130
@@ -10254,210 +10410,6 @@ msgid ""
 "Reporting (check the KPI average debtors days)."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/paypal.rst:3
-msgid "How to accept paypal payments on invoices?"
-msgstr "Hoe Paypal betalingen aanvaarden op uw facturen?"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:5
-msgid ""
-"The \"Paypal Payment Acquirer\" module allows you to accept payments via "
-"paypal, for your sales orders, invoices, or online orders. As paypal accepts"
-" payments through credit cards (VISA, Mastercard, …), you will be able to "
-"process most payment methods."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:10
-msgid "Paypal support two modes:"
-msgstr "Paypal ondersteund twee methodes:"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:12
-msgid ""
-"Paypal Merchant Account: the user is redirected to paypal to do the payment "
-"(either with a credit card or a paypal account)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:15
-msgid ""
-"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to "
-"paypal and the payment can be done in the background. This method is mostly "
-"used for subscription businesses where you need to charge your customers "
-"periodically."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:20
-msgid "As of today, Odoo only support the normal Paypal Merchant Account."
-msgstr ""
-"Vanaf vandaag ondersteunt Odoo enkel het normale PayPal handelaars account."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:26
-msgid "Install the \"PayPal Payment Acquirer\" module"
-msgstr "Installeer de *PayPal betalingsverwerker* module"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:28
-msgid "Start by installing the **PayPal Payment Acquirer** module."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:30
-msgid ""
-"Once the module is installed, you should see a new payment acquirer in the "
-"Setting application, menu \"Payment Acquirers\"."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:36
-msgid ""
-"By default, Paypal is configured to work in a test environment, out-of-the-"
-"box. It means you can already test the full order to payment flow with the "
-"paypal sandbox, without having to configure the next steps."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:42
-msgid "Creating and configuring a PayPal merchant account"
-msgstr "Een PayPal handelaarsaccount aanmaken en configureren"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:45
-msgid "Create a basic Paypal account"
-msgstr "Een basis Paypal account aanmaken"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:47
-msgid "Existing or newly created Personal Paypal account can be used."
-msgstr "Een bestaand of nieuw persoonlijk PayPal account kan gebruikt worden."
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:49
-msgid "Or upgrade your account to Business account (merchant) if needed"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:55
-msgid "Paypal Account Summary page"
-msgstr "Paypal rekening samenvatting pagina"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:58
-msgid "Paypal Configuration"
-msgstr "Paypal configuratie"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:60
-msgid ""
-"Access \"Seller preferences\" menu from `PayPal website "
-"<https://www.paypal.com/myaccount/home>`__"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:66
-msgid ""
-"Access \"Website preferences\" and configure Auto Return (Payment Data "
-"Transfer must be left to Off)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:69
-msgid "**Database name**: yourcompany"
-msgstr "**Database naam**: yourcompany"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:70
-#: ../../accounting/receivables/customer_payments/paypal.rst:88
-msgid "**Website URL**: https://yourcompany.odoo.com/"
-msgstr "**Website URL**: https://yourcompany.odoo.com/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:71
-msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation"
-msgstr "**Return URL**: https://yourcompany.odoo.com/shop/confirmation"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:76
-msgid "These settings will redirect your buyer to your web confirmation page."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:80
-msgid "Access and edit Instant payment notifications settings - IPN"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:85
-msgid "Example"
-msgstr "Voorbeeld"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:87
-msgid "**Database name**: \"yourcompany\""
-msgstr "**Database naam**: \"yourcompany\""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:89
-msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-msgstr "**Notificatie URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:91
-msgid ""
-"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you"
-" use the odoo.com domain, we advise you to use HTTPS."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:94
-msgid ""
-"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> "
-"Language Encoding --> More Options --> More selling tools`"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:103
-msgid ""
-"Record your Merchant Paypal ID (personal or business account both will have "
-"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> "
-"Account Options`."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:111
-msgid ""
-"If you want your customers to be able to pay through Paypal while not having"
-" a Paypal account- following setting \"Paypal Account Optional\" needs to be"
-" set to **ON**. All users will be able to choose Credit/debit card payment "
-"option - Paypal account not required."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:120
-msgid "Setup your Paypal Payment Acquirer account credentials in Odoo"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:122
-msgid ""
-":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:124
-msgid "**Paypal Email ID**: your paypal account email address"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:126
-msgid "**Paypal Merchant ID**: ID retrieved at previous step"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:136
-msgid ""
-"If your eCommerce customer gets this Error Message after completing Paypal "
-"payment instead of being redirected to your database:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:142
-msgid ""
-"Verify the settings you have `configured in Paypal <WebsitePreferences_>`_:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:144
-msgid ""
-"Auto Return should be on (the value can be quite generic, like "
-"<odoo_instance>/shop/confirmation; the correct URL will be set for each "
-"transaction)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:148
-msgid "Payment Data Transfer should be off"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:150
-msgid ""
-"On-premise databases must be accessible through classic HTTP/HTTPS ports "
-"(80/443) for Paypal to work correctly, usually through a reverse proxy. "
-"Contact your integrating partner if you are unsure this is the case. "
-"Databases hosted on odoo.com are already configured correctly."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:157
-#: ../../accounting/receivables/customer_payments/recording.rst:127
-msgid ":doc:`credit_cards`"
-msgstr ":doc:`credit_cards`"
-
 #: ../../accounting/receivables/customer_payments/recording.rst:3
 msgid "What are the different ways to record a payment?"
 msgstr ""
@@ -10591,7 +10543,7 @@ msgstr ""
 
 #: ../../accounting/receivables/customer_payments/recording.rst:101
 msgid "Transferring money from one bank account to another"
-msgstr ""
+msgstr "Overboeking van geld van een bankrekening naar een andere"
 
 #: ../../accounting/receivables/customer_payments/recording.rst:103
 msgid ""
@@ -10603,7 +10555,7 @@ msgstr ""
 msgid ""
 "This will take you to the same screen you have for receiving and making "
 "payments."
-msgstr ""
+msgstr "Dit brengt u naar hetzelfde scherm als ontvangsten en betalingen."
 
 #: ../../accounting/receivables/customer_payments/recording.rst:118
 msgid ""
@@ -10614,13 +10566,17 @@ msgid ""
 " with two journal entries for the same transaction."
 msgstr ""
 
+#: ../../accounting/receivables/customer_payments/recording.rst:127
+msgid ":doc:`credit_cards`"
+msgstr ":doc:`credit_cards`"
+
 #: ../../accounting/receivables/getting_paid.rst:3
 msgid "How to get paid?"
 msgstr "Hoe betaald worden?"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:3
 msgid "How to automate customer follow-ups with plans?"
-msgstr ""
+msgstr "Hoe klantopvolgingen automatiseren via plannen?"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:5
 msgid ""
@@ -10705,11 +10661,11 @@ msgstr "Formele melding"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:27
 msgid "Bailiff"
-msgstr ""
+msgstr "Deurwaarder"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:34
 msgid "Install Reminder Module"
-msgstr ""
+msgstr "Installeer \"Herinnering\" module"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:36
 msgid ""
@@ -10855,7 +10811,7 @@ msgstr ""
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:122
 msgid "Drill down to an invoice"
-msgstr ""
+msgstr "Inzoomen op een factuur"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:124
 msgid ""
@@ -10874,11 +10830,13 @@ msgstr ""
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:135
 msgid "How to exclude an invoice from auto follow up?"
-msgstr ""
+msgstr "Hoe een factuur uitsluiten van automatische opvolging?"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:137
 msgid "To see all **overdue invoices** or **on need of action**,"
 msgstr ""
+"Om alle ** achterstallige facturen ** of ** wanneer er actie nodig is ** te "
+"zien,"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:139
 msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
@@ -10886,7 +10844,7 @@ msgstr ""
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:145
 msgid "Exclude a specific invoice for a specific date"
-msgstr ""
+msgstr "Sluit een bepaalde factuur uit voor een bepaalde datum"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:147
 msgid ""
@@ -10905,13 +10863,15 @@ msgstr ""
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:162
 msgid "Exclude a specific invoice forever"
-msgstr ""
+msgstr "Sluit een specifieke factuur permanent uit"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:164
 msgid ""
 "Odoo can exclude an invoice for a specific customer by clicking on the "
 "checkbox **Excluded**"
 msgstr ""
+"Odoo kan een factuur uitsluiten voor een specifieke klant door te klikken op"
+" het selectievakje ** Uitgesloten **"
 
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:168
 msgid "If you click on **History**, you can see all follow ups actions."

locale/nl/LC_MESSAGES/db_management.po

@@ -20,11 +20,11 @@ msgstr ""
 
 #: ../../db_management/db_online.rst:8
 msgid "Online Database management"
-msgstr ""
+msgstr "Online database beheer"
 
 #: ../../db_management/db_online.rst:13
 msgid "Duplicating a database"
-msgstr ""
+msgstr "Een database dupliceren"
 
 #: ../../db_management/db_online.rst:15
 msgid ""
@@ -92,7 +92,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:10
 msgid "Register a database"
-msgstr ""
+msgstr "Registreer een database"
 
 #: ../../db_management/db_premise.rst:12
 msgid ""
@@ -117,11 +117,11 @@ msgstr ""
 #: ../../db_management/db_premise.rst:31 ../../db_management/db_premise.rst:97
 #: ../../db_management/db_premise.rst:130
 msgid "Solutions"
-msgstr ""
+msgstr "Oplossingen"
 
 #: ../../db_management/db_premise.rst:33
 msgid "Do you have a valid Enterprise subscription?"
-msgstr ""
+msgstr "Heeft u een geldig Enterprise abonnement?"
 
 #: ../../db_management/db_premise.rst:35
 msgid ""
@@ -132,7 +132,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:39
 msgid "Have you already linked a database with your subscription reference?"
-msgstr ""
+msgstr "Heeft u al een database gelinkt met uw abonnementsnummer?"
 
 #: ../../db_management/db_premise.rst:41
 msgid ""
@@ -231,7 +231,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:116
 msgid "Database expired error message"
-msgstr ""
+msgstr "Database vervallen foutmelding"
 
 #: ../../db_management/db_premise.rst:118
 msgid ""
@@ -261,7 +261,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:136
 msgid "Contact our `Support <https://www.odoo.com/help>`__"
-msgstr ""
+msgstr "Contacteer onze `support <https://www.odoo.com/help>`__"
 
 #: ../../db_management/db_premise.rst:138
 msgid ""
@@ -271,7 +271,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:145
 msgid "Force an Update Notification"
-msgstr ""
+msgstr "Forceer een update notificatie"
 
 #: ../../db_management/db_premise.rst:147
 msgid ""
@@ -322,7 +322,7 @@ msgstr ""
 
 #: ../../db_management/db_premise.rst:174
 msgid "Duplicate a database"
-msgstr ""
+msgstr "Dupliceer een database"
 
 #: ../../db_management/db_premise.rst:176
 msgid ""

locale/nl/LC_MESSAGES/discuss.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -23,146 +23,238 @@ msgid "Discuss"
 msgstr "Discussieer"
 
 #: ../../discuss/email_servers.rst:3
-msgid "How to use my own email servers to send and receive messages in Odoo"
+msgid "How to use my own email servers to send and receive email in Odoo"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:6
 msgid "When is it needed"
-msgstr ""
+msgstr "Wanneer het nodig is"
 
 #: ../../discuss/email_servers.rst:7
-msgid "You need it if you use Odoo Community or Enterprise."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:10
-msgid "What if I use Odoo Online"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:11
 msgid ""
-"You are done! Odoo Online comes up with an embedded and ready-to-use email "
-"server (*@yourcompany.odoo.com*). We recommend to keep this default setting "
-"as is as it is really convenient."
+"Using your own email servers is required to send and receive messages in "
+"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email "
+"solution that works straight away. However you can still use your own email "
+"servers with the online edition. Some insights are provided here below."
 msgstr ""
 
+#: ../../discuss/email_servers.rst:14
+msgid "How to set it up"
+msgstr "Hoe op te zetten"
+
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"Indeed, while it is branded by Odoo, the visible source of any message sent "
-"from Odoo will be your personal email address (your Odoo login). Your "
-"contacts will therefore trust your messages."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:20
-msgid "How does it work when a contact replies to an email sent from Odoo"
+"As a system admin, go to :menuselection:`Settings --> General Settings` and "
+"check *External Email Servers* (watch out: this checkbox only shows up after"
+" Odoo 10). Then, go through the following steps."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:21
 msgid ""
-"Default reply-to is a generic address used to automatically route any "
-"incoming email to the discussion thread of the origin business object "
-"(opportunity, order, task, etc.) and to the inbox of all its followers. By "
-"default this address is \"catchall@\" but it can be changed. Thanks to it, "
-"you get a perfect message thread in Odoo and you don't pollute your external"
-" email box with Odoo-related topics."
+"Office 365 doesn't allow external hosts like Odoo. Consequently you can't "
+"use Office 365 email servers to send or receive messages in Odoo."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:29
-msgid "How to use my own email servers"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:30
-msgid ""
-"You need to be a system admin to set this up. Go to :menuselection:`Settings"
-" --> General Settings` and check *External Email Servers* (watch out: this "
-"checkbox only shows up after Odoo 10). Then, go through the following steps."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:36
+#: ../../discuss/email_servers.rst:26
 msgid "Set an outgoing email server for outbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:37
+#: ../../discuss/email_servers.rst:27
 msgid ""
 "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, "
 "etc.) as well as your admin credentials. Once all the information has been "
 "filled out, click on *Test Connection*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:45
+#: ../../discuss/email_servers.rst:35
 msgid "Set an incoming email server for inbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:46
+#: ../../discuss/email_servers.rst:36
 msgid ""
 "Fill out the form according to your email provider’s settings. Leave the "
 "*Actions to Perform on Incoming Mails* blank. Once all the information has "
 "been filled out, click on *TEST & CONFIRM*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:53
+#: ../../discuss/email_servers.rst:43
 msgid ""
 "By default inbound messages are fetched every 5 minutes. You can change this"
 " value in developer mode. Go to :menuselection:`Settings --> Technical --> "
 "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:59
+#: ../../discuss/email_servers.rst:49
 msgid "Set the domain name"
-msgstr ""
+msgstr "Stel de domeinnaam in"
 
-#: ../../discuss/email_servers.rst:60
+#: ../../discuss/email_servers.rst:50
 msgid ""
 "Enter the domain name of your email servers (e.g. mycompany.com) in General "
 "Settings."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:67
+#: ../../discuss/email_servers.rst:57
 msgid "Create a catchall address"
+msgstr "Maak een catchall adres"
+
+#: ../../discuss/email_servers.rst:58
+msgid ""
+"When a contact replies to an email sent from Odoo, the *reply-to* address is"
+" a generic address used to route the reply to the right discussion thread in"
+" Odoo (opportunity, order, task, etc.) and to the inbox of all its "
+"followers. By default this address is \"catchall@\" but it can be changed."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:68
+#: ../../discuss/email_servers.rst:63
 msgid ""
 "Create a catchall address in your email server settings. We advise you to "
 "use \"catchall@\" so that everything works out straight away. If you want to"
 " use another alias, you have extra steps in Odoo:"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:72
+#: ../../discuss/email_servers.rst:67
 msgid "Activate the developer mode from your Settings Dashboard."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:77
+#: ../../discuss/email_servers.rst:72
 msgid ""
 "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> "
 "Parameters --> System Parameters` and enter your custom catchall alias in "
 "*mail.catchall.alias*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:84
+#: ../../discuss/email_servers.rst:79
 msgid "You can edit the email alias used for bounced messages the same way."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:87
-msgid "How to perfectly combine Odoo Discuss and my traditional email tool"
+#: ../../discuss/email_servers.rst:82
+msgid "How to use my own email servers with Odoo Online"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:88
+#: ../../discuss/email_servers.rst:83
+msgid ""
+"Odoo Online comes up with an embedded and ready-to-use email server "
+"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it "
+"is really convenient. Indeed, while it is Odoo-labelled, the visible source "
+"of any message sent from Odoo will be your personal email address (your Odoo"
+" login). Your contacts will therefore trust your messages."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:90
+msgid ""
+"You can still use your own email servers if you want your contacts to see "
+"your historic email address when they reply to your messages or if you want "
+"to manage the reputation of your email servers yourself."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:94
+msgid "There are 2 methods:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:96
+msgid ""
+"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to"
+" receive emails in Odoo in real time thanks to the Odoo email server. Create"
+" a catchall address in your email server settings. Then apply following "
+"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. "
+"That's it you're ready to go!"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:102
+msgid ""
+"**Use a catchall mailbox** to exclusively use your own email server. That "
+"way you can also manage your email server reputation (blacklisting, etc). "
+"However, incoming messages are fetched from the email server thanks to a "
+"cron running every hour. This is the shortest time lap for crons in Online "
+"instances. If you opt for this solution, simply follow the procedure of "
+"above section."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:111
+msgid "How to be SPF-compliant when using external email servers in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:112
+msgid ""
+"Sender Policy Framework (SPF) is an email-validation system that checks that"
+" incoming mail from a domain comes from a host authorized by that domain's "
+"administrator. Such a security system is used in most email servers. If you "
+"don't comply with it, your emails sent from Odoo will be likely flagged as "
+"spam."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:118
+msgid ""
+"To be SPF-compliant, you need to authorize Odoo as a sending host in your "
+"domain name settings:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:121
+msgid "Sign in to your domain’s account at your domain host."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:122
+msgid "Locate the page for updating your domain’s DNS records."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:123
+msgid ""
+"If no TXT record is set, create one with following definition: v=spf1 "
+"include:_spf.odoo.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:125
+msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:127
+msgid "e.g. for a Gmail server it should be:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:129
+msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+msgstr "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+
+#: ../../discuss/email_servers.rst:131
+msgid ""
+"Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to "
+"create or modify TXT records in your own domain registrar."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:134
+msgid ""
+"Your new SPF record can take up to 48 hours to go into effect, but this "
+"usually happens more quickly."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:137
+msgid ""
+"Adding more than one SPF record for a domain can cause problems with mail "
+"delivery and spam classification. Instead, we recommend using only one SPF "
+"record by modifying it to authorize Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:142
+msgid "How to choose between Odoo and my traditional email box"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:143
 msgid ""
 "Odoo Discuss is a perfect tool to send and read messages related to business"
-" objects. But it doesn't aim to replace a full-featured email software "
-"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
+" documents. However it doesn't aim to replace a full-featured email solution"
+" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
 "both systems without mingling them: What is related to Odoo business objects"
-" or applications goes into Odoo; What is not stays into your external email "
-"boxes."
+" or applications goes into Odoo; What is not can be managed into your "
+"external email box."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:95
+#: ../../discuss/email_servers.rst:150
 msgid ""
 "To do so, create specific email aliases to use in Odoo (to generate leads or"
 " opportunities, helpdesk tickets, etc.). If you take an email alias already "
 "used for messaging outside of Odoo, incoming messages will land into both "
-"systems. This will negatively impact your productivity when it comes to "
-"process them."
+"systems. This will negatively impact your productivity."
 msgstr ""
 
 #: ../../discuss/mail_twitter.rst:3
@@ -298,7 +390,7 @@ msgstr ""
 
 #: ../../discuss/overview.rst:3
 msgid "Why to use Odoo Discuss"
-msgstr ""
+msgstr "Waarom Odoo discussies gebruiken"
 
 #: ../../discuss/overview.rst:5
 msgid ""

locale/nl/LC_MESSAGES/general.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +23,12 @@ msgid "General"
 msgstr "Algemeen"
 
 #: ../../general/auth.rst:3
-msgid "Authentification"
-msgstr ""
+msgid "Authentication"
+msgstr "Authenticatie"
 
 #: ../../general/auth/google.rst:3
 msgid "How to allow users to sign in with their Google account"
-msgstr ""
+msgstr "Hoe gebruikers toestaan zich aan te melden met hun Google-account"
 
 #: ../../general/auth/google.rst:5
 msgid ""
@@ -41,10 +41,11 @@ msgstr ""
 msgid ""
 "Click on **Create Project** and enter the project name and other details."
 msgstr ""
+"Klik op **Creëer Project** en voer een projectnaam en andere details in"
 
 #: ../../general/auth/google.rst:15
 msgid "Click on **Use Google APIs**"
-msgstr ""
+msgstr "Klik op **Gebruik Google APIs**"
 
 #: ../../general/auth/google.rst:20
 msgid ""
@@ -56,7 +57,7 @@ msgstr ""
 msgid ""
 "Fill in your address, email and the product name (for example odoo) and then"
 " save."
-msgstr ""
+msgstr "Vul uw adres, e-mail en de productnaam in en sla het op."
 
 #: ../../general/auth/google.rst:30
 msgid ""
@@ -84,64 +85,198 @@ msgid ""
 msgstr ""
 
 #: ../../general/base_import.rst:3
-msgid "BASE IMPORT"
+msgid "Data Import"
+msgstr "Data Import"
+
+#: ../../general/base_import/adapt_template.rst:3
+msgid "How to adapt an import template"
+msgstr "Hoe een importeer sjabloon te wijzigen"
+
+#: ../../general/base_import/adapt_template.rst:5
+msgid ""
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:11
+msgid "How to customize the file"
+msgstr "Hoe het bestand aanpassen"
+
+#: ../../general/base_import/adapt_template.rst:13
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:15
+#: ../../general/base_import/import_faq.rst:26
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:20
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field of the system. If so, find the "
+"corresponding field using the search."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:27
+msgid ""
+"Then, use the label you found in your import template in order to make it "
+"work straight away the very next time you try to import."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:31
+msgid "Why an “ID” column"
+msgstr "Waarom een \"ID\" kolom"
+
+#: ../../general/base_import/adapt_template.rst:33
+msgid ""
+"The **ID** (External ID) is an unique identifier for the line item. Feel "
+"free to use the one of your previous software to ease the transition to "
+"Odoo."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:36
+msgid ""
+"Setting an ID is not mandatory when importing but it helps in many cases:"
+msgstr ""
+"Het instellen van een ID is niet verplicht bij invoer maar is in veel "
+"gevallen handig:"
+
+#: ../../general/base_import/adapt_template.rst:38
+msgid ""
+"Update imports: you can import the same file several times without creating "
+"duplicates;"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:39
+msgid "Import relation fields (see here below)."
+msgstr "Relatievelden importeren (zie hieronder)."
+
+#: ../../general/base_import/adapt_template.rst:42
+msgid "How to import relation fields"
+msgstr "Hoe relatievelden importeren"
+
+#: ../../general/base_import/adapt_template.rst:44
+msgid ""
+"An Odoo object is always related to many other objects (e.g. a product is "
+"linked to product categories, attributes, vendors, etc.). To import those "
+"relations you need to import the records of the related object first from "
+"their own list menu."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:48
+msgid ""
+"You can do it using either the name of the related record or its ID. The ID "
+"is expected when two records have the same name. In such a case add \" / "
+"ID\" at the end of the column title (e.g. for product attributes: Product "
+"Attributes / Attribute / ID)."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:3
-msgid "Import CSV file to Odoo"
+msgid "How to import data into Odoo"
+msgstr "Hoe gegevens importeren in Odoo"
+
+#: ../../general/base_import/import_faq.rst:6
+msgid "How to start"
+msgstr "Hoe starten"
+
+#: ../../general/base_import/import_faq.rst:7
+msgid ""
+"You can import data on any Odoo's business object using either Excel (.xlsx)"
+" or CSV (.csv) formats: contacts, products, bank statements, journal entries"
+" and even orders!"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:8
-msgid "Frequently Asked Questions"
-msgstr "Vaak gestelde vragen (FAQ)"
-
-#: ../../general/base_import/import_faq.rst:12
-msgid "Need to import data from an other application?"
-msgstr "Wilt u gegevens uit een ander programma importeren?"
-
-#: ../../general/base_import/import_faq.rst:14
-msgid ""
-"In order to re-create relationships between different records, you should "
-"use the unique identifier from the original application and map it to the "
-"**ID** (External ID) column in Odoo. When you import an other record that "
-"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
-"unique identifier."
+#: ../../general/base_import/import_faq.rst:11
+msgid "Open the view of the object you want to populate and click *Import*."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:16
 msgid ""
-"The **ID** (External ID) will also be used to update the original import if "
-"you need to re-import modified data later, it's thus good practice to "
-"specify it whenever possible."
+"There you are provided with templates you can easily populate with your own "
+"data. Such templates can be imported in one click; The data mapping is "
+"already done."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:21
-msgid "I cannot find the field I want to map my column to?"
-msgstr ""
+#: ../../general/base_import/import_faq.rst:22
+msgid "How to adapt the template"
+msgstr "Hoe de template wijzigen"
 
-#: ../../general/base_import/import_faq.rst:23
-msgid ""
-"Odoo try to find with some heuristic, based on the first ten lines of the "
-"files, the type of field for each columns inside your file. For example if "
-"you have a column only containing numbers, only the fields that are of type "
-"integer will be displayed for you to choose from. While this behaviour might"
-" be good and easy for most cases scenarios, it is also possible that it goes"
-" wrong sometimes or that you want to map your column to a field that is not "
-"proposed by default."
+#: ../../general/base_import/import_faq.rst:24
+msgid "Add, remove and sort columns to fit at best your data structure."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:25
+msgid "We advise to not remove the **ID** one (see why in the next section)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:31
 msgid ""
-"If that happens, you just have to check the **Show all fields for completion"
-" (advanced)** option, you will then be able to choose from the complete list"
-" of fields for each columns."
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field in Odoo. Don't worry! You can map new "
+"columns manually when you test the import. Search the list for the "
+"corresponding field."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:30
+#: ../../general/base_import/import_faq.rst:39
+msgid ""
+"Then, use this field's label in your file in order to make it work straight "
+"on the very next time."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:44
+msgid "How to import from another application"
+msgstr "Hoe importeren vanuit een andere applicatie"
+
+#: ../../general/base_import/import_faq.rst:46
+msgid ""
+"In order to re-create relationships between different records, you should "
+"use the unique identifier from the original application and map it to the "
+"**ID** (External ID) column in Odoo. When you import another record that "
+"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
+"unique identifier. You can also find this record using its name but you will"
+" be stuck if at least 2 records have the same name."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:54
+msgid ""
+"The **ID** will also be used to update the original import if you need to "
+"re-import modified data later, it's thus good practice to specify it "
+"whenever possible."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:60
+msgid "I cannot find the field I want to map my column to"
+msgstr "Ik kan het veld niet vinden dat ik wens te koppelen aan mijn kolom"
+
+#: ../../general/base_import/import_faq.rst:62
+msgid ""
+"Odoo tries to find with some heuristic, based on the first ten lines of the "
+"files, the type of field for each column inside your file. For example if "
+"you have a column only containing numbers, only the fields that are of type "
+"*Integer* will be displayed for you to choose from. While this behavior "
+"might be good and easy for most cases, it is also possible that it goes "
+"wrong or that you want to map your column to a field that is not proposed by"
+" default."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:71
+msgid ""
+"If that happens, you just have to check the ** Show fields of relation "
+"fields (advanced)** option, you will then be able to choose from the "
+"complete list of fields for each column."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:79
 msgid "Where can I change the date import format?"
-msgstr ""
+msgstr "Waar kan ik het datum invoerformaat wijzigen?"
 
-#: ../../general/base_import/import_faq.rst:32
+#: ../../general/base_import/import_faq.rst:81
 msgid ""
 "Odoo can automatically detect if a column is a date and it will try to guess"
 " the date format from a set of most used date format. While this process can"
@@ -151,7 +286,7 @@ msgid ""
 " day and which one is the month in a date like '01-03-2016'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:34
+#: ../../general/base_import/import_faq.rst:83
 msgid ""
 "To view which date format Odoo has found from your file you can check the "
 "**Date Format** that is shown when clicking on **Options** under the file "
@@ -159,7 +294,7 @@ msgid ""
 " the *ISO 8601* to define the format."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:37
+#: ../../general/base_import/import_faq.rst:86
 msgid ""
 "If you are importing an excel (.xls, .xlsx) file, you can use date cells to "
 "store dates as the display of dates in excel is different from the way it is"
@@ -167,11 +302,11 @@ msgid ""
 "whatever your locale date format is."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:42
+#: ../../general/base_import/import_faq.rst:91
 msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
-msgstr ""
+msgstr "Kan ik nummers importeren met een valuta-teken (bvb.: $ 32,00)?"
 
-#: ../../general/base_import/import_faq.rst:44
+#: ../../general/base_import/import_faq.rst:93
 msgid ""
 "Yes, we fully support numbers with parenthesis to represent negative sign as"
 " well as numbers with currency sign attached to them. Odoo also "
@@ -181,56 +316,58 @@ msgid ""
 "crash."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:46
+#: ../../general/base_import/import_faq.rst:95
 msgid ""
 "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:48
+#: ../../general/base_import/import_faq.rst:97
 msgid "32.000,00"
-msgstr ""
+msgstr "32.000,00"
 
-#: ../../general/base_import/import_faq.rst:49
+#: ../../general/base_import/import_faq.rst:98
 msgid "32000,00"
-msgstr ""
+msgstr "32000,00"
 
-#: ../../general/base_import/import_faq.rst:50
+#: ../../general/base_import/import_faq.rst:99
 msgid "32,000.00"
-msgstr ""
+msgstr "32,000.00"
 
-#: ../../general/base_import/import_faq.rst:51
+#: ../../general/base_import/import_faq.rst:100
 msgid "-32000.00"
-msgstr ""
+msgstr "-32000.00"
 
-#: ../../general/base_import/import_faq.rst:52
+#: ../../general/base_import/import_faq.rst:101
 msgid "(32000.00)"
-msgstr ""
+msgstr "(32000.00)"
 
-#: ../../general/base_import/import_faq.rst:53
+#: ../../general/base_import/import_faq.rst:102
 msgid "$ 32.000,00"
-msgstr ""
+msgstr "€ 32.000,00"
 
-#: ../../general/base_import/import_faq.rst:54
+#: ../../general/base_import/import_faq.rst:103
 msgid "(32000.00 €)"
-msgstr ""
+msgstr "(32000.00 €)"
 
-#: ../../general/base_import/import_faq.rst:56
+#: ../../general/base_import/import_faq.rst:105
 msgid "Example that will not work:"
-msgstr ""
+msgstr "Voorbeeld dat niet werkt:"
 
-#: ../../general/base_import/import_faq.rst:58
+#: ../../general/base_import/import_faq.rst:107
 msgid "ABC 32.000,00"
-msgstr ""
+msgstr "ABC 32.000,00"
 
-#: ../../general/base_import/import_faq.rst:59
+#: ../../general/base_import/import_faq.rst:108
 msgid "$ (32.000,00)"
-msgstr ""
+msgstr "€ (32.000,00)"
 
-#: ../../general/base_import/import_faq.rst:64
+#: ../../general/base_import/import_faq.rst:113
 msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
+"Wat kan ik doen als de tabel Importeervoorbeeld niet correct wordt "
+"weergegeven?"
 
-#: ../../general/base_import/import_faq.rst:66
+#: ../../general/base_import/import_faq.rst:115
 msgid ""
 "By default the Import preview is set on commas as field separators and "
 "quotation marks as text delimiters. If your csv file does not have these "
@@ -238,20 +375,20 @@ msgid ""
 " CSV file bar after you select your file)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:68
+#: ../../general/base_import/import_faq.rst:117
 msgid ""
 "Note that if your CSV file has a tabulation as separator, Odoo will not "
 "detect the separations. You will need to change the file format options in "
 "your spreadsheet application. See the following question."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:73
+#: ../../general/base_import/import_faq.rst:122
 msgid ""
 "How can I change the CSV file format options when saving in my spreadsheet "
 "application?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:75
+#: ../../general/base_import/import_faq.rst:124
 msgid ""
 "If you edit and save CSV files in speadsheet applications, your computer's "
 "regional settings will be applied for the separator and delimiter. We "
@@ -260,17 +397,17 @@ msgid ""
 "filter settings' > Save)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:77
+#: ../../general/base_import/import_faq.rst:126
 msgid ""
 "Microsoft Excel will allow you to modify only the encoding when saving (in "
 "'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:82
+#: ../../general/base_import/import_faq.rst:131
 msgid "What's the difference between Database ID and External ID?"
-msgstr ""
+msgstr "Wat is het verschil tussen Database ID en Extern ID?"
 
-#: ../../general/base_import/import_faq.rst:84
+#: ../../general/base_import/import_faq.rst:133
 msgid ""
 "Some fields define a relationship with another object. For example, the "
 "country of a contact is a link to a record of the 'Country' object. When you"
@@ -280,58 +417,60 @@ msgid ""
 "import."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:86
+#: ../../general/base_import/import_faq.rst:135
 msgid ""
 "For example, to reference the country of a contact, Odoo proposes you 3 "
 "different fields to import:"
 msgstr ""
+"Bijvoorbeeld, om te verwijzen naar het land van een contactpersoon, stelt "
+"Odoo u 3 verschillende en importeerbare velden voor:"
 
-#: ../../general/base_import/import_faq.rst:88
+#: ../../general/base_import/import_faq.rst:137
 msgid "Country: the name or code of the country"
 msgstr "Land: de naam of code van het land"
 
-#: ../../general/base_import/import_faq.rst:89
+#: ../../general/base_import/import_faq.rst:138
 msgid ""
 "Country/Database ID: the unique Odoo ID for a record, defined by the ID "
 "postgresql column"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:90
+#: ../../general/base_import/import_faq.rst:139
 msgid ""
 "Country/External ID: the ID of this record referenced in another application"
 " (or the .XML file that imported it)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:92
+#: ../../general/base_import/import_faq.rst:141
 msgid "For the country Belgium, you can use one of these 3 ways to import:"
-msgstr ""
+msgstr "Het land België kunt op één van deze drie manieren importeren:"
 
-#: ../../general/base_import/import_faq.rst:94
+#: ../../general/base_import/import_faq.rst:143
 msgid "Country: Belgium"
 msgstr "Land: België"
 
-#: ../../general/base_import/import_faq.rst:95
+#: ../../general/base_import/import_faq.rst:144
 msgid "Country/Database ID: 21"
-msgstr ""
+msgstr "Land/Database ID: 21"
 
-#: ../../general/base_import/import_faq.rst:96
+#: ../../general/base_import/import_faq.rst:145
 msgid "Country/External ID: base.be"
 msgstr "Land/Externe ID: base.be"
 
-#: ../../general/base_import/import_faq.rst:98
+#: ../../general/base_import/import_faq.rst:147
 msgid ""
 "According to your need, you should use one of these 3 ways to reference "
 "records in relations. Here is when you should use one or the other, "
 "according to your need:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:100
+#: ../../general/base_import/import_faq.rst:149
 msgid ""
 "Use Country: This is the easiest way when your data come from CSV files that"
 " have been created manually."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:101
+#: ../../general/base_import/import_faq.rst:150
 msgid ""
 "Use Country/Database ID: You should rarely use this notation. It's mostly "
 "used by developers as it's main advantage is to never have conflicts (you "
@@ -339,13 +478,13 @@ msgid ""
 "Database ID)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:102
+#: ../../general/base_import/import_faq.rst:151
 msgid ""
 "Use Country/External ID: Use External ID when you import data from a third "
 "party application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:104
+#: ../../general/base_import/import_faq.rst:153
 msgid ""
 "When you use External IDs, you can import CSV files with the \"External ID\""
 " column to define the External ID of each record you import. Then, you will "
@@ -354,23 +493,23 @@ msgid ""
 "Products and their Categories."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:106
+#: ../../general/base_import/import_faq.rst:155
 msgid ""
 "`CSV file for categories "
 "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:108
+#: ../../general/base_import/import_faq.rst:157
 msgid ""
 "`CSV file for Products "
 "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:112
+#: ../../general/base_import/import_faq.rst:161
 msgid "What can I do if I have multiple matches for a field?"
 msgstr "Wat moet ik doen als ik verschillende matches heb voor een veld?"
 
-#: ../../general/base_import/import_faq.rst:114
+#: ../../general/base_import/import_faq.rst:163
 msgid ""
 "If for example you have two product categories with the child name "
 "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other "
@@ -381,20 +520,20 @@ msgid ""
 "the duplicates' values or your product category hierarchy."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:116
+#: ../../general/base_import/import_faq.rst:165
 msgid ""
 "However if you do not wish to change your configuration of product "
 "categories, we recommend you use make use of the external ID for this field "
 "'Category'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:121
+#: ../../general/base_import/import_faq.rst:170
 msgid ""
 "How can I import a many2many relationship field (e.g. a customer that has "
 "multiple tags)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:123
+#: ../../general/base_import/import_faq.rst:172
 msgid ""
 "The tags should be separated by a comma without any spacing. For example, if"
 " you want your customer to be linked to both tags 'Manufacturer' and "
@@ -402,19 +541,19 @@ msgid ""
 " of your CSV file."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:125
+#: ../../general/base_import/import_faq.rst:174
 msgid ""
 "`CSV file for Manufacturer, Retailer "
 "<../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:130
+#: ../../general/base_import/import_faq.rst:179
 msgid ""
 "How can I import a one2many relationship (e.g. several Order Lines of a "
 "Sales Order)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:132
+#: ../../general/base_import/import_faq.rst:181
 msgid ""
 "If you want to import sales order having several order lines; for each order"
 " line, you need to reserve a specific row in the CSV file. The first order "
@@ -425,41 +564,41 @@ msgid ""
 "you can import, based on demo data."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:135
+#: ../../general/base_import/import_faq.rst:184
 msgid ""
 "`File for some Quotations "
 "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:137
+#: ../../general/base_import/import_faq.rst:186
 msgid ""
 "The following CSV file shows how to import purchase orders with their "
 "respective purchase order lines:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:139
+#: ../../general/base_import/import_faq.rst:188
 msgid ""
 "`Purchase orders with their respective purchase order lines "
 "<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:141
+#: ../../general/base_import/import_faq.rst:190
 msgid ""
 "The following CSV file shows how to import customers and their respective "
 "contacts:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:143
+#: ../../general/base_import/import_faq.rst:192
 msgid ""
 "`Customers and their respective contacts "
 "<../../_static/example_files/o2m_customers_contacts.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:148
+#: ../../general/base_import/import_faq.rst:197
 msgid "Can I import several times the same record?"
 msgstr "Kan ik meerdere malen hetzelfde record importeren?"
 
-#: ../../general/base_import/import_faq.rst:150
+#: ../../general/base_import/import_faq.rst:199
 msgid ""
 "If you import a file that contains one of the column \"External ID\" or "
 "\"Database ID\", records that have already been imported will be modified "
@@ -469,17 +608,17 @@ msgid ""
 "depending if it's new or not."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:152
+#: ../../general/base_import/import_faq.rst:201
 msgid ""
 "This feature allows you to use the Import/Export tool of Odoo to modify a "
 "batch of records in your favorite spreadsheet application."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:157
+#: ../../general/base_import/import_faq.rst:206
 msgid "What happens if I do not provide a value for a specific field?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:159
+#: ../../general/base_import/import_faq.rst:208
 msgid ""
 "If you do not set all fields in your CSV file, Odoo will assign the default "
 "value for every non defined fields. But if you set fields with empty values "
@@ -487,11 +626,11 @@ msgid ""
 "assigning the default value."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:164
+#: ../../general/base_import/import_faq.rst:213
 msgid "How to export/import different tables from an SQL application to Odoo?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:166
+#: ../../general/base_import/import_faq.rst:215
 msgid ""
 "If you need to import data from different tables, you will have to recreate "
 "relations between records belonging to different tables. (e.g. if you import"
@@ -499,7 +638,7 @@ msgid ""
 "person and the company they work for)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:168
+#: ../../general/base_import/import_faq.rst:217
 msgid ""
 "To manage relations between tables, you can use the \"External ID\" "
 "facilities of Odoo. The \"External ID\" of a record is the unique identifier"
@@ -509,7 +648,7 @@ msgid ""
 "'company_1', 'person_1' instead of '1')"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:170
+#: ../../general/base_import/import_faq.rst:219
 msgid ""
 "As an example, suppose you have a SQL database with two tables you want to "
 "import: companies and persons. Each person belong to one company, so you "
@@ -519,27 +658,27 @@ msgid ""
 "PostgreSQL database</a>)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:172
+#: ../../general/base_import/import_faq.rst:221
 msgid ""
 "We will first export all companies and their \"External ID\". In PSQL, write"
 " the following command:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:178
+#: ../../general/base_import/import_faq.rst:227
 msgid "This SQL command will create the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:185
+#: ../../general/base_import/import_faq.rst:234
 msgid ""
 "To create the CSV file for persons, linked to companies, we will use the "
 "following SQL command in PSQL:"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:191
+#: ../../general/base_import/import_faq.rst:240
 msgid "It will produce the following CSV file::"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:199
+#: ../../general/base_import/import_faq.rst:248
 msgid ""
 "As you can see in this file, Fabien and Laurence are working for the Bigees "
 "company (company_1) and Eric is working for the Organi company. The relation"
@@ -549,7 +688,7 @@ msgid ""
 " who shared the same ID 1 in the orignial database)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:201
+#: ../../general/base_import/import_faq.rst:250
 msgid ""
 "The two files produced are ready to be imported in Odoo without any "
 "modifications. After having imported these two CSV files, you will have 4 "
@@ -573,7 +712,7 @@ msgstr ""
 
 #: ../../general/odoo_basics/add_user.rst:9
 msgid "Add individual users"
-msgstr ""
+msgstr "Voeg individuele gebruikers toe"
 
 #: ../../general/odoo_basics/add_user.rst:11
 msgid ""
@@ -624,7 +763,7 @@ msgstr ""
 
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
-msgstr ""
+msgstr "Beheer Odoo in uw eigen taal"
 
 #: ../../general/odoo_basics/choose_language.rst:5
 msgid ""
@@ -634,7 +773,7 @@ msgstr ""
 
 #: ../../general/odoo_basics/choose_language.rst:9
 msgid "Load your desired language"
-msgstr ""
+msgstr "Laad uw gewenste taal"
 
 #: ../../general/odoo_basics/choose_language.rst:11
 msgid ""
@@ -677,7 +816,7 @@ msgstr ""
 
 #: ../../general/odoo_basics/choose_language.rst:45
 msgid "Change another user's language"
-msgstr ""
+msgstr "Wijzig een andere gebruiker zijn taal"
 
 #: ../../general/odoo_basics/choose_language.rst:47
 msgid ""
@@ -697,4 +836,4 @@ msgstr ""
 
 #: ../../general/odoo_basics/choose_language.rst:61
 msgid ":doc:`../../website/publish/translate`"
-msgstr ""
+msgstr ":doc:`../../website/publish/translate`"

locale/nl/LC_MESSAGES/getting_started.po

@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../getting_started/documentation.rst:5
 msgid "Odoo Online Implementation"
-msgstr ""
+msgstr "Odoo online implementatie"
 
 #: ../../getting_started/documentation.rst:7
 msgid ""
@@ -733,6 +733,8 @@ msgid ""
 "You can find more information on how to manage your databases :ref:`here "
 "<db_management/documentation>`."
 msgstr ""
+"U kan :ref:`here <db_management/documentation>` meer informatie vinden over "
+"hoe uw database te beheren."
 
 #: ../../getting_started/documentation.rst:375
 msgid "Customer Success"

locale/nl/LC_MESSAGES/inventory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xavier Symons <xsy@openerp.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -772,6 +772,10 @@ msgid ""
 "values for a given product."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Active"
+msgstr "Actief"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
@@ -780,10 +784,18 @@ msgstr ""
 "Als het actief veld uit staat, kunt u de minimale voorraadregel verbergen "
 "zonder deze te verwijderen."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Product Unit of Measure"
+msgstr "Maateenheid product"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr "Standaard maateenheid voor alle voorraadhandelingen."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Procurement Group"
+msgstr "Verwervingsgroep"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Moves created through this orderpoint will be put in this procurement group."
@@ -795,6 +807,10 @@ msgstr ""
 "mutaties, gegenereerd door de verwervingsregel gegroepeerd in één grote "
 "levering."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Minimum Quantity"
+msgstr "Minimale hoeveelheid"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity specified for this field,"
@@ -805,6 +821,10 @@ msgstr ""
 "gespecificeerd in dit veld, zal Odoo een verwervingsopdracht genereren om de"
 " verwachte voorraad aan te vullen tot de maximale hoeveelheid."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Maximum Quantity"
+msgstr "Maximale hoeveelheid"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "When the virtual stock goes below the Min Quantity, Odoo generates a "
@@ -815,6 +835,10 @@ msgstr ""
 "gespecificeerd in dit veld, zal Odoo een verwervingsopdracht genereren om de"
 " verwachte voorraad aan te vullen tot de maximale hoeveelheid."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Quantity Multiple"
+msgstr "Veelvoud"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "The procurement quantity will be rounded up to this multiple.  If it is 0, "
@@ -823,6 +847,10 @@ msgstr ""
 "De verwerving hoeveelheid zal worden afgerond op deze veelvoud. Bij 0 wordt "
 "de exacte hoeveelheid gebruikt."
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Lead Time"
+msgstr "Doorlooptijd"
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
 "Number of days after the orderpoint is triggered to receive the products or "

locale/nl/LC_MESSAGES/manufacturing.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-23 15:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "Productie verwerkingen"
 
 #: ../../manufacturing/operations/replenishment.rst:3
 msgid "Replenishment Strategies"
-msgstr ""
+msgstr "Bevoorrading Strategieën"
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:3
 msgid "How to select the right replenishment strategy"
-msgstr ""
+msgstr "Hoe de correcte bevoorrading strategie te kiezen"
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:5
 msgid ""
@@ -40,6 +40,9 @@ msgid ""
 "different rules. They should be used depending on your manufacturing and "
 "delivery strategies."
 msgstr ""
+"Minimale voorraadregels en Maak op Order hebben soortgelijke gevolgen maar "
+"verschillende regels. Ze moeten worden gebruikt, afhankelijk van uw "
+"productie- en levering- strategieën."
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:10
 msgid "Terminology"
@@ -57,6 +60,12 @@ msgid ""
 " minimum the system will automatically generate a procurement order with the"
 " quantity needed to reach the maximum stock level."
 msgstr ""
+"Minimum voorraadregels worden gebruikt om ervoor te zorgen dat u altijd het "
+"minimale aantal producten op voorraad heeft om uw producten te kunnen "
+"vervaardigen en / of te beantwoorden aan uw klantenbehoeften. Wanneer het "
+"voorraadniveau van een product het minimum bereikt, zal het systeem "
+"automatisch een inkooporder genereren met de hoeveelheid die nodig is om het"
+" maximale voorraadniveau te bereiken."
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:22
 #: ../../manufacturing/operations/replenishment/strategies.rst:58
@@ -70,6 +79,10 @@ msgid ""
 "current stock. This means that a draft purchase order will be generated "
 "regardless of the quantity on hand of the product."
 msgstr ""
+"Met de functie Maak op Order wordt een aankooporder geactiveerd dat gelijk "
+"is aan het aantal bestelde producten. Het systeem zal de huidige voorraad **"
+" niet ** controleren. Dit betekent dat een draft aankooporder wordt "
+"gegenereerd, ongeacht de beschikbare hoeveelheid."
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:30
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:27
@@ -116,7 +129,7 @@ msgstr ""
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:64
 msgid "On the product form, under Inventory, click on \"Make To Order\"."
-msgstr ""
+msgstr "Klik in het product scherm onder Inventaris op \"Maak op Order\"."
 
 #: ../../manufacturing/operations/replenishment/strategies.rst:70
 msgid "Choice between the two options"
@@ -141,7 +154,7 @@ msgstr "Materiaallijst"
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:3
 msgid "How to Sell a Set of Products as a Kit"
-msgstr ""
+msgstr "Hoe een set van producten verkopen als een Kit"
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:5
 msgid ""
@@ -154,7 +167,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:12
 msgid "Manage Stock of Component Products"
-msgstr ""
+msgstr "Beheer de Voorraad van Componenten"
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:14
 msgid ""
@@ -202,7 +215,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:53
 msgid "Manage Stock of Kit Product and Component Products"
-msgstr ""
+msgstr "Beheer de Voorraad van Kits en Componenten"
 
 #: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:55
 msgid ""
@@ -230,7 +243,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/bill_of_materials/product_variants.rst:3
 msgid "How to manage BoMs for product variants"
-msgstr ""
+msgstr "Hoe materiaallijsten (BoMs) beheren voor productvarianten?"
 
 #: ../../manufacturing/overview/bill_of_materials/product_variants.rst:5
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:125
@@ -239,6 +252,9 @@ msgid ""
 "same product. Simply enable variants from :menuselection:`Configuration --> "
 "Settings`."
 msgstr ""
+"Odoo stelt u in staat om één materiaallijst te gebruiken voor meerdere "
+"varianten van hetzelfde product. Schakel varianten in via: menuselectie "
+"binnen Productie: Instellingen-> \"Instellingen\"."
 
 #: ../../manufacturing/overview/bill_of_materials/product_variants.rst:12
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:132
@@ -259,7 +275,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:3
 msgid "How to manage semi-finished products"
-msgstr ""
+msgstr "Hoe half afgewerkte producten beheren"
 
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:5
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:83
@@ -283,7 +299,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:19
 msgid "Configure the Top -Level Product BoM"
-msgstr ""
+msgstr "Configureer de materiaallijst (BoM) op Top-niveau "
 
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:21
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:99
@@ -296,7 +312,7 @@ msgstr ""
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:29
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:107
 msgid "Configure the Subassembly Product Data"
-msgstr ""
+msgstr "Configureer de productgegevens van de subassemblage"
 
 #: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:31
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:109
@@ -321,11 +337,11 @@ msgstr "Aan de slag"
 
 #: ../../manufacturing/overview/getting_started.rst:5
 msgid "How to consume composents to make a finished product"
-msgstr ""
+msgstr "Hoe uw onderdelen verwerken om een afgewerkt product te maken"
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:3
 msgid "How to create a Bill of Materials"
-msgstr ""
+msgstr "Hoe een materiaallijst (BoM) maken"
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:5
 msgid ""
@@ -343,7 +359,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:14
 msgid "Setting up a Basic BoM"
-msgstr ""
+msgstr "Maken van een eenvoudige materiaallijst (BoM)"
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:16
 msgid ""
@@ -377,7 +393,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:38
 msgid "Adding a Routing to a BoM"
-msgstr ""
+msgstr "Routes toevoegen aan een materiaallijst (BoM)"
 
 #: ../../manufacturing/overview/getting_started/bill_configuration.rst:40
 msgid ""
@@ -442,7 +458,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:3
 msgid "How to process a manufacturing order"
-msgstr ""
+msgstr "Hoe een productieorder verwerken"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:6
 msgid "Introduction"
@@ -460,7 +476,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:17
 msgid "How to manage manufacturing without routings"
-msgstr ""
+msgstr "Hoe de productie beheren zonder routes"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:19
 msgid ""
@@ -475,11 +491,13 @@ msgid ""
 "Managing your operations in this way is the default behavior in Odoo. There "
 "are two basic phases from planning to production:"
 msgstr ""
+"Het beheer van uw productie handelingen is op deze wijze standaardgedrag in "
+"Odoo. Er zijn twee basisfasen van planning tot productie:"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:27
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:52
 msgid "Create manufacturing orders"
-msgstr ""
+msgstr "Maak productieorders"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:29
 msgid "Record Production"
@@ -487,7 +505,7 @@ msgstr "Productie vastleggen"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:32
 msgid "How to manage manufacturing with routings and work orders"
-msgstr ""
+msgstr "Hoe uw productie beheren met routes en werkorders"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:34
 msgid ""
@@ -515,15 +533,15 @@ msgstr ""
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:50
 msgid "The workflow is thus divided into three basic phases, as follows:"
-msgstr ""
+msgstr "De workflow is dus verdeeld in drie basisfasen, als volgt:"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:54
 msgid "Schedule the associated work orders."
-msgstr ""
+msgstr "Plan de bijbehorende werkorders"
 
 #: ../../manufacturing/overview/getting_started/manufacturing_order.rst:56
 msgid "Perform the scheduled work and record production."
-msgstr ""
+msgstr "Voer de geplande werkzaamheden uit en registreer de productie"
 
 #: ../../manufacturing/overview/main_concepts.rst:3
 msgid "Main Concepts"
@@ -531,7 +549,7 @@ msgstr "Belangrijkste concepten"
 
 #: ../../manufacturing/overview/main_concepts/intro.rst:3
 msgid "Introduction to Odoo Manufacturing"
-msgstr ""
+msgstr "Introductie Odoo Productie"
 
 #: ../../manufacturing/overview/main_concepts/intro.rst:11
 msgid "Transcript"
@@ -539,11 +557,11 @@ msgstr "Transcriptie"
 
 #: ../../manufacturing/overview/main_concepts/intro.rst:13
 msgid "Work in progress."
-msgstr ""
+msgstr "Werk in uitvoering (WIP)"
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:3
 msgid "Manufacturing Terminologies"
-msgstr ""
+msgstr "Productie Terminologieën"
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:9
 msgid ""
@@ -556,13 +574,15 @@ msgstr ""
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:14
 msgid "Cycle"
-msgstr ""
+msgstr "Cyclus"
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:17
 msgid ""
 "A production cycle is a frame of time during which an entire manufacturing "
 "process can be fulfilled."
 msgstr ""
+"Een productiecyclus is een tijdsbestek waarin een volledig productieproces "
+"kan worden afgewerkt."
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:19
 msgid "Downtime or Leave"
@@ -577,7 +597,7 @@ msgstr ""
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:25
 msgid "Finished products"
-msgstr ""
+msgstr "Afgewerkte producten"
 
 #: ../../manufacturing/overview/main_concepts/terminologies.rst:28
 msgid ""

locale/nl/LC_MESSAGES/point_of_sale.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -1586,7 +1586,7 @@ msgstr ""
 
 #: ../../point_of_sale/overview/setup.rst:255
 msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr ""
+msgstr "``# usermod -a -G usbusers USERNAME``"
 
 #: ../../point_of_sale/overview/setup.rst:257
 msgid ""
@@ -2326,18 +2326,34 @@ msgid ""
 "location,..."
 msgstr "U kan elke kassa configureren naar uw hardware, locatie,..."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Point of Sale Name"
+msgstr "Kassa naam"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "An internal identification of the point of sale"
 msgstr "Een interne identificatie van kassa"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Journal"
+msgstr "Verkoopboek"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to post sales entries."
 msgstr "Financieel dagboek gebruikt voor het maken van de verkoopboekingen."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoice Journal"
+msgstr "Factuur dagboek"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Accounting journal used to create invoices."
 msgstr "Dagboek gebruikt voor het maken van facturen."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Group Journal Items"
+msgstr "Groepeer boekingen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Check this if you want to group the Journal Items by Product while closing a"
@@ -2346,6 +2362,10 @@ msgstr ""
 "Vink deze optie aan indien u alle boekingen wilt groeperen per product, bij "
 "het sluiten van een sessie."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcodes"
+msgstr "Barcodes"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "Defines what kind of barcodes are available and how they are assigned to "
@@ -2354,6 +2374,10 @@ msgstr ""
 "Definieert welke barcodes beschikbaar zijn en hoe ze worden toegewezen aan "
 "producten, klanten en kassières"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Order IDs Sequence"
+msgstr "Ordernummer reeks"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "This sequence is automatically created by Odoo but you can change it to "
@@ -2362,18 +2386,35 @@ msgstr ""
 "Deze nummering zal automatisch gegenereerd worden door Odoo, maar u kunt ook"
 " uw eigen nummering samenstellen."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Sales Channel"
+msgstr "Verkoopkanaal"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "This Point of sale's sales will be related to this Sales Channel."
 msgstr ""
+"Deze kassa zijn verkopen zullen gerelateerd zijn aan dit verkoopkanaal."
+
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Virtual KeyBoard"
+msgstr "Virtueel Toetsenbord"
 
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables an integrated Virtual Keyboard"
 msgstr "Activeer het geïntegreerde virtuele toetsenbord"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Invoicing"
+msgstr "Facturatie"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables invoice generation from the Point of Sale"
 msgstr "Activeer het aanmaken van facturen door de kassa"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Prefill Cash Payment"
+msgstr "Vooraf contante betaling invullen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The payment input will behave similarily to bank payment input, and will be "
@@ -2382,6 +2423,10 @@ msgstr ""
 "De betalingsingave gedraagt zich gelijkwaardig aan de bankafschrift ingave "
 "en wordt automatisch ingevuld met het exacte verschuldigde bedrag"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Start Category"
+msgstr "Startcategorie"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The point of sale will display this product category by default. If no "
@@ -2390,6 +2435,10 @@ msgstr ""
 "De kassa toont de productcategorieën standaard. Als er geen categorie is "
 "gespecificeerd worden alle producten getoond"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Tip Product"
+msgstr "Fooi product"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The product used to encode the customer tip. Leave empty if you do not "
@@ -2398,6 +2447,10 @@ msgstr ""
 "Het product te encoderen voor de klantenfooi. Laat dit leeg als u geen "
 "fooien accepteert."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Include Taxes in Prices"
+msgstr "Prijzen inclusief BTW"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The displayed prices will always include all taxes, even if the taxes have "
@@ -2406,14 +2459,26 @@ msgstr ""
 "De weergegeven prijzen zijn altijd inclusief BTW, zelfs als de BTW anders "
 "zijn opgezet"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Large Scrollbars"
+msgstr "Grote scrollbalken"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "For imprecise industrial touchscreens"
 msgstr "Voor onnauwkeurige industriële touchscreens"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Display Category Pictures"
+msgstr "Toon categorie afbeeldingen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The product categories will be displayed with pictures."
 msgstr "De productcategorieën worden getoond met afbeeldingen."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "IP Address"
+msgstr "IP-adres"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The hostname or ip address of the hardware proxy, Will be autodetected if "
@@ -2422,27 +2487,51 @@ msgstr ""
 "De hostnaam of het IP adres van de hardware proxy worden automatisch "
 "gedetecteerd als het veld leeg wordt gelaten."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Barcode Scanner"
+msgstr "Barcode scanner"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enable barcode scanning with a remotely connected barcode scanner"
 msgstr ""
 "Activeer barcode scannen m.b.v. een op afstand verbonden barcode scanner"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Electronic Scale"
+msgstr "Electronisch weegschaal"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Electronic Scale integration"
 msgstr "Activeer de integratie met een electrische weegschaal"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cashdrawer"
+msgstr "Kassalade"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Automatically open the cashdrawer"
 msgstr "Open de kassalade automatisch"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Receipt Printer"
+msgstr "Kassabonprinter"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Bypass browser printing and prints via the hardware proxy"
 msgstr "Niet via de browser afdrukken, maar via de hardware proxy"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Automatic Receipt Printing"
+msgstr "Automatisch kassabon afdrukken"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The receipt will automatically be printed at the end of each order"
 msgstr "De kassabon wordt automatisch afgedrukt aan het einde van elke order"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Skip Receipt Screen"
+msgstr "Sla kassabon scherm over"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid ""
 "The receipt screen will be skipped if the receipt can be printed "
@@ -2451,32 +2540,60 @@ msgstr ""
 "Het kassabon scherm wordt overgeslagen als de kassabon automatisch afgedrukt"
 " kan worden."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Header"
+msgstr "Kop"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a header in the printed receipt"
 msgstr ""
 "Een korte tekst die als koptekst in de afgedrukte bon zal worden ingevoegd"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Footer"
+msgstr "Voettekst"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "A short text that will be inserted as a footer in the printed receipt"
 msgstr ""
 "Een korte tekst die als voettekst in de afgedrukte bon zal worden ingevoegd"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Cash Control"
+msgstr "Kas controle"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Check the amount of the cashbox at opening and closing."
 msgstr "Controleer het bedrag van de kas bij het openen en sluiten."
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Splitting"
+msgstr "Rekening splitsen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Enables Bill Splitting in the Point of Sale"
 msgstr "Sta splitsen van rekeningen toe in het verkooppunt"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Bill Printing"
+msgstr "Rekening printen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allows to print the Bill before payment"
 msgstr "Zorgt ervoor dat u de factuur kan afdrukken voor betaling"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Orderline Notes"
+msgstr "Orderregel notities"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "Allow custom notes on Orderlines"
 msgstr "Sta aangepaste notities toe op orderregels"
 
+#: ../../point_of_sale/overview/start.rst:0
+msgid "Restaurant Floors"
+msgstr "Restaurantverdiepingen"
+
 #: ../../point_of_sale/overview/start.rst:0
 msgid "The restaurant floors served by this point of sale"
 msgstr "De restaurant verdiepingen bediend met deze kassa"
@@ -3378,6 +3495,10 @@ msgstr ""
 "kan op alle producten gedaan worden of enkel op specifieke producten. Klik "
 "op **Item toevoegen**."
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Active"
+msgstr "Actief"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
@@ -3385,6 +3506,10 @@ msgstr ""
 "Indien niet aangevinkt, kunt u de prijslijst verbergen, zonder deze te "
 "wissen."
 
+#: ../../point_of_sale/shop/seasonal_discount.rst:0
+msgid "Selectable"
+msgstr "Kiesbaar"
+
 #: ../../point_of_sale/shop/seasonal_discount.rst:0
 msgid "Allow the end user to choose this price list"
 msgstr "Sta de eindgebruiker toe om de prijslijst te kiezen"

locale/nl/LC_MESSAGES/practical.po

@@ -10,6 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-23 15:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,4 +20,4 @@ msgstr ""
 
 #: ../../practical.rst:3
 msgid "Practical Information"
-msgstr ""
+msgstr "Praktische informatie"

locale/nl/LC_MESSAGES/purchase.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -1862,10 +1862,18 @@ msgid ""
 "date to which you wish to proceed to the actual order."
 msgstr ""
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Shipment"
+msgstr "Ontvangst"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Incoming Shipments"
 msgstr "Inkomende leveringen"
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Vendor Reference"
+msgstr "Leveranciers referentie"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the sales order or bid sent by the vendor. It's used to do the "
@@ -1876,6 +1884,10 @@ msgstr ""
 "bedoelde om de koppeling te doen tussen ontvangen producten omdat deze "
 "referentie meestal geschreven is op de pakbon verzonden door uw leverancier."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Order Date"
+msgstr "Orderdatum"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Depicts the date where the Quotation should be validated and converted into "
@@ -1884,16 +1896,28 @@ msgstr ""
 "Geeft de datum aan waarop de offerte bevestigd en geconverteerd moet worden "
 "in een inkooporder."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Source Document"
+msgstr "Brondocument"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Reference of the document that generated this purchase order request (e.g. a"
 " sales order or an internal procurement request)"
 msgstr ""
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Deliver To"
+msgstr "Leveren aan"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "This will determine picking type of incoming shipment"
 msgstr "Dit bepaald de ontvangstwijze van de inkomende levering."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Drop Ship Address"
+msgstr "Dropship afleveradres"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "Put an address if you want to deliver directly from the vendor to the "
@@ -1902,11 +1926,19 @@ msgstr ""
 "Geef een adres in, indien u direct vanaf de leverancier wilt leveren aan de "
 "klant. Laat leeg om te leveren aan uw eigen bedrijf."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Destination Location Type"
+msgstr "Bestemmingslocatie soort"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid "Technical field used to display the Drop Ship Address"
 msgstr ""
 "Technisch veld welke wordt gebruikt om het dropshipment adres weer te geven."
 
+#: ../../purchase/purchases/rfq/create.rst:0
+msgid "Incoterm"
+msgstr "Leveringscondities"
+
 #: ../../purchase/purchases/rfq/create.rst:0
 msgid ""
 "International Commercial Terms are a series of predefined commercial terms "

locale/nl/LC_MESSAGES/sales.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ../../sales/advanced/portal.rst:20
 msgid "How to give portal access to customers?"
-msgstr "Hoe geef ik portaal toegang aan mij gebruikers"
+msgstr "Hoe geef ik portaal toegang aan mijn gebruikers"
 
 #: ../../sales/advanced/portal.rst:23
 msgid "From Contacts Module"
@@ -909,16 +909,11 @@ msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:66
 msgid ""
-"There are different ways to track the service related to a sale order or "
+"There are different ways to track the service related to a sales order or "
 "product sold. With the above configuration, you can only sell one support "
 "contract per order. If your customer orders several service contracts on "
 "timesheet, you will have to split the quotation into several orders."
 msgstr ""
-"Er zijn verschillende manieren om de diensten gerelateerd aan een "
-"verkooporder of verkocht product te volgen. Met de bovenstaande configuratie"
-" kan u slechts één ondersteuningscontract per order verkopen. Indien uw "
-"klant meerdere ondersteuningscontracten besteld op urenstaat moet u de "
-"offerte uitsplitsen in meerdere orders."
 
 #: ../../sales/invoicing/services/support.rst:72
 msgid ""
@@ -937,20 +932,16 @@ msgid "Managing support contract"
 msgstr "Ondersteuningscontract beheren"
 
 #: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sale Orders"
+msgid "Quotations and Sales Orders"
 msgstr "Offertes en verkooporders"
 
 #: ../../sales/invoicing/services/support.rst:83
 msgid ""
-"Once the product is created, you can create a quotation or a sale order with"
-" the related product. Once the quotation is confirmed and transformed into a"
-" sale order, your users will be able to record services related to this "
-"support contract using the timesheet application."
+"Once the product is created, you can create a quotation or a sales order "
+"with the related product. Once the quotation is confirmed and transformed "
+"into a sales order, your users will be able to record services related to "
+"this support contract using the timesheet application."
 msgstr ""
-"Eenmaal het product is aangemaakt kan u een offerte of verkooporder aanmaken"
-" met het gerelateerde product. Eenmaal de offerte bevestigd is en omgevormd "
-"is in een verkooporder kan uw gebruiker de diensten gerelateerd aan het "
-"ondersteuningscontract bewaren dankzij de urenstaten applicatie."
 
 #: ../../sales/invoicing/services/support.rst:93
 msgid "Timesheets"
@@ -970,8 +961,8 @@ msgstr ""
 "vanaf ze verkocht zijn."
 
 #: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sale order"
-msgstr "Controleer geleverde ondersteuning op het verkooporder"
+msgid "Control delivered support on the sales order"
+msgstr ""
 
 #: ../../sales/invoicing/services/support.rst:106
 msgid ""
@@ -994,31 +985,14 @@ msgstr "Upselling en vernieuwing"
 #: ../../sales/invoicing/services/support.rst:118
 msgid ""
 "If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, the sale order "
-"**Invoicing Status** is automatically set to **Upselling**. This means you "
-"have an opportunity to sell an extra contract to the customer since he used "
-"all his quota of service."
+"equal to the number of hours the customer purchased, you are suggested to "
+"sell an extra contract to the customer since they used all their quota of "
+"service. Periodically (ideally once every two weeks), you should check the "
+"sales order that are in such a case. To do so, go to :menuselection:`Sales "
+"--> Invoicing --> Orders to Upsell`."
 msgstr ""
-"Als het aantal uren dat u heeft gepresteerd op het ondersteuningscontract "
-"groter of gelijk is aan het aantal uren dat de klant heeft aangekocht wordt "
-"de verkooporder zijn **Facturatie status** automatisch ingesteld op "
-"**Upselling**. Dit betekend dat u een opportuniteit heeft om een extra "
-"contract te verkopen aan de klant aangezien hij zijn quota voor de dienst "
-"heeft opgebruikt."
 
-#: ../../sales/invoicing/services/support.rst:124
-msgid ""
-"Periodically (ideally once every two weeks), you should check the sales "
-"order that are in an upselling status. To do this, go to the "
-":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter"
-" to get all orders that are in upselling."
-msgstr ""
-"Periodiek (ideaal elke twee weken), zou u de verkooporders moeten "
-"controleren die zich in de upselling status bevinden. Om dit te doen gaat u "
-"naar :menuselection:`Verkopen --> Verkooporder` en gebruikt u de "
-"**Upselling** filter om alle orders in deze fase te vinden."
-
-#: ../../sales/invoicing/services/support.rst:130
+#: ../../sales/invoicing/services/support.rst:127
 msgid ""
 "If you use Odoo CRM, a good practice is to create an opportunity for every "
 "sale order in upselling invoice status so that you easily track your "
@@ -1028,26 +1002,20 @@ msgstr ""
 "aan te maken voor elke verkooporder in de factuurstatus zodat u gemakkelijk "
 "uw upselling kan traceren."
 
-#: ../../sales/invoicing/services/support.rst:134
+#: ../../sales/invoicing/services/support.rst:131
 msgid ""
 "If you sell an extra support contract, you can either add a new line on the "
-"existing sale order (thus, you continue to timesheet on the same order) or "
+"existing sales order (thus, you continue to timesheet on the same order) or "
 "create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sale order as **Upselling**, you can set the sale "
-"order as done and it will disappear from your upselling list."
+"contract). To unmark the sales order as **Upselling**, you can set the sales"
+" order as done and it will disappear from your upselling list."
 msgstr ""
-"Indien u een extra ondersteuningscontract verkoopt kan u een nieuwe lijn "
-"toevoegen aan het bestaande verkooporder (u bewaard dus nog steeds uw "
-"urenstaten op hetzelfde order) of u maakt een nieuw order(mensen moeten hun "
-"urenstaten op het nieuwe contract boeken). Om de verkooporder te demarkeren "
-"als **Upselling** kan u de verkooporder naar de status verwerkt zetten en "
-"het zal vervolgens verdwijnen uit uw upselling lijst."
 
-#: ../../sales/invoicing/services/support.rst:141
+#: ../../sales/invoicing/services/support.rst:138
 msgid "Special Configuration"
 msgstr "Speciale configuratie"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/services/support.rst:140
 msgid ""
 "When creating the product form, you may set a different approach to track "
 "the service:"
@@ -1055,33 +1023,23 @@ msgstr ""
 "Wanneer u het productformulier aanmaakt kan u een andere aanpak instellen om"
 " de dienst op te volgen:"
 
-#: ../../sales/invoicing/services/support.rst:146
+#: ../../sales/invoicing/services/support.rst:143
 msgid ""
 "**Create task and track hours**: in this mode, a task is created for every "
-"sale order line. Then when you do the timesheet, you don't record hours on a"
-" sale order/contract, but you record hours on a task (that represents the "
+"sales order line. Then when you do the timesheet, you don't record hours on "
+"a sales order/contract, but you record hours on a task (that represents the "
 "contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sale order."
+"service contracts within the same sales order."
 msgstr ""
-"**Maak taken en traceer uren**: In deze modus wordt een taak aangemaakt voor"
-" elke verkooporderlijn. Wanneer u vervolgens de urenstaat doet worden er "
-"geen uren geregistreerd op de verkooporder / het contract, maar uren op een "
-"taak (die het contract voorstelt). Het voordeel van deze oplossing is dat "
-"het toestaat om meerdere dienst contracten te verkopen binnen hetzelfde "
-"verkooporder."
 
-#: ../../sales/invoicing/services/support.rst:153
+#: ../../sales/invoicing/services/support.rst:150
 msgid ""
 "**Manually**: you can use this mode if you don't record timesheets in Odoo. "
 "The number of hours you worked on a specific contract can be recorded "
-"manually on the sale order line directly, in the delivered quantity field."
+"manually on the sales order line directly, in the delivered quantity field."
 msgstr ""
-"**Manueel**: u kan deze modus gebruiken indien u geen urenstaten logt in "
-"Odoo. Het aantal uren dat u werkt aan een specifiek contract kan direct "
-"manueel genoteerd worden op de verkooporder, in het geleverde hoeveelheid "
-"veld."
 
-#: ../../sales/invoicing/services/support.rst:159
+#: ../../sales/invoicing/services/support.rst:156
 msgid ":doc:`../../../inventory/settings/products/uom`"
 msgstr ":doc:`../../../inventory/settings/products/uom`"
 
@@ -1349,15 +1307,11 @@ msgstr ":menuselection:`eCommerce Order --> Factuur`"
 
 #: ../../sales/overview/main_concepts/invoicing.rst:69
 msgid ""
-"An eCommerce order will also trigger the creation of the order when it is "
+"An eCommerce order will also trigger the creation of the invoice when it is "
 "fully paid. If you allow paying orders by check or wire transfer, Odoo only "
 "creates an order and the invoice will be triggered once the payment is "
 "received."
 msgstr ""
-"Een e-commerce order doet ook het aanmaken van het order afgaan wanneer deze"
-" volledig betaald is. Indien u toestaat dat Orders betaald worden via cheque"
-" of overschrijving zal Odoo enkel een order aanmaken en wordt de factuur "
-"aangemaakt wanneer de betaling ontvangen is."
 
 #: ../../sales/overview/main_concepts/invoicing.rst:75
 msgid "Creating an invoice manually"
@@ -1421,15 +1375,17 @@ msgstr "Producten & Prijzen"
 
 #: ../../sales/products_prices/prices.rst:3
 msgid "Manage your pricing"
-msgstr ""
+msgstr "Beheer uw prijzen"
 
 #: ../../sales/products_prices/prices/currencies.rst:3
 msgid "How to sell in foreign currencies"
-msgstr ""
+msgstr "Hoe te verkopen in vreemde valuta"
 
 #: ../../sales/products_prices/prices/currencies.rst:5
 msgid "Pricelists can also be used to manage prices in foreign currencies."
 msgstr ""
+"Prijslijsten kunnen ook gebruikt worden om prijzen in vreemde valuta te "
+"beheren."
 
 #: ../../sales/products_prices/prices/currencies.rst:7
 msgid ""
@@ -1454,10 +1410,11 @@ msgstr ""
 #: ../../sales/products_prices/prices/currencies.rst:17
 msgid "Prices in foreign currencies can be defined in two fashions."
 msgstr ""
+"De prijzen in vreemde valuta kunnen worden gedefinieerd op twee manieren."
 
 #: ../../sales/products_prices/prices/currencies.rst:20
 msgid "Automatic conversion from public price"
-msgstr ""
+msgstr "Automatische omschakeling van de publieke prijs"
 
 #: ../../sales/products_prices/prices/currencies.rst:22
 msgid ""
@@ -1475,21 +1432,23 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/currencies.rst:40
 msgid "Set your own prices"
-msgstr ""
+msgstr "Stel uw eigen prijzen in"
 
 #: ../../sales/products_prices/prices/currencies.rst:42
 msgid ""
 "This is advised if you don't want your pricing to change along with currency"
 " rates."
 msgstr ""
+"Dit wordt geadviseerd als u niet wilt dat uw prijzen veranderen door "
+"wisselkoersen"
 
 #: ../../sales/products_prices/prices/currencies.rst:49
 msgid ":doc:`pricing`"
-msgstr ""
+msgstr ":doc:`prijzen`"
 
 #: ../../sales/products_prices/prices/pricing.rst:3
 msgid "How to adapt your prices to your customers and apply discounts"
-msgstr ""
+msgstr "Hoe uw prijzen aan uw klanten aanpassen en kortingen toepassen"
 
 #: ../../sales/products_prices/prices/pricing.rst:5
 msgid ""
@@ -1504,7 +1463,7 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:16
 msgid "Several prices per product"
-msgstr ""
+msgstr "Verschillende prijzen per product"
 
 #: ../../sales/products_prices/prices/pricing.rst:18
 msgid ""
@@ -1515,12 +1474,14 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:23
 msgid "Prices per customer segment"
-msgstr ""
+msgstr "Prijzen per klantsegment"
 
 #: ../../sales/products_prices/prices/pricing.rst:25
 msgid ""
 "Create pricelists for your customer segments: e.g. registered, premium, etc."
 msgstr ""
+"Prijslijsten maken voor uw klantsegmenten: b.v. Partner, eindgebruiker, "
+"distributeur enz."
 
 #: ../../sales/products_prices/prices/pricing.rst:30
 msgid ""
@@ -1531,11 +1492,13 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:38
 msgid "Temporary prices"
-msgstr ""
+msgstr "Tijdelijke prijzen"
 
 #: ../../sales/products_prices/prices/pricing.rst:40
 msgid "Apply deals for bank holidays, etc. Enter start and end dates dates."
 msgstr ""
+"Speciale prijs acties voor b.v. weekends, enz. Vul de start- en einddatums "
+"in."
 
 #: ../../sales/products_prices/prices/pricing.rst:46
 msgid ""
@@ -1545,7 +1508,7 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:50
 msgid "Prices per minimum quantity"
-msgstr ""
+msgstr "Prijzen per minimale hoeveelheid"
 
 #: ../../sales/products_prices/prices/pricing.rst:56
 msgid ""
@@ -1555,7 +1518,7 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:60
 msgid "Discounts, margins, roundings"
-msgstr ""
+msgstr "Kortingen, marges, afrondingen"
 
 #: ../../sales/products_prices/prices/pricing.rst:62
 msgid ""
@@ -1590,22 +1553,24 @@ msgstr ""
 #: ../../sales/products_prices/prices/pricing.rst:86
 msgid "Make sure at least one pricelist item covers all your products."
 msgstr ""
+"Zorg ervoor dat tenminste één prijslijst van toepassing is voor alle "
+"producten"
 
 #: ../../sales/products_prices/prices/pricing.rst:88
 msgid "There are 3 modes of computation: fix price, discount & formula."
-msgstr ""
+msgstr "Er zijn 3 berekeningswijzen: vaste prijs, korting en formule."
 
 #: ../../sales/products_prices/prices/pricing.rst:93
 msgid "Here are different price settings made possible thanks to formulas."
-msgstr ""
+msgstr "Hier zijn verschillende prijs instellingen mogelijk dankzij formules"
 
 #: ../../sales/products_prices/prices/pricing.rst:96
 msgid "Discounts with roundings"
-msgstr ""
+msgstr "Kortingen met afrondingen"
 
 #: ../../sales/products_prices/prices/pricing.rst:98
 msgid "e.g. 20% discounts with prices rounded up to 9.99."
-msgstr ""
+msgstr "bijv. 20% korting met prijzen afgerond tot 9,99"
 
 #: ../../sales/products_prices/prices/pricing.rst:104
 msgid "Costs with markups (retail)"
@@ -1617,7 +1582,7 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:112
 msgid "Prices per country"
-msgstr ""
+msgstr "Prijzen per land"
 
 #: ../../sales/products_prices/prices/pricing.rst:113
 msgid ""
@@ -1626,18 +1591,26 @@ msgid ""
 "country. In case no country is set for the customer, Odoo takes the first "
 "pricelist without any country group."
 msgstr ""
+"Prijslijsten kunnen worden ingesteld per landengroep. Elke nieuwe klant "
+"krijgt een standaardprijslijst, dat wil zeggen de eerste in de lijst die "
+"overeenkomt met het land. Als er geen land voor de klant is ingesteld, neemt"
+" Odoo de eerste prijslijst zonder landengroep."
 
 #: ../../sales/products_prices/prices/pricing.rst:116
 msgid "The default pricelist can be replaced when creating a sales order."
 msgstr ""
+"De standaardprijslijst kan worden gewijzigd bij het maken van een "
+"verkooporder"
 
 #: ../../sales/products_prices/prices/pricing.rst:118
 msgid "You can change the pricelists sequence by drag & drop in list view."
 msgstr ""
+"U kunt de volgorde van de prijslijst wijzigen door deze te verslepen in de "
+"lijstweergave"
 
 #: ../../sales/products_prices/prices/pricing.rst:121
 msgid "Compute and show discount % to customers"
-msgstr ""
+msgstr "Bereken en toon korting% aan klanten"
 
 #: ../../sales/products_prices/prices/pricing.rst:123
 msgid ""
@@ -1653,7 +1626,7 @@ msgstr ""
 
 #: ../../sales/products_prices/prices/pricing.rst:126
 msgid "Apply the option in the pricelist setup form."
-msgstr ""
+msgstr "Pas deze optie toe door ze aan te vinken bij \"instellingen\""
 
 #: ../../sales/products_prices/prices/pricing.rst:133
 msgid ":doc:`currencies`"
@@ -1665,143 +1638,81 @@ msgstr ""
 
 #: ../../sales/products_prices/products.rst:3
 msgid "Manage your products"
-msgstr ""
+msgstr "Beheer uw producten"
 
 #: ../../sales/products_prices/products/import.rst:3
-msgid "How to import my products"
-msgstr ""
+msgid "How to import products with categories and variants"
+msgstr "Hoe producten importeren met categorieën en varianten"
 
-#: ../../sales/products_prices/products/import.rst:6
-msgid "How to start"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:8
-msgid "Download the following import templates:"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:10
+#: ../../sales/products_prices/products/import.rst:5
 msgid ""
-"Partners: customers, vendors (no relation field, can be imported as is)"
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:11
-msgid "Products (no relation field, can be imported as is)"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:12
-msgid "Product Website Categories"
-msgstr ""
+msgid "How to customize the file"
+msgstr "Hoe het bestand aanpassen"
 
 #: ../../sales/products_prices/products/import.rst:13
-msgid "Product Attributes & Values"
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:14
-msgid "Products with Categories & Attributes (3 & 4 must be imported first)"
+#: ../../sales/products_prices/products/import.rst:15
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:16
 msgid ""
-"Download link: "
-"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing"
+"Don't change labels of columns you want to import. Otherwise Odoo won't "
+"recognize them anymore and you will have to map them on your own in the "
+"import screen."
 msgstr ""
 
 #: ../../sales/products_prices/products/import.rst:18
 msgid ""
-"You can open them with any spreadsheets software (Microsoft Office, "
-"OpenOffice, Google Drive, etc.)."
+"To add new columns,Feel free to add new columns but the fields need to exist"
+" in Odoo. If Odoo fails in matching the column name with a field, you can "
+"make it manually when importing by browsing a list of available fields."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:21
-msgid "How to customize the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:23
-msgid ""
-"Remove columns you don't need. Don't remove the first one (called *ID*, see "
-"why here below)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:25
-msgid ""
-"Don't change labels of columns you want to import. Otherwse Odoo won't match"
-" the columns automatically."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:27
-msgid ""
-"Feel free to add new columns but the fields need to exist in Odoo. If Odoo "
-"fails in matching the column name with a field, you can make it manually "
-"when importing by browsing a list of available fields."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:30
-msgid "Once modified, keep your file in .csv format."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:33
-msgid "How to import the file"
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:35
-msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:36
-msgid "Switch to list view (top-right corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:37
-msgid "Click the *Import* button (top-left corner)."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:38
-msgid ""
-"Make sure all the columns match an existing field. If not select it manually"
-" from the drop-down list."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:40
-msgid "Press * Validate* to test the import."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:41
-msgid ""
-"If you get \"Everything seems valid.\" as result message, press *Import* to "
-"process the real import. Otherwise correct the issues spotted during the "
-"test."
-msgstr ""
-
-#: ../../sales/products_prices/products/import.rst:45
+#: ../../sales/products_prices/products/import.rst:24
 msgid "Why an “ID” column"
-msgstr ""
+msgstr "Waarom een \"ID\" kolom"
 
-#: ../../sales/products_prices/products/import.rst:47
+#: ../../sales/products_prices/products/import.rst:26
 msgid ""
 "The ID is an unique identifier for the line item. Feel free to use the one "
 "of your previous software to ease the transition to Odoo."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:50
+#: ../../sales/products_prices/products/import.rst:29
 msgid ""
 "Setting an ID is not mandatory when importing but it helps in many cases:"
 msgstr ""
+"Het instellen van een ID is niet verplicht bij invoer maar is in veel "
+"gevallen handig :"
 
-#: ../../sales/products_prices/products/import.rst:52
+#: ../../sales/products_prices/products/import.rst:31
 msgid ""
 "Update imports: you can import the same file several times without creating "
 "duplicates;"
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:53
+#: ../../sales/products_prices/products/import.rst:32
 msgid "Import relation fields (see here below)."
-msgstr ""
+msgstr "Relatievelden importeren (zie hieronder)."
 
-#: ../../sales/products_prices/products/import.rst:56
+#: ../../sales/products_prices/products/import.rst:35
 msgid "How to import relation fields"
-msgstr ""
+msgstr "Hoe relatievelden importeren"
 
-#: ../../sales/products_prices/products/import.rst:58
+#: ../../sales/products_prices/products/import.rst:37
 msgid ""
 "An Odoo object is always related to many other objects (e.g. a product is "
 "linked to product categories, attributes, vendors, etc.). To import those "
@@ -1809,7 +1720,7 @@ msgid ""
 "their own list menu."
 msgstr ""
 
-#: ../../sales/products_prices/products/import.rst:62
+#: ../../sales/products_prices/products/import.rst:41
 msgid ""
 "You can do it using either the name of the related record or its ID. The ID "
 "is expected when two records have the same name. In such a case add \" / "
@@ -1819,7 +1730,7 @@ msgstr ""
 
 #: ../../sales/products_prices/taxes.rst:3
 msgid "Set taxes"
-msgstr ""
+msgstr "Stel belastingtarieven in"
 
 #: ../../sales/quotation.rst:3
 msgid "Quotation"
@@ -1831,11 +1742,11 @@ msgstr "Online offerte"
 
 #: ../../sales/quotation/online/creation.rst:3
 msgid "How to create and edit an online quotation?"
-msgstr ""
+msgstr "Hoe maak en bewerk je een online offerte?"
 
 #: ../../sales/quotation/online/creation.rst:9
 msgid "Enable Online Quotations"
-msgstr ""
+msgstr "Online offertes inschakelen"
 
 #: ../../sales/quotation/online/creation.rst:11
 msgid ""
@@ -1852,7 +1763,7 @@ msgstr ""
 
 #: ../../sales/quotation/online/creation.rst:25
 msgid "Edit Your Online Quotations"
-msgstr ""
+msgstr "Wijzig uw online offertes"
 
 #: ../../sales/quotation/online/creation.rst:27
 msgid ""
@@ -1893,13 +1804,15 @@ msgstr ""
 
 #: ../../sales/quotation/online/creation.rst:52
 msgid "Using Online Quotations"
-msgstr ""
+msgstr "Online offertes gebruiken"
 
 #: ../../sales/quotation/online/creation.rst:54
 msgid ""
 "To share an online quotation with your customer, copy the URL of the online "
 "quotation, then share it with customer."
 msgstr ""
+"Als u een online offerte wilt delen, kopieer dan de URL en deel deze met uw "
+"klant."
 
 #: ../../sales/quotation/online/creation.rst:60
 msgid ""
@@ -1909,6 +1822,10 @@ msgid ""
 "will also receive a notification in the chatter within Odoo whenever the "
 "customer views the quotation."
 msgstr ""
+"Als alternatief kan uw klant toegang krijgen tot zijn online offertes door "
+"in te loggen via het klantenportaal. Uw klant accepteert of weigert de "
+"offerte, print ze of onderhandelt de voorwaarden in de chatbox. Wanneer de "
+"klant de offerte tekent ontvangt U een melding in de chatter binnen Odoo."
 
 #: ../../sales/quotation/setup.rst:3
 msgid "Setup"

locale/nl/LC_MESSAGES/website.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-20 15:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr "Website"
 
 #: ../../website/optimize.rst:3
 msgid "Optimize"
-msgstr ""
+msgstr "Optimaliseren"
 
 #: ../../website/optimize/google_analytics.rst:3
 msgid "How to track your website's traffic in Google Analytics"
-msgstr ""
+msgstr "Hoe het verkeer op uw website traceren in Google Analytics"
 
 #: ../../website/optimize/google_analytics.rst:5
 msgid "To follow your website's traffic with Google Analytics:"
@@ -39,6 +39,8 @@ msgid ""
 "`Create a Google Analytics account <https://www.google.com/analytics/>`__ if"
 " you don't have any."
 msgstr ""
+"Maak een Google Analytics-account aan <https://www.google.com/analytics/> "
+"`__ als je nog geen hebt."
 
 #: ../../website/optimize/google_analytics.rst:10
 msgid ""
@@ -48,13 +50,15 @@ msgstr ""
 
 #: ../../website/optimize/google_analytics.rst:15
 msgid "Copy the tracking ID to insert it in Odoo."
-msgstr ""
+msgstr "Kopieer het tracking-ID om het in Odoo op te slaan"
 
 #: ../../website/optimize/google_analytics.rst:20
 msgid ""
 "Go to the *Configuration* menu of your Odoo's Website app. In the settings, "
 "turn on Google Analytics and paste the tracking ID. Then save the page."
 msgstr ""
+"Ga naar het menu *Instellingen* van uw Odoo's website app. In instellingen "
+"kopieer-en-plak jouw Google Analytics tracking-ID. Sla daarna op."
 
 #: ../../website/optimize/google_analytics.rst:27
 msgid ""

locale/ru/LC_MESSAGES/applications.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../applications.rst:3
+msgid "Applications"
+msgstr ""

locale/ru/LC_MESSAGES/db_management.po

@@ -0,0 +1,521 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../db_management/db_online.rst:8
+msgid "Online Database management"
+msgstr ""
+
+#: ../../db_management/db_online.rst:13
+msgid "Duplicating a database"
+msgstr ""
+
+#: ../../db_management/db_online.rst:15
+msgid ""
+"Database duplication, renaming, custom DNS, etc. is not available to free "
+"customers of our Online platform."
+msgstr ""
+
+#: ../../db_management/db_online.rst:18
+msgid ""
+"Access the `database management page <https://www.odoo.com/my/databases>`__ "
+"(you will have to sign in). Next, make sure you are connected as the "
+"administrator of the database you want to duplicate. After that, click on "
+"the **Manage Your Databases** button."
+msgstr ""
+
+#: ../../db_management/db_online.rst:26
+msgid ""
+"In the line of the database you want to duplicate, you will have a few "
+"buttons. To duplicate your database, just click **Duplicate**. You will have"
+" to give a name to your duplicate, then click **Duplicate Database**."
+msgstr ""
+
+#: ../../db_management/db_online.rst:36
+msgid "A duplicated database has the same behaviour as a real one:"
+msgstr ""
+
+#: ../../db_management/db_online.rst:38
+msgid "Emails are sent"
+msgstr ""
+
+#: ../../db_management/db_online.rst:40
+msgid "Payments are processed (in the e-commerce, for example)"
+msgstr ""
+
+#: ../../db_management/db_online.rst:42
+msgid "Delivery orders (shipping providers) are sent"
+msgstr ""
+
+#: ../../db_management/db_online.rst:44
+msgid "Etc."
+msgstr ""
+
+#: ../../db_management/db_online.rst:46
+msgid ""
+"It is **strongly** advised to test behaviour using sample customers/products"
+" (with a `disposable e-mail <http://www.mailinator.com>`__ address, for "
+"example)"
+msgstr ""
+
+#: ../../db_management/db_online.rst:50
+msgid ""
+"After a few seconds, you will be logged in your duplicated database. Notice "
+"that the url uses the name you chose for your duplicated database."
+msgstr ""
+
+#: ../../db_management/db_online.rst:54
+msgid "Duplicate databases expire automatically after 15 days."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:7
+msgid "On-premise Database management"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:10
+msgid "Register a database"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:12
+msgid ""
+"To register your database, you just need to enter your Subscription Code in "
+"the banner in the App Switcher. Make sure you do not add extra spaces before"
+" or after your subscription code. If the registration is successful, it will"
+" turn green and will provide you with the Expiration Date of your freshly-"
+"registered database. You can check this Epiration Date in the About menu "
+"(Odoo 9) or in the Settings Dashboard (Odoo 10)."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:20
+msgid "Registration Error Message"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:22
+msgid ""
+"If you are unable to register your database, you will likely encounter this "
+"message:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:31 ../../db_management/db_premise.rst:97
+#: ../../db_management/db_premise.rst:130
+msgid "Solutions"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:33
+msgid "Do you have a valid Enterprise subscription?"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:35
+msgid ""
+"Check if your subscription details get the tag \"In Progress\" on your `Odoo"
+" Account <https://accounts.odoo.com/my/contract>`__ or with your Account "
+"Manager"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:39
+msgid "Have you already linked a database with your subscription reference?"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:41
+msgid ""
+"You can link only one database per subscription. (Need a test or a "
+"development database? `Find a partner <https://www.odoo.com/partners>`__)"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:45
+msgid ""
+"You can unlink the old database yourself on your `Odoo Contract "
+"<https://accounts.odoo.com/my/contract>`__ with the button \"Unlink "
+"database\""
+msgstr ""
+
+#: ../../db_management/db_premise.rst:52
+msgid ""
+"A confirmation message will appear; make sure this is the correct database "
+"as it will be deactivated shortly:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:59
+msgid "Do you have the updated version of Odoo 9?"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:61
+#: ../../db_management/db_premise.rst:190
+msgid ""
+"From July 2016 onward, Odoo 9 now automatically change the uuid of a "
+"duplicated database; a manual operation is no longer required."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:64
+msgid ""
+"If it's not the case, you may have multiple databases sharing the same UUID."
+" Please check on your `Odoo Contract "
+"<https://accounts.odoo.com/my/contract>`__, a short message will appear "
+"specifying which database is problematic:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:73
+msgid ""
+"In this case, you need to change the UUID on your test databases to solve "
+"this issue. You will find more information about this in :ref:`this section "
+"<duplicate_premise>`."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:76
+msgid ""
+"For your information, we identify database with UUID. Therefore, each "
+"database should have a distinct UUID to ensure that registration and "
+"invoicing proceed effortlessly for your and for us."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:82
+msgid "Too much users error message"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:84
+msgid ""
+"If you have more users in your local database than provisionned in your Odoo"
+" Enterprise subscription, you may encounter this message:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:93
+msgid ""
+"When the message appears you have 30 days before the expiration. The "
+"countdown is updated everyday."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:99
+msgid ""
+"**Add more users** on your subscription: follow the link and Validate the "
+"upsell quotation and pay for the extra users."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:102
+msgid "or"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:104
+msgid ""
+"**Deactivate users** as explained in this `Documentation "
+"<https://www.odoo.com "
+"/documentation/user/10.0/db_management/documentation.html#deactivating-"
+"users>`__ and **Reject** the upsell quotation."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:109
+msgid ""
+"Once your database has the correct number of users, the expiration message "
+"will disappear automatically after a few days, when the next verification "
+"occurs. We understand that it can be a bit frightening to see the countdown,"
+" so you can :ref:`force an Update Notification <force_ping>`  to make the "
+"message disappear right away."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:116
+msgid "Database expired error message"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:118
+msgid ""
+"If your database reaches its expiration date before your renew your "
+"subscription, you will encounter this message:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:126
+msgid ""
+"This **blocking** message appears after a non-blocking message that lasts 30"
+" days. If you fail to take action before the end of the countdown, the "
+"database is expired."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:134
+msgid ""
+"Renew your subscription: follow the link and renew your subscription - note "
+"that"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:133
+msgid ""
+"if you wish to pay by Wire Transfer, your subscription will effectively be "
+"renewed only when the payment arrives, which can take a few days. Credit "
+"card payments are processed immediately."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:136
+msgid "Contact our `Support <https://www.odoo.com/help>`__"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:138
+msgid ""
+"None of those solutions worked for you? Please contact our `Support "
+"<https://www.odoo.com/help>`__"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:145
+msgid "Force an Update Notification"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:147
+msgid ""
+"Update Notifications happen once every 7 days and keep your database up-to-"
+"date with your Odoo Enterprise subscription. If you modify your subscription"
+" (i.e. add more users, renew it for a year, etc.), your local database will "
+"only be made aware of the change once every 7 days - this can cause "
+"discrepancies between the state of your subscription and some notifications "
+"in your App Switcher. When doing such an operation on your subscription, you"
+" can force an Update using the following procedure:"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:154
+msgid "Connect to the database with the **Administrator** account"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:155
+msgid ""
+"Switch to the Developer mode by using the **About** option in the top-right "
+"menu (in V9) /  in **Settings**  (in V10): click on **Activate the developer"
+" mode**"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:158
+msgid ""
+"Navigate to the \"Settings\" menu, then \"Technical\" > \"Automation\" > "
+"\"Scheduled Actions\""
+msgstr ""
+
+#: ../../db_management/db_premise.rst:160
+msgid ""
+"Find \"Update Notification\" in the list, click on it, and finally click on "
+"the button \"**RUN MANUALLY**\""
+msgstr ""
+
+#: ../../db_management/db_premise.rst:162
+msgid "Refresh the page, the \"Expiration\" notification should be gone"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:165
+msgid ""
+"You may have kept the same UUID on different databases and we receive "
+"information from those databases too. So please read :ref:`this "
+"documentation <duplicate_premise>` to know how to change the UUID. After the"
+" change you can force a ping to speed up the verification, your production "
+"database will then be correctly identified."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:174
+msgid "Duplicate a database"
+msgstr ""
+
+#: ../../db_management/db_premise.rst:176
+msgid ""
+"You can duplicate your database by accessing the database manager on your "
+"server (<odoo-server>/web/database/manager). In this page, you can easily "
+"duplicate your database (among other things)."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:184
+msgid ""
+"When you duplicate a local database, it is **strongly** advised to change "
+"the duplicated database's uuid (Unniversally Unique Identifier), since this "
+"uuid is how your database identifies itself with our servers. Having two "
+"databases with the same uuid could result in invoicing problems or "
+"registration problems down the line."
+msgstr ""
+
+#: ../../db_management/db_premise.rst:193
+msgid ""
+"The database uuid is currently accessible from the menu **Settings > "
+"Technical > System Parameters**, we advise you to use a `uuid generator "
+"<https://www.uuidgenerator.net>`__ or to use the unix command ``uuidgen`` to"
+" generate a new uuid. You can then simply replace it like any other record "
+"by clicking on it and using the edit button."
+msgstr ""
+
+#: ../../db_management/documentation.rst:7
+msgid "Users and Features"
+msgstr ""
+
+#: ../../db_management/documentation.rst:9
+msgid ""
+"As the administrator of your database, you are responsible for its usage. "
+"This includes the Apps you install as well as the number of users currently "
+"in use."
+msgstr ""
+
+#: ../../db_management/documentation.rst:13
+msgid ""
+"Odoo is many things (ERP, CMS, CRM application, e-Commerce backend, etc.) "
+"but it is *not* a smartphone. You should apply caution when adding/removing "
+"features (especially Apps) on your database since this may impact your "
+"subscription amount significantly (or switch you from a free account to a "
+"paying one on our online platform)."
+msgstr ""
+
+#: ../../db_management/documentation.rst:19
+msgid ""
+"This page contains some information as to how you can manage your Odoo "
+"instances. Before carrying any of these procedures, we **strongly** advise "
+"to test them on a duplicate of your database first. That way, if something "
+"goes wrong, your day-to-day business is not impacted."
+msgstr ""
+
+#: ../../db_management/documentation.rst:24
+msgid ""
+"You can find guides on how to duplicate your databases both for :ref:`online"
+" <duplicate_online>` and :ref:`on premise <duplicate_premise>` "
+"installations."
+msgstr ""
+
+#: ../../db_management/documentation.rst:28
+msgid ""
+"If you have questions about the content of this page or if you encounter an "
+"issue while carrying out these procedures, please contact us through our "
+"`support form <https://www.odoo.com/help>`__."
+msgstr ""
+
+#: ../../db_management/documentation.rst:34
+msgid "Deactivating Users"
+msgstr ""
+
+#: ../../db_management/documentation.rst:36
+msgid ""
+"Make sure you have sufficient **administrative rights** if you want to "
+"change the status of any of your users."
+msgstr ""
+
+#: ../../db_management/documentation.rst:39
+msgid ""
+"In your Odoo instance, click on **Settings**. You will have a section "
+"showing you the active users on your database. Click on **Manage access "
+"rights.**"
+msgstr ""
+
+#: ../../db_management/documentation.rst:44
+#: ../../db_management/documentation.rst:82
+msgid "|settings|"
+msgstr ""
+
+#: ../../db_management/documentation.rst:44
+msgid "|browse_users|"
+msgstr ""
+
+#: ../../db_management/documentation.rst:47
+msgid "You'll then see the list of your users."
+msgstr ""
+
+#: ../../db_management/documentation.rst:52
+msgid ""
+"The pre-selected filter *Internal Users* shows your paying users (different "
+"from the *Portal Users* which are free). If you remove this filter, you'll "
+"get all your users (the ones you pay for and the portal ones)"
+msgstr ""
+
+#: ../../db_management/documentation.rst:57
+msgid ""
+"In your list of users, click on the user you want to deactivate. As soon as "
+"you are on the userform, go with your mouse cursor on the status **Active** "
+"(top right). Click on Active and you will notice that the status will change"
+" to **Inactive** immediately."
+msgstr ""
+
+#: ../../db_management/documentation.rst:66
+msgid "The user is now deactivated."
+msgstr ""
+
+#: ../../db_management/documentation.rst:68
+msgid "**Never** deactivate the main user (*admin*)"
+msgstr ""
+
+#: ../../db_management/documentation.rst:71
+msgid "Uninstalling Apps"
+msgstr ""
+
+#: ../../db_management/documentation.rst:73
+msgid ""
+"Make sure you first test what you are about to do on a :ref:`duplicate "
+"<duplicate>` of your database before making any changes (*especially* "
+"installing/uninstalling apps)."
+msgstr ""
+
+#: ../../db_management/documentation.rst:77
+msgid ""
+"In your Odoo instance click on **Settings**; in this app, you will be able "
+"to see how many applications you have installed. Click on **Browse Apps** to"
+" access the list of your installed applications."
+msgstr ""
+
+#: ../../db_management/documentation.rst:82
+msgid "|browse_apps|"
+msgstr ""
+
+#: ../../db_management/documentation.rst:85
+msgid ""
+"In your applications' dashboard, you will see all the icons of your "
+"applications. Click on the application you want to uninstall. Then, on the "
+"form of the application, click on **Uninstall**."
+msgstr ""
+
+#: ../../db_management/documentation.rst:92
+msgid ""
+"Some applications have dependencies, like Invoicing, eCommerce, etc. "
+"Therefore, the system will give you a warning message to advise you of what "
+"is about to be removed. If you uninstall your application, all its "
+"dependencies will be uninstalled as well (and the data in them will "
+"permanently disappear). If you are sure you still want to uninstall it, then"
+" click **Confirm**."
+msgstr ""
+
+#: ../../db_management/documentation.rst:99
+msgid ""
+"Last, after having checked the warning message (if any), click **Confirm**."
+msgstr ""
+
+#: ../../db_management/documentation.rst:104
+msgid "You have finished uninstalling your application."
+msgstr ""
+
+#: ../../db_management/documentation.rst:107
+msgid "Good to know"
+msgstr ""
+
+#: ../../db_management/documentation.rst:109
+msgid ""
+"**Uninstalling apps, managing users, etc. is up to you**: no one else can "
+"know if your business flow is broken better than you. If we were to "
+"uninstall applications for you, we would never be able to tell if relevant "
+"data had been removed or if one of your business flow was broken because we "
+"*do not know how you work* and therefore cannot validate these kinds of "
+"operations."
+msgstr ""
+
+#: ../../db_management/documentation.rst:115
+msgid ""
+"**Odoo Apps have dependencies**: this means that you may need to install "
+"modules that you do not actively use to access some features of Odoo you "
+"might need. For example, the Website Builder app is needed to be able to "
+"show your customer their Quotes in a web page. Even though you might not "
+"need or use the Website itself, it is needed for the Online Quotes feature "
+"to work properly."
+msgstr ""
+
+#: ../../db_management/documentation.rst:122
+msgid ""
+"**Always test app installation/removal on a duplicate** (or on a free trial "
+"database): that way you can know what other apps may be required, etc. This "
+"will avoid surprises when uninstalling or when receiving your invoices."
+msgstr ""

locale/ru/LC_MESSAGES/discuss.po

@@ -0,0 +1,562 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../discuss.rst:5
+msgid "Discuss"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:3
+msgid "How to use my own email servers to send and receive email in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:6
+msgid "When is it needed"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:7
+msgid ""
+"Using your own email servers is required to send and receive messages in "
+"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email "
+"solution that works straight away. However you can still use your own email "
+"servers with the online edition. Some insights are provided here below."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:14
+msgid "How to set it up"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:15
+msgid ""
+"As a system admin, go to :menuselection:`Settings --> General Settings` and "
+"check *External Email Servers* (watch out: this checkbox only shows up after"
+" Odoo 10). Then, go through the following steps."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:21
+msgid ""
+"Office 365 doesn't allow external hosts like Odoo. Consequently you can't "
+"use Office 365 email servers to send or receive messages in Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:26
+msgid "Set an outgoing email server for outbound messages"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:27
+msgid ""
+"You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, "
+"etc.) as well as your admin credentials. Once all the information has been "
+"filled out, click on *Test Connection*."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:35
+msgid "Set an incoming email server for inbound messages"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:36
+msgid ""
+"Fill out the form according to your email provider’s settings. Leave the "
+"*Actions to Perform on Incoming Mails* blank. Once all the information has "
+"been filled out, click on *TEST & CONFIRM*."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:43
+msgid ""
+"By default inbound messages are fetched every 5 minutes. You can change this"
+" value in developer mode. Go to :menuselection:`Settings --> Technical --> "
+"Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:49
+msgid "Set the domain name"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:50
+msgid ""
+"Enter the domain name of your email servers (e.g. mycompany.com) in General "
+"Settings."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:57
+msgid "Create a catchall address"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:58
+msgid ""
+"When a contact replies to an email sent from Odoo, the *reply-to* address is"
+" a generic address used to route the reply to the right discussion thread in"
+" Odoo (opportunity, order, task, etc.) and to the inbox of all its "
+"followers. By default this address is \"catchall@\" but it can be changed."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:63
+msgid ""
+"Create a catchall address in your email server settings. We advise you to "
+"use \"catchall@\" so that everything works out straight away. If you want to"
+" use another alias, you have extra steps in Odoo:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:67
+msgid "Activate the developer mode from your Settings Dashboard."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:72
+msgid ""
+"Refresh your screen. Then go to :menuselection:`Settings --> Technical --> "
+"Parameters --> System Parameters` and enter your custom catchall alias in "
+"*mail.catchall.alias*."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:79
+msgid "You can edit the email alias used for bounced messages the same way."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:82
+msgid "How to use my own email servers with Odoo Online"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:83
+msgid ""
+"Odoo Online comes up with an embedded and ready-to-use email server "
+"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it "
+"is really convenient. Indeed, while it is Odoo-labelled, the visible source "
+"of any message sent from Odoo will be your personal email address (your Odoo"
+" login). Your contacts will therefore trust your messages."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:90
+msgid ""
+"You can still use your own email servers if you want your contacts to see "
+"your historic email address when they reply to your messages or if you want "
+"to manage the reputation of your email servers yourself."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:94
+msgid "There are 2 methods:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:96
+msgid ""
+"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to"
+" receive emails in Odoo in real time thanks to the Odoo email server. Create"
+" a catchall address in your email server settings. Then apply following "
+"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. "
+"That's it you're ready to go!"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:102
+msgid ""
+"**Use a catchall mailbox** to exclusively use your own email server. That "
+"way you can also manage your email server reputation (blacklisting, etc). "
+"However, incoming messages are fetched from the email server thanks to a "
+"cron running every hour. This is the shortest time lap for crons in Online "
+"instances. If you opt for this solution, simply follow the procedure of "
+"above section."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:111
+msgid "How to be SPF-compliant when using external email servers in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:112
+msgid ""
+"Sender Policy Framework (SPF) is an email-validation system that checks that"
+" incoming mail from a domain comes from a host authorized by that domain's "
+"administrator. Such a security system is used in most email servers. If you "
+"don't comply with it, your emails sent from Odoo will be likely flagged as "
+"spam."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:118
+msgid ""
+"To be SPF-compliant, you need to authorize Odoo as a sending host in your "
+"domain name settings:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:121
+msgid "Sign in to your domain’s account at your domain host."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:122
+msgid "Locate the page for updating your domain’s DNS records."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:123
+msgid ""
+"If no TXT record is set, create one with following definition: v=spf1 "
+"include:_spf.odoo.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:125
+msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:127
+msgid "e.g. for a Gmail server it should be:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:129
+msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:131
+msgid ""
+"Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to "
+"create or modify TXT records in your own domain registrar."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:134
+msgid ""
+"Your new SPF record can take up to 48 hours to go into effect, but this "
+"usually happens more quickly."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:137
+msgid ""
+"Adding more than one SPF record for a domain can cause problems with mail "
+"delivery and spam classification. Instead, we recommend using only one SPF "
+"record by modifying it to authorize Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:142
+msgid "How to choose between Odoo and my traditional email box"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:143
+msgid ""
+"Odoo Discuss is a perfect tool to send and read messages related to business"
+" documents. However it doesn't aim to replace a full-featured email solution"
+" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of "
+"both systems without mingling them: What is related to Odoo business objects"
+" or applications goes into Odoo; What is not can be managed into your "
+"external email box."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:150
+msgid ""
+"To do so, create specific email aliases to use in Odoo (to generate leads or"
+" opportunities, helpdesk tickets, etc.). If you take an email alias already "
+"used for messaging outside of Odoo, incoming messages will land into both "
+"systems. This will negatively impact your productivity."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:3
+msgid "How to follow Twitter feed from Odoo"
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:8
+msgid ""
+"You can follow specific hashtags on Twitter and see the tweets within the "
+"Odoo Discuss channels of your choice. The tweets are retrieved periodically "
+"from Twitter. An authenticated user can retweet the messages."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:13
+msgid "Setting up the App on Twitter's side"
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:15
+msgid ""
+"Twitter uses an \"App\" on its side which is opens a gate to which Odoo asks"
+" for tweets, and through which a user can retweet. To set up this app, go to"
+" http://apps.twitter.com/app/new and put in the values:"
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:19
+msgid "Name: this is the name of the application on Twitter"
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:21
+msgid ""
+"Website: this is the external url of your Odoo database, with \"/web\" "
+"added. For example, if your Odoo instance is hosted at "
+"\"http://www.example.com\", you should put \"http://www.example.com/web\" in"
+" this field."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:25
+msgid ""
+"Callback URL: this is the address on which Twitter will respond. Following "
+"the previous example you should write "
+"\"http://www.example.com/web/twitter/callback\"."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:28
+msgid ""
+"Do not forget to accept the terms **Developer agreement** of use and click "
+"on **Create your Twitter application** at the bottom of the page."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:33
+msgid "Getting the API key and secret"
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:35
+msgid ""
+"When on the App dashboard, switch to the **Keys and Access Tokens** tab."
+msgstr ""
+
+#: ../../discuss/mail_twitter.rst:40
+msgid ""
+"And copy those values in Odoo in :menuselection:`Settings--> General "
+"Settings--> Twitter discuss integration` and click on **Save** to save the "
+"settings."
+msgstr ""
+
+#: ../../discuss/mentions.rst:3
+msgid "How to grab attention of other users in my messages"
+msgstr ""
+
+#: ../../discuss/mentions.rst:5
+msgid ""
+"You can **mention** a user in a channel or chatter by typing **@user-name**."
+" Mentioning a user in the chatter will set them as a follower of the item "
+"(if they are not already) and send a message to their inbox. The item "
+"containing the mention will also be bolded in the list view. Mentioning a "
+"user in a channel will send a message to their inbox. You cannot mention a "
+"user in a channel who is not subscribed to the channel. Typing **#channel-"
+"name** will provide a link to the mentioned channel in either a chatter or "
+"another channel."
+msgstr ""
+
+#: ../../discuss/mentions.rst:15
+msgid "Direct messaging a user"
+msgstr ""
+
+#: ../../discuss/mentions.rst:17
+msgid ""
+"**Direct messages** are private messages viewable only by the sender and "
+"recipient. You can send direct messages to other users from within the "
+"Discuss module by creating a new conversation or selecting an existing one "
+"from the sidebar. Direct messages can be sent from anywhere in Odoo using "
+"the speech bubble icon in the top bar. The online status of other users is "
+"displayed to the left of their name. A **green dot** indicates that a user "
+"is Online, an **orange dot** that they are Idle, and a **grey dot** that "
+"they are offline."
+msgstr ""
+
+#: ../../discuss/mentions.rst:28
+msgid "Desktop notifications from Discuss"
+msgstr ""
+
+#: ../../discuss/mentions.rst:30
+msgid ""
+"You can choose to see **desktop notifications** when you receive a new "
+"direct message. The notification shows you the sender and a brief preview of"
+" the message contents. These can be configured or disabled by clicking on "
+"the gear icon in the corner of the notification.."
+msgstr ""
+
+#: ../../discuss/monitoring.rst:3
+msgid "How to be responsive at work thanks to my Odoo inbox"
+msgstr ""
+
+#: ../../discuss/monitoring.rst:5
+msgid ""
+"Use the **Inbox** in Discuss app to monitor updates and progress on "
+"everything you do in Odoo. Notifications and messages from everything you "
+"follow or in which you are mentioned appear in your inbox."
+msgstr ""
+
+#: ../../discuss/monitoring.rst:13
+msgid "You can keep an eye on your **Inbox** from any screen."
+msgstr ""
+
+#: ../../discuss/monitoring.rst:18
+msgid ""
+"Marking an item with a check marks the message as **read** and removes it "
+"from your inbox. If you would like to save an item for future reference or "
+"action, mark it with a star to add it to the **Starred** box. You can star "
+"any message or notification in Discuss or any of the item-specific chatters "
+"throughout Odoo to keep tabs on it here."
+msgstr ""
+
+#: ../../discuss/overview.rst:3
+msgid "Why to use Odoo Discuss"
+msgstr ""
+
+#: ../../discuss/overview.rst:5
+msgid ""
+"Odoo Discuss is an easy to use messaging app for teams that brings all your "
+"organization's communication into one place and seamlessly integrates with "
+"the Odoo platform. Discuss lets you send and receive messages from wherever "
+"you are in Odoo as well as manage your messages and notifications easily "
+"from within the app. Discuss allows you to create **channels** for team "
+"chats, conversations about projects, meeting coordination, and more in one "
+"simple and searchable interface."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:3
+msgid "How to efficiently communicate in team using channels"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:5
+msgid ""
+"You can use **channels** to organize discussions between individual teams, "
+"departments, projects, or any other group that requires regular "
+"communication. By having conversations that everyone in the channel can see,"
+" it's easy to keep the whole team in the loop with the latest developments."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:12
+msgid "Creating a channel"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:14
+msgid ""
+"In Discuss there are two types of channels - **public** and **private**."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:17
+msgid ""
+"A **public channel** can only be created by an administrator with write "
+"privileges and can be seen by everyone in the organization. By contrast, a "
+"**private channel** can be created by any user and by default is only "
+"visible to users who have been invited to this channel."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:24
+msgid ""
+"A public channel is best used when many employees need to access information"
+" (such as interdepartmental communication or company announcements), whereas"
+" a private channel should be used whenever information should be limited to "
+"specific users/employees (such as department specific or sensitive "
+"information)."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:31
+msgid "Configuring a channel"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:33
+msgid ""
+"You can configure a channel's name, description, access rights, automatic "
+"subscription, and emailing from :menuselection:`#channel-name --> Settings`."
+" Changing channel access rights allows you to control which groups can view "
+"each channel. You can make a channel visible by all users, invited users, or"
+" users within a selected user group. Note that allowing \"Everyone\" to "
+"follow a private channel will let other users view and join it as they would"
+" a public channel."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:47
+msgid "How to set up a mailing list"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:49
+msgid ""
+"A channel can be configured to behave as a mailing list. From within "
+":menuselection:`#channel-name --> Settings`, define the email you would like"
+" to use. Users can then post to the channel and choose to receive "
+"notifications using the defined email address. An envelope icon will appear "
+"next to the channel name in the list to indicate that a channel will send "
+"messages by email."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:57
+msgid "Locating a channel"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:59
+msgid ""
+"If you do not see a channel on your dashboard, you can search the list of "
+"**public channels** to locate the correct channel or create a new channel by"
+" clicking the plus icon."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:66
+msgid ""
+"You can also click the **CHANNELS** heading to browse a list of all public "
+"channels. This allows the user to manually **join** and **leave** public "
+"channels from a single screen."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:71
+msgid ""
+"It is always wise to search for a channel before creating a new one to "
+"ensure that duplicate entries are not created for the same topic."
+msgstr ""
+
+#: ../../discuss/team_communication.rst:76
+msgid "Using filters to navigate within Discuss"
+msgstr ""
+
+#: ../../discuss/team_communication.rst:78
+msgid ""
+"The topbar search provides access to the same comprehensive search function "
+"present in the rest of Odoo. You can apply multiple **filter criteria** and "
+"**save filters** for later use. The search function accepts wildcards by "
+"using the underscore character \"\\ **\\_**\\ \" to represent a **single "
+"character wildcard.**"
+msgstr ""
+
+#: ../../discuss/tracking.rst:3
+msgid "How to follow a discussion thread and define what I want to hear about"
+msgstr ""
+
+#: ../../discuss/tracking.rst:6
+msgid "How to follow a discussion thread"
+msgstr ""
+
+#: ../../discuss/tracking.rst:7
+msgid ""
+"You can keep track of virtually any business object in Odoo (an opportunity,"
+" a quotation, a task, etc.), by **following** it."
+msgstr ""
+
+#: ../../discuss/tracking.rst:14
+msgid "How to choose the events to follow"
+msgstr ""
+
+#: ../../discuss/tracking.rst:15
+msgid ""
+"You can choose which types of events you want to be notified about. The "
+"example below shows the options available when following a **task** in the "
+"**Project** app."
+msgstr ""
+
+#: ../../discuss/tracking.rst:23
+msgid "How to add other followers"
+msgstr ""
+
+#: ../../discuss/tracking.rst:24
+msgid ""
+"You can invite other users and add channels as followers. Adding a channel "
+"as a follower will send messages posted in the chatter to the channel with a"
+" link back to the original document."
+msgstr ""
+
+#: ../../discuss/tracking.rst:34
+msgid "How to be a default follower"
+msgstr ""
+
+#: ../../discuss/tracking.rst:35
+msgid ""
+"You are automatically set as a default follower of any item you create. In "
+"some applications like CRM and Project, you can be a default follower of any"
+" new record created to get notified of specific events (e.g. a new task "
+"created, an opportunity won)."
+msgstr ""
+
+#: ../../discuss/tracking.rst:40
+msgid ""
+"To do so, start following the parent business object (e.g. the sales channel"
+" in CRM, the project in Project). Then, choose the events you want to hear "
+"about."
+msgstr ""

locale/ru/LC_MESSAGES/expenses.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-22 13:16+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../expenses.rst:5
+msgid "Expenses"
+msgstr ""

locale/ru/LC_MESSAGES/general.po

@@ -0,0 +1,831 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../general.rst:5
+msgid "General"
+msgstr ""
+
+#: ../../general/auth.rst:3
+msgid "Authentication"
+msgstr ""
+
+#: ../../general/auth/google.rst:3
+msgid "How to allow users to sign in with their Google account"
+msgstr ""
+
+#: ../../general/auth/google.rst:5
+msgid ""
+"Connect to your Google account and go to "
+"`https://console.developers.google.com/ "
+"<https://console.developers.google.com/>`_."
+msgstr ""
+
+#: ../../general/auth/google.rst:7
+msgid ""
+"Click on **Create Project** and enter the project name and other details."
+msgstr ""
+
+#: ../../general/auth/google.rst:15
+msgid "Click on **Use Google APIs**"
+msgstr ""
+
+#: ../../general/auth/google.rst:20
+msgid ""
+"On the left side menu, select the sub menu **Credentials** (from **API "
+"Manager**) then select **OAuth consent screen**."
+msgstr ""
+
+#: ../../general/auth/google.rst:25
+msgid ""
+"Fill in your address, email and the product name (for example odoo) and then"
+" save."
+msgstr ""
+
+#: ../../general/auth/google.rst:30
+msgid ""
+"Then click on **Add Credentials** and select the second option (OAuth 2.0 "
+"Client ID)."
+msgstr ""
+
+#: ../../general/auth/google.rst:38
+msgid ""
+"Check that the application type is set on **Web Application**. Now configure"
+" the allowed pages on which you will be redirected."
+msgstr ""
+
+#: ../../general/auth/google.rst:40
+msgid ""
+"To achieve this, complete the field **Authorized redirect URIs**. Copy paste"
+" the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. "
+"Then click on **Create**"
+msgstr ""
+
+#: ../../general/auth/google.rst:48
+msgid ""
+"Once done, you receive two information (your Client ID and Client Secret). "
+"You have to insert your Client ID in the **General Settings**."
+msgstr ""
+
+#: ../../general/base_import.rst:3
+msgid "Data Import"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:3
+msgid "How to adapt an import template"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:5
+msgid ""
+"Import templates are provided in the import tool of the most common data to "
+"import (contacts, products, bank statements, etc.). You can open them with "
+"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, "
+"etc.)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:11
+msgid "How to customize the file"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:13
+msgid ""
+"Remove columns you don't need. We advise to not remove the *ID* one (see why"
+" here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:15
+#: ../../general/base_import/import_faq.rst:26
+msgid ""
+"Set a unique ID to every single record by dragging down the ID sequencing."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:20
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field of the system. If so, find the "
+"corresponding field using the search."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:27
+msgid ""
+"Then, use the label you found in your import template in order to make it "
+"work straight away the very next time you try to import."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:31
+msgid "Why an “ID” column"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:33
+msgid ""
+"The **ID** (External ID) is an unique identifier for the line item. Feel "
+"free to use the one of your previous software to ease the transition to "
+"Odoo."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:36
+msgid ""
+"Setting an ID is not mandatory when importing but it helps in many cases:"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:38
+msgid ""
+"Update imports: you can import the same file several times without creating "
+"duplicates;"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:39
+msgid "Import relation fields (see here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:42
+msgid "How to import relation fields"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:44
+msgid ""
+"An Odoo object is always related to many other objects (e.g. a product is "
+"linked to product categories, attributes, vendors, etc.). To import those "
+"relations you need to import the records of the related object first from "
+"their own list menu."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:48
+msgid ""
+"You can do it using either the name of the related record or its ID. The ID "
+"is expected when two records have the same name. In such a case add \" / "
+"ID\" at the end of the column title (e.g. for product attributes: Product "
+"Attributes / Attribute / ID)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:3
+msgid "How to import data into Odoo"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:6
+msgid "How to start"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:7
+msgid ""
+"You can import data on any Odoo's business object using either Excel (.xlsx)"
+" or CSV (.csv) formats: contacts, products, bank statements, journal entries"
+" and even orders!"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:11
+msgid "Open the view of the object you want to populate and click *Import*."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:16
+msgid ""
+"There you are provided with templates you can easily populate with your own "
+"data. Such templates can be imported in one click; The data mapping is "
+"already done."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:22
+msgid "How to adapt the template"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:24
+msgid "Add, remove and sort columns to fit at best your data structure."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:25
+msgid "We advise to not remove the **ID** one (see why in the next section)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:31
+msgid ""
+"When you add a new column, Odoo might not be able to map it automatically if"
+" its label doesn't fit any field in Odoo. Don't worry! You can map new "
+"columns manually when you test the import. Search the list for the "
+"corresponding field."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:39
+msgid ""
+"Then, use this field's label in your file in order to make it work straight "
+"on the very next time."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:44
+msgid "How to import from another application"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:46
+msgid ""
+"In order to re-create relationships between different records, you should "
+"use the unique identifier from the original application and map it to the "
+"**ID** (External ID) column in Odoo. When you import another record that "
+"links to the first one, use **XXX/ID** (XXX/External ID) to the original "
+"unique identifier. You can also find this record using its name but you will"
+" be stuck if at least 2 records have the same name."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:54
+msgid ""
+"The **ID** will also be used to update the original import if you need to "
+"re-import modified data later, it's thus good practice to specify it "
+"whenever possible."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:60
+msgid "I cannot find the field I want to map my column to"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:62
+msgid ""
+"Odoo tries to find with some heuristic, based on the first ten lines of the "
+"files, the type of field for each column inside your file. For example if "
+"you have a column only containing numbers, only the fields that are of type "
+"*Integer* will be displayed for you to choose from. While this behavior "
+"might be good and easy for most cases, it is also possible that it goes "
+"wrong or that you want to map your column to a field that is not proposed by"
+" default."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:71
+msgid ""
+"If that happens, you just have to check the ** Show fields of relation "
+"fields (advanced)** option, you will then be able to choose from the "
+"complete list of fields for each column."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:79
+msgid "Where can I change the date import format?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:81
+msgid ""
+"Odoo can automatically detect if a column is a date and it will try to guess"
+" the date format from a set of most used date format. While this process can"
+" work for a lot of simple date format, some exotic date format will not be "
+"recognize and it is also possible to have some confusion (day and month "
+"inverted as example) as it is difficult to guess correctly which part is the"
+" day and which one is the month in a date like '01-03-2016'."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:83
+msgid ""
+"To view which date format Odoo has found from your file you can check the "
+"**Date Format** that is shown when clicking on **Options** under the file "
+"selector. If this format is incorrect you can change it to your liking using"
+" the *ISO 8601* to define the format."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:86
+msgid ""
+"If you are importing an excel (.xls, .xlsx) file, you can use date cells to "
+"store dates as the display of dates in excel is different from the way it is"
+" stored. That way you will be sure that the date format is correct in Odoo "
+"whatever your locale date format is."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:91
+msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:93
+msgid ""
+"Yes, we fully support numbers with parenthesis to represent negative sign as"
+" well as numbers with currency sign attached to them. Odoo also "
+"automatically detect which thousand/decimal separator you use (you can "
+"change those under **options**). If you use a currency symbol that is not "
+"known to Odoo, it might not be recognized as a number though and it will "
+"crash."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:95
+msgid ""
+"Examples of supported numbers (using thirty-two thousands as an example):"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:97
+msgid "32.000,00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:98
+msgid "32000,00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:99
+msgid "32,000.00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:100
+msgid "-32000.00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:101
+msgid "(32000.00)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:102
+msgid "$ 32.000,00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:103
+msgid "(32000.00 €)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:105
+msgid "Example that will not work:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:107
+msgid "ABC 32.000,00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:108
+msgid "$ (32.000,00)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:113
+msgid "What can I do when the Import preview table isn't displayed correctly?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:115
+msgid ""
+"By default the Import preview is set on commas as field separators and "
+"quotation marks as text delimiters. If your csv file does not have these "
+"settings, you can modify the File Format Options (displayed under the Browse"
+" CSV file bar after you select your file)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:117
+msgid ""
+"Note that if your CSV file has a tabulation as separator, Odoo will not "
+"detect the separations. You will need to change the file format options in "
+"your spreadsheet application. See the following question."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:122
+msgid ""
+"How can I change the CSV file format options when saving in my spreadsheet "
+"application?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:124
+msgid ""
+"If you edit and save CSV files in speadsheet applications, your computer's "
+"regional settings will be applied for the separator and delimiter. We "
+"suggest you use OpenOffice or LibreOffice Calc as they will allow you to "
+"modify all three options (in 'Save As' dialog box > Check the box 'Edit "
+"filter settings' > Save)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:126
+msgid ""
+"Microsoft Excel will allow you to modify only the encoding when saving (in "
+"'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:131
+msgid "What's the difference between Database ID and External ID?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:133
+msgid ""
+"Some fields define a relationship with another object. For example, the "
+"country of a contact is a link to a record of the 'Country' object. When you"
+" want to import such fields, Odoo will have to recreate links between the "
+"different records. To help you import such fields, Odoo provides 3 "
+"mechanisms. You must use one and only one mechanism per field you want to "
+"import."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:135
+msgid ""
+"For example, to reference the country of a contact, Odoo proposes you 3 "
+"different fields to import:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:137
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:138
+msgid ""
+"Country/Database ID: the unique Odoo ID for a record, defined by the ID "
+"postgresql column"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:139
+msgid ""
+"Country/External ID: the ID of this record referenced in another application"
+" (or the .XML file that imported it)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:141
+msgid "For the country Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:143
+msgid "Country: Belgium"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:144
+msgid "Country/Database ID: 21"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:145
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:147
+msgid ""
+"According to your need, you should use one of these 3 ways to reference "
+"records in relations. Here is when you should use one or the other, "
+"according to your need:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:149
+msgid ""
+"Use Country: This is the easiest way when your data come from CSV files that"
+" have been created manually."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:150
+msgid ""
+"Use Country/Database ID: You should rarely use this notation. It's mostly "
+"used by developers as it's main advantage is to never have conflicts (you "
+"may have several records with the same name, but they always have a unique "
+"Database ID)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:151
+msgid ""
+"Use Country/External ID: Use External ID when you import data from a third "
+"party application."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:153
+msgid ""
+"When you use External IDs, you can import CSV files with the \"External ID\""
+" column to define the External ID of each record you import. Then, you will "
+"be able to make a reference to that record with columns like "
+"\"Field/External ID\". The following two CSV files give you an example for "
+"Products and their Categories."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:155
+msgid ""
+"`CSV file for categories "
+"<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:157
+msgid ""
+"`CSV file for Products "
+"<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:161
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:163
+msgid ""
+"If for example you have two product categories with the child name "
+"\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other "
+"Products/Sellable\"), your validation is halted but you may still import "
+"your data. However, we recommend you do not import the data because they "
+"will all be linked to the first 'Sellable' category found in the Product "
+"Category list (\"Misc. Products/Sellable\"). We recommend you modify one of "
+"the duplicates' values or your product category hierarchy."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:165
+msgid ""
+"However if you do not wish to change your configuration of product "
+"categories, we recommend you use make use of the external ID for this field "
+"'Category'."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:170
+msgid ""
+"How can I import a many2many relationship field (e.g. a customer that has "
+"multiple tags)?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:172
+msgid ""
+"The tags should be separated by a comma without any spacing. For example, if"
+" you want your customer to be linked to both tags 'Manufacturer' and "
+"'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column"
+" of your CSV file."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:174
+msgid ""
+"`CSV file for Manufacturer, Retailer "
+"<../../_static/example_files/m2m_customers_tags.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:179
+msgid ""
+"How can I import a one2many relationship (e.g. several Order Lines of a "
+"Sales Order)?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:181
+msgid ""
+"If you want to import sales order having several order lines; for each order"
+" line, you need to reserve a specific row in the CSV file. The first order "
+"line will be imported on the same row as the information relative to order. "
+"Any additional lines will need an addtional row that does not have any "
+"information in the fields relative to the order. As an example, here is "
+"purchase.order_functional_error_line_cant_adpat.CSV file of some quotations "
+"you can import, based on demo data."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:184
+msgid ""
+"`File for some Quotations "
+"<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:186
+msgid ""
+"The following CSV file shows how to import purchase orders with their "
+"respective purchase order lines:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:188
+msgid ""
+"`Purchase orders with their respective purchase order lines "
+"<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:190
+msgid ""
+"The following CSV file shows how to import customers and their respective "
+"contacts:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:192
+msgid ""
+"`Customers and their respective contacts "
+"<../../_static/example_files/o2m_customers_contacts.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:197
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:199
+msgid ""
+"If you import a file that contains one of the column \"External ID\" or "
+"\"Database ID\", records that have already been imported will be modified "
+"instead of being created. This is very usefull as it allows you to import "
+"several times the same CSV file while having made some changes in between "
+"two imports. Odoo will take care of creating or modifying each record "
+"depending if it's new or not."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:201
+msgid ""
+"This feature allows you to use the Import/Export tool of Odoo to modify a "
+"batch of records in your favorite spreadsheet application."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:206
+msgid "What happens if I do not provide a value for a specific field?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:208
+msgid ""
+"If you do not set all fields in your CSV file, Odoo will assign the default "
+"value for every non defined fields. But if you set fields with empty values "
+"in your CSV file, Odoo will set the EMPTY value in the field, instead of "
+"assigning the default value."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:213
+msgid "How to export/import different tables from an SQL application to Odoo?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:215
+msgid ""
+"If you need to import data from different tables, you will have to recreate "
+"relations between records belonging to different tables. (e.g. if you import"
+" companies and persons, you will have to recreate the link between each "
+"person and the company they work for)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:217
+msgid ""
+"To manage relations between tables, you can use the \"External ID\" "
+"facilities of Odoo. The \"External ID\" of a record is the unique identifier"
+" of this record in another application. This \"External ID\" must be unique "
+"accoss all the records of all objects, so it's a good practice to prefix "
+"this \"External ID\" with the name of the application or table. (like "
+"'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:219
+msgid ""
+"As an example, suppose you have a SQL database with two tables you want to "
+"import: companies and persons. Each person belong to one company, so you "
+"will have to recreate the link between a person and the company he work for."
+" (If you want to test this example, here is a <a "
+"href=\"/base_import/static/csv/database_import_test.sql\">dump of such a "
+"PostgreSQL database</a>)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:221
+msgid ""
+"We will first export all companies and their \"External ID\". In PSQL, write"
+" the following command:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:227
+msgid "This SQL command will create the following CSV file::"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:234
+msgid ""
+"To create the CSV file for persons, linked to companies, we will use the "
+"following SQL command in PSQL:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:240
+msgid "It will produce the following CSV file::"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:248
+msgid ""
+"As you can see in this file, Fabien and Laurence are working for the Bigees "
+"company (company_1) and Eric is working for the Organi company. The relation"
+" between persons and companies is done using the External ID of the "
+"companies. We had to prefix the \"External ID\" by the name of the table to "
+"avoid a conflict of ID between persons and companies (person_1 and company_1"
+" who shared the same ID 1 in the orignial database)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:250
+msgid ""
+"The two files produced are ready to be imported in Odoo without any "
+"modifications. After having imported these two CSV files, you will have 4 "
+"contacts and 3 companies. (the firsts two contacts are linked to the first "
+"company). You must first import the companies and then the persons."
+msgstr ""
+
+#: ../../general/odoo_basics.rst:3
+msgid "BASICS"
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:3
+msgid "How to add a user"
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:5
+msgid ""
+"Odoo provides you with the option to add additional users at any given "
+"point."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:9
+msgid "Add individual users"
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:11
+msgid ""
+"From the Settings module, go to the submenu :menuselection:`Users --> Users`"
+" and click on **CREATE.** First add the name of your new user and the "
+"professional email address - the one he will use to log into Odoo instance -"
+" and a picture."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:19
+msgid ""
+"Under Access Rights, you can choose which applications your user can access "
+"and use. Different levels of rights are available depending on the app."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:23
+msgid ""
+"When you’re done editing the page and have clicked on **SAVE**, an "
+"invitation email will automatically be sent to the user. The user must click"
+" on it to accept the invitation to your instance and create a log-in."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:32
+msgid ""
+"Remember that each additional user will increase your subscription fees. "
+"Refer to our `*Pricing page* <https://www.odoo.com/pricing>`__ for more "
+"information."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:39
+msgid ""
+"You can also add a new user on the fly from your dashboard. From the above "
+"screenshot, enter the email address of the user you would like to add and "
+"click on **INVITE**. The user will receive an email invite containing a link"
+" to set his password. You will then be able to define his accesses rights "
+"under the :menuselection:`Settings --> Users menu`."
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:45
+msgid ""
+"`Deactivating Users <../../db_management/documentation.html#deactivating-"
+"users>`_"
+msgstr ""
+
+#: ../../general/odoo_basics/add_user.rst:46
+msgid ":doc:`../../crm/salesteam/setup/create_team`"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:3
+msgid "Manage Odoo in your own language"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:5
+msgid ""
+"Odoo provides you with the option to manage Odoo in different languages, and"
+" each user can use Odoo in his own language ."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:9
+msgid "Load your desired language"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:11
+msgid ""
+"The first thing to do is to load your desired language on your Odoo "
+"instance."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:14
+msgid ""
+"From the general dashboard click on the **Settings** app; on the top left of"
+" the page select :menuselection:`Translations --> Load a Translation`, "
+"select a language to install and click on **LOAD.**"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:23
+msgid ""
+"If you check the \"Websites to translate\" checkbox you will have the option"
+" to change the navigation language on your website."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:27
+msgid "Change your language"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:29
+msgid ""
+"You can change the language to the installed language by going to the drop-"
+"down menu at the top right side of the screen, choose **Preferences**."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:36
+msgid ""
+"Then change the Language setting to your installed language and click "
+"**SAVE.**"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:42
+msgid "Open a new menu to view the changes."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:45
+msgid "Change another user's language"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:47
+msgid ""
+"Odoo also gives you the possibility for each user to choose his preferred "
+"language."
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:50
+msgid ""
+"To change the language for a different user, choose :menuselection:`Users "
+"--> Users` from the Settings app. Here you have a list of all users and you "
+"can choose the user who you'd like to change the language for. Select the "
+"user and click on **Edit** in the top left corner. Under Preferences you can"
+" change the Language to any previously installed language and click "
+"**SAVE.**"
+msgstr ""
+
+#: ../../general/odoo_basics/choose_language.rst:61
+msgid ":doc:`../../website/publish/translate`"
+msgstr ""

locale/ru/LC_MESSAGES/getting_started.po

@@ -0,0 +1,635 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../getting_started/documentation.rst:5
+msgid "Odoo Online Implementation"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:7
+msgid ""
+"This document summarizes **Odoo's Online services**, our Success Pack "
+"**implementation methodology**, and *best practices* to **get started** with"
+" our product."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:11
+msgid ""
+"*We recommend that new Odoo Online customers read this document before the "
+"kick-off call with our project manager. This way, we save time and don't "
+"have to use your hours from the success pack discussing the basics.*"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:16
+msgid ""
+"*If you have not read this document, our project manager will review this "
+"with you at the time of the kick-off call.*"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:20
+msgid "Getting Started"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:22
+msgid ""
+"Do not wait for the kick-off meeting to begin playing with the software. The"
+" more exposure you have with Odoo, the more time you will save later during "
+"the implementation."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:26
+msgid ""
+"Once you purchase an Odoo Online subscription, you will receive instructions"
+" by e-mail on how to activate or create your database. From this email, you "
+"can activate your existing Odoo database or create a new one from scratch."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:31
+msgid ""
+"If you did not receive this email, e.g. because the payment was made by "
+"someone else in your company, contact our support using our `online support "
+"form <https://www.odoo.com/help>`__."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:38
+msgid ""
+"Fill in the sign-in or sign-up screens and you will get your first Odoo "
+"database ready to be used."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:41
+msgid ""
+"In order to familiarize yourself with the user interface, take a few minutes"
+" to create records: *products, customers, opportunities or projects / "
+"tasks*. Follow the blinking dots, they give you tips about the user "
+"interface as shown in the picture below."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:47
+msgid "|left_pic|"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:47
+msgid "|right_pic|"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:50
+msgid ""
+"Once you get used to the user interface, have a look at the implementation "
+"planners. These are accessible from the Settings app, or from the top "
+"progress bar on the right hand side of the main applications."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:58
+msgid "These implementation planners will:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:60
+msgid "help you define your goals and KPIs for each application,"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:62
+msgid "guide you through the different configuration steps,"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:64
+msgid "and provide you with tips and tricks to getting the most out of Odoo."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:66
+msgid ""
+"Fill in the first steps of the implementation planner (goals, expectations "
+"and KPIs). Our project manager will review them with you during the "
+"implementation process."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:73
+msgid ""
+"If you have questions or need support, our project manager will guide you "
+"through all the steps. But you can also:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:76
+msgid ""
+"Read the documentation on our website: "
+"`https://www.odoo.com/documentation/user "
+"<https://www.odoo.com/documentation/user>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:79
+msgid ""
+"Watch the videos on our eLearning platform (Free with your first Success "
+"Pack): `https://odoo.thinkific.com/courses/odoo-functional "
+"<https://odoo.thinkific.com/courses/odoo-functional>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:82
+msgid ""
+"Watch the webinars on our `Youtube channel "
+"<https://www.youtube.com/user/OpenERPonline>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:85
+msgid ""
+"Or send your questions to our online support through our `online support "
+"form <https://www.odoo.com/help>`__."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:89
+msgid "What do we expect from you?"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:91
+msgid ""
+"We are used to deploying fully featured projects within 25 to 250 hours of "
+"services, which is much faster than any other ERP vendor on the market. Most"
+" projects are completed between 1 to 9 calendar months."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:95
+msgid ""
+"But what really **differentiates between a successful implementation and a "
+"slow one, is you, the customer!** From our experience, when our customer is "
+"engaged and proactive the implementation is smooth."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:100
+msgid "Your internal implementation manager"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:102
+msgid ""
+"We ask that you maintain a single point of contact within your company to "
+"work with our project manager on your Odoo Implementation. This is to ensure"
+" efficiency and a single knowledge base in your company. Additionally, this "
+"person must:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:107
+msgid ""
+"**be available at least 2 full days a week** for the project, otherwise you "
+"risk slowing down your implementation. More is better with the fastest "
+"implementations having a full time project manager."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:111
+msgid ""
+"**have authority to take decisions** on their own. Odoo usually transforms "
+"all departments within a company for the better. There can be many small "
+"details that need quick turn arounds for answers and if there is too much "
+"back and forth between several internal decision makers within your company "
+"it could potentially seriously slow everything down."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:117
+msgid ""
+"**have the leadership** to train and enforce policies internally with full "
+"support from all departments and top management, or be part of top "
+"management."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:121
+msgid "Integrate 90% of your business, not 100%"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:123
+msgid ""
+"You probably chose Odoo because no other software allows for such a high "
+"level of automation, feature coverage, and integration. But **don't be an "
+"extremist.**"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:127
+msgid ""
+"Customizations cost you time, money, are more complex to maintain, add risks"
+" to the implementation, and can cause issues with upgrades."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:130
+msgid ""
+"Standard Odoo can probably cover 90% of your business processes and "
+"requirements. Be flexible on the remaining 10%, otherwise that 10% will cost"
+" you twice the original project price. One always underestimates the hidden "
+"costs of customization."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:134
+msgid ""
+"**Do it the Odoo way, not yours.** Be flexible, use Odoo the way it was "
+"designed. Learn how it works and don't try to replicate the way your old "
+"system(s) works."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:138
+msgid ""
+"**The project first, customizations second.** If you really want to "
+"customize Odoo, phase it towards the end of the project, ideally after "
+"having been in production for several months. Once a customer starts using "
+"Odoo, they usually drop about 60% of their customization requests as they "
+"learn to perform their work flows out of the box, or the Odoo way. It is "
+"more important to have all your business processes working than customizing "
+"a screen to add a few fields here and there or automating a few e-mails."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:147
+msgid ""
+"Our project managers are trained to help you make the right decisions and "
+"measure the tradeoffs involved but it is much easier if you are aligned with"
+" them on the objectives. Some processes may take more time than your "
+"previous system(s), however you need to weigh that increase in time with "
+"other decreases in time for other processes. If the net time spent is "
+"decreased with your move to Odoo than you are already ahead."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:155
+msgid "Invest time in learning Odoo"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:157
+msgid ""
+"Start your free trial and play with the system. The more comfortable you are"
+" with navigating Odoo, the better your decisions will be and the quicker and"
+" easier your training phases will be."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:161
+msgid ""
+"Nothing replaces playing with the software, but here are some extra "
+"resources:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:164
+msgid ""
+"Documentation: `https://www.odoo.com/documentation/user "
+"<https://www.odoo.com/documentation/user>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:167
+msgid ""
+"Introduction Videos: `https://www.odoo.com/r/videos "
+"<https://www.odoo.com/r/videos>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:170
+msgid ""
+"Customer Reviews: `https://www.odoo.com/blog/customer-reviews-6 "
+"<https://www.odoo.com/blog/customer-reviews-6>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:174
+msgid "Get things done"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:176
+msgid ""
+"Want an easy way to start using Odoo? Install Odoo Notes to manage your to-"
+"do list for the implementation: `https://www.odoo.com/page/notes "
+"<https://www.odoo.com/page/notes>`__. From your Odoo home, go to Apps and "
+"install the Notes application."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:184
+msgid "This module allows you to:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:186
+msgid "Manage to-do lists for better interactions with your consultant;"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:188
+msgid "Share Odoo knowledge & good practices with your employees;"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:190
+msgid ""
+"Get acquainted with all the generic tools of Odoo: Messaging, Discussion "
+"Groups, Kanban Dashboard, etc."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:197
+msgid ""
+"This application is even compatible with the Etherpad platform "
+"(http://etherpad.org). To use these collaborative pads rather than standard "
+"Odoo Notes, install the following add-on: Memos Pad."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:202
+msgid "What should you expect from us?"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:205
+msgid "Subscription Services"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:208
+msgid "Cloud Hosting"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:210
+msgid ""
+"Odoo provides a top notch cloud infrastructure including backups in three "
+"different data centers, database replication, the ability to duplicate your "
+"instance in 10 minutes, and more!"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:214
+msgid ""
+"Odoo Online SLA: `https://www.odoo.com/page/odoo-online-sla "
+"<https://www.odoo.com/page/odoo-online-sla>`__\\"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:217
+msgid ""
+"Odoo Online Security: `https://www.odoo.com/page/security "
+"<https://www.odoo.com/fr_FR/page/security>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:220
+msgid ""
+"Privacy Policies: `https://www.odoo.com/page/odoo-privacy-policy "
+"<https://www.odoo.com/page/odoo-privacy-policy>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:224
+msgid "Support"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:226
+msgid ""
+"Your Odoo Online subscription includes an **unlimited support service at no "
+"extra cost, 24/5, Monday to Friday**. To cover 24 hours, our teams are in "
+"San Francisco, Belgium and India. Questions could be about anything and "
+"everything from: how to use or configure, bugfix requests, payments or "
+"subscription issues."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:232
+msgid ""
+"Our support can be contacted through our `online support form "
+"<https://www.odoo.com/help>`__."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:235
+msgid ""
+"Note: The support team cannot develop new features, customize, import data "
+"or train your users. These services are provided by your dedicated project "
+"manager, as part of the Success Pack."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:240
+msgid "Upgrades"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:242
+msgid ""
+"Once every two months, Odoo releases a new version. You will get an upgrade "
+"button within the **Manage Your Databases** screen. Upgrading your database "
+"is at your own discretion, but allows you to benefit from new features."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:247
+msgid ""
+"We provide the option to upgrade in a test environment so that you can "
+"evaluate a new version or train your team before the roll out. Simply fill "
+"our `online support form <https://www.odoo.com/help>`__ to make this "
+"request."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:252
+msgid "Success Pack Services"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:254
+msgid ""
+"The Success Pack is a package of premium hour-based services performed by a "
+"dedicated project manager and business analyst. The list of services "
+"according to your success pack is detailed online: `https://www.odoo.com"
+"/pricing-packs <https://www.odoo.com/pricing-packs>`__"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:259
+msgid ""
+"The goal of the project manager is to help you get to production within the "
+"defined time frame and budget, i.e. the initial number of hours defined in "
+"your success pack."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:263
+msgid "His/her role includes:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:265
+msgid ""
+"**Project Management:** review of your objectives & expectations, phasing of"
+" the implementation (road map), mapping of your business needs and the Odoo "
+"features."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:269
+msgid "**Customized Support:** by phone, e-mail or webinar."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:271
+msgid ""
+"**Training, Coaching, and Onsite Consulting:** remote trainings via screen "
+"sharing or training on premises. For on premise training sessions, you will "
+"be expected to pay extra for travel expenses and accommodations for your "
+"consultant."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:276
+msgid ""
+"**Configuration:** decisions about how to implement specific needs in Odoo "
+"and advanced configuration. (e.g. logistic routes, advanced pricing "
+"structures, etc.)"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:280
+msgid ""
+"**Data Import**: we can do it or assist you on how to do it with a template "
+"prepared by the project manager."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:283
+msgid ""
+"If you have subscribed to a **Custom App**, you benefit from following extra"
+" services:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:286
+msgid "**Customization of screens**"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:288
+msgid ""
+"**Customization of reports (PDF):** our project managers have access to "
+"developers for advanced customizations."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:291
+msgid ""
+"**Website Design:** standard themes are provided to get started at no extra "
+"cost. However, our project manager can coach you on how to utilize the "
+"building blocks of the website designer. The time spent will consume hours "
+"of your success pack."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:296
+msgid ""
+"**Workflow automations:** e.g. setting values in fields based on triggers, "
+"sending reminders by emails, automating actions, etc. For very advanced "
+"automations, our project managers have access to Odoo developers."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:302
+msgid "Implementation Methodology"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:304
+msgid ""
+"We follow a **lean and hands-on methodology**, that is used to put customers"
+" in production in a short period of time and at a low cost."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:307
+msgid ""
+"After the kick-off meeting, we define a phasing plan to deploy Odoo "
+"progressively, by groups of apps."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:313
+msgid ""
+"The goal of the **Kick-off call** is for our project manager to come to an "
+"understanding of your business in order to propose an implementation plan "
+"(phasing). Each phase is the deployment of a set applications that you will "
+"fully use in production at the end of the phase."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:319
+msgid "For every phase, the steps are the following:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:321
+msgid ""
+"**On Boarding:** Odoo's project manager will review Odoo's business flows "
+"with you, according to your business. The goal is to train you, validate the"
+" business process and configure according to your specific needs."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:326
+msgid ""
+"**Data:** created manually or imported from your existing system. You are "
+"responsible to export the data from your existing system and Odoo's project "
+"manager will import them in Odoo."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:330
+msgid ""
+"**Training:** once your applications are set up, your data imported, and the"
+" system is working smoothly, you will train your users. There will be some "
+"back and forth with your Odoo project manager to answer questions and "
+"process your feedback."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:335
+msgid "**Production**: Once everyone is trained, your users start using Odoo."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:338
+msgid ""
+"Once you are comfortable using Odoo, we will fine-tune the process and "
+"**automate** some tasks and do the remaining customizations (**extra screens"
+" and reports**)."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:342
+msgid ""
+"Once all applications are deployed and users are comfortable on Odoo, our "
+"project manager will not work on your project anymore (unless you have new "
+"needs) and you will use the support service if you have further questions."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:348
+msgid "Managing your databases"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:350
+msgid ""
+"To access your databases, go to Odoo.com, sign in and click **My Databases**"
+" in the drop-down menu at the top right corner."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:356
+msgid ""
+"Odoo gives you the opportunity to test the system before going live or "
+"before upgrading to a newer version. Do not mess up your working environment"
+" with test data!"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:360
+msgid ""
+"In that purpose, you can create as many free trials as you want (available "
+"for 15 days). Those instances can be instant copies of your working "
+"environment. To do so, go to the Odoo.com account in **My Organizations** "
+"page and click **Duplicate**."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:371
+msgid ""
+"You can find more information on how to manage your databases :ref:`here "
+"<db_management/documentation>`."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:375
+msgid "Customer Success"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:377
+msgid ""
+"Odoo is passionate about delighting our customers and ensuring that they "
+"have all the resources needed to complete their project."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:380
+msgid ""
+"During the implementation phase, your point of contact is the project "
+"manager and eventually the support team."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:383
+msgid ""
+"Once you are in production, you will probably have less interaction with "
+"your project manager. At that time, we will assign a member of our Client "
+"Success Team to you. They are specialized in the long-term relationship with"
+" our customers. They will contact you to showcase new versions, improve the "
+"way you work with Odoo, assess your new needs, etc..."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:390
+msgid ""
+"Our internal goal is to keep customers for at least 10 years and offer them "
+"a solution that grows with their needs!"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:393
+msgid "Welcome aboard and enjoy your Odoo experience!"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:396
+msgid ":doc:`../../db_management/documentation`"
+msgstr ""

locale/ru/LC_MESSAGES/index.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../index.rst:3
+msgid "Odoo User Documentation"
+msgstr ""

locale/ru/LC_MESSAGES/manufacturing.po

@@ -0,0 +1,728 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../manufacturing.rst:5
+msgid "Manufacturing"
+msgstr ""
+
+#: ../../manufacturing/operations.rst:3
+msgid "Manufacturing Operations"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment.rst:3
+msgid "Replenishment Strategies"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:3
+msgid "How to select the right replenishment strategy"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:5
+msgid ""
+"Minimum Stock rules and Make to Order have similar consequences but "
+"different rules. They should be used depending on your manufacturing and "
+"delivery strategies."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:10
+msgid "Terminology"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:13
+msgid "Minimum stock rule"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:15
+msgid ""
+"Minimum Stock rules are used to ensure that you always have the minimum "
+"amount of a product in stock in order to manufacture your products and/or "
+"answer to your customer needs. When the stock level of a product reaches its"
+" minimum the system will automatically generate a procurement order with the"
+" quantity needed to reach the maximum stock level."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:22
+#: ../../manufacturing/operations/replenishment/strategies.rst:58
+msgid "Make to Order"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:24
+msgid ""
+"The Make to Order function will trigger a Purchase Order of the amount of "
+"the Sales Order related to the product. The system will **not** check the "
+"current stock. This means that a draft purchase order will be generated "
+"regardless of the quantity on hand of the product."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:30
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:27
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:62
+msgid "Configuration"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:33
+msgid "Minimum stock rules"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:35
+msgid ""
+"The Minimum Stock Rules configuration is available through your Inventory "
+"module. In the Inventory Control menu select \"Reordering Rule\" in the drop"
+" down menu. There, click on \"Create\" to set minimum and maximum stock "
+"values for a given product."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:44
+msgid ""
+"Show tooltips for \"minimum quantity\", \"maximum quantity\" and \"quantity "
+"multiple\" fields"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:47
+msgid ""
+"Then, click on your product to access the related product form and, on the "
+"\"Inventory submenu\", do not forget to select a supplier."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:54
+msgid ""
+"Don't forget to select the right product type. A consumable can not be "
+"stocked and will thus not be accounted for in the stock valuation."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:60
+msgid ""
+"The Make to Order configuration is available on your product form through "
+"your :menuselection:`Inventory --> Inventory control --> Products` (or any "
+"other module where products are available)."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:64
+msgid "On the product form, under Inventory, click on \"Make To Order\"."
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:70
+msgid "Choice between the two options"
+msgstr ""
+
+#: ../../manufacturing/operations/replenishment/strategies.rst:72
+msgid ""
+"The choice between the two options is thus dependent of your inventory "
+"strategy. If you prefer to have a buffer and always have at least a minimum "
+"amount, the minimum stock rule should be used. If you want to reorder your "
+"stocks only if your sale is confirmed it is better to use the Make to Order."
+msgstr ""
+
+#: ../../manufacturing/overview.rst:3
+msgid "Overview"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials.rst:3
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:6
+msgid "Bill of Materials"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:3
+msgid "How to Sell a Set of Products as a Kit"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:5
+msgid ""
+"A *kit* is a set of components that are delivered without first being "
+"assembled or mixed. Kits are described in Odoo using *bills of materials*. "
+"There are two basic ways to configure kits, depending on how stock of the "
+"kit product is to be managed. In either case, both the Inventory and "
+"Manufacturing apps must be installed."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:12
+msgid "Manage Stock of Component Products"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:14
+msgid ""
+"If you would like to assemble kits as they are ordered, managing stock of "
+"the kit *components* only, you will use a Kit BoM without a manufacturing "
+"step."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:18
+msgid ""
+"A product using a Kit BoM will appear as a single line item on a quotation "
+"and sales order, but will generate a delivery order with one line item for "
+"each of the components of the kit. In the examples below, the image at left "
+"shows a sales order for the kit \"Custom Computer Kit\", while the image at "
+"right shows the corresponding delivery order."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:24
+msgid "|image0|\\ |image1|"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:29
+msgid ""
+"From the **Products** menu in either the Inventory or Manufacturing app, "
+"create each component product as you would any other product, then create "
+"the top-level, or kit product. The kit product should have only the route "
+"**Manufacture** set. Because you cannot track the stock of kit products, the"
+" Product Type should be set to **Consumable**. Because a kit product cannot "
+"be purchased, **Can be Purchased** should be unchecked."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:37
+msgid ""
+"All other parameters on the kit product may be modified according to your "
+"preference. The component products require no special configuration."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:44
+msgid ""
+"Once the products are configured, create a bill of materials for the kit "
+"product. Add each component and its quantity. Select the BoM Type **Ship "
+"this product as a set of components**. All other options may be left with "
+"their default values."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:53
+msgid "Manage Stock of Kit Product and Component Products"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:55
+msgid ""
+"If you would like to manage stock of the top-level kit product, you will use"
+" a standard BoM with a manufacturing step instead of a Kit BoM. When using a"
+" standard BoM to assemble kits, a manufacturing order will be created. The "
+"manufacturing order must be registered as completed before the kit product "
+"will appear in your stock."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:64
+msgid ""
+"On the kit product, select the route **Manufacture**. You may also select "
+"**Make to Order**, which will create a manufacturing order whenever a sales "
+"order is confirmed. Select the product type **Stockable Product** to enable "
+"stock management."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/kit_shipping.rst:72
+msgid ""
+"When you create the bill of materials, select the BoM Type **Manufacture "
+"this product**. The assembly of the kit will be described by a manufacturing"
+" order rather than a packing operation."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/product_variants.rst:3
+msgid "How to manage BoMs for product variants"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/product_variants.rst:5
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:125
+msgid ""
+"Odoo allows you to use one bill of materials for multiple variants of the "
+"same product. Simply enable variants from :menuselection:`Configuration --> "
+"Settings`."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/product_variants.rst:12
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:132
+msgid ""
+"You will then be able to specify which component lines are to be used in the"
+" manufacture of each product variant. You may specify multiple variants for "
+"each line. If no variant is specified, the line will be used for all "
+"variants."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/product_variants.rst:17
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:137
+msgid ""
+"When defining variant BoMs on a line-item-basis, the **Product Variant** "
+"field in the main section of the BoM should be left blank. This field is "
+"used when creating a BoM for one variant of a product only."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:3
+msgid "How to manage semi-finished products"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:5
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:83
+msgid ""
+"A subassembly is a manufactured product which is intended to be used as a "
+"component of another manufactured product. You may wish to employ sub-"
+"assemblies to simplify a complex BoM, to more accurately represent your "
+"manufacturing flow, or to use the same subassembly in multiple BoMs. A BoM "
+"that employs subassemblies is often referred to as a multi-level BoM."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:12
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:90
+msgid ""
+"Multi-level bills of materials in Odoo are accomplished by creating a top-"
+"level BoM and subassembly BoMs. Next, the procurement route of the "
+"subassembly product is defined. This ensures that every time a manufacturing"
+" order for the top-level product is created, a manufacturing order for each "
+"subassembly is created as well."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:19
+msgid "Configure the Top -Level Product BoM"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:21
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:99
+msgid ""
+"To configure a multi-level BoM, create the top-level product and its BoM. "
+"Include any subassemblies in the list of components. Create a BoM for each "
+"subassembly as you would for any product."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:29
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:107
+msgid "Configure the Subassembly Product Data"
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:31
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:109
+msgid ""
+"On the product form of the subassembly, you must select the routes "
+"**Manufacture** and **Make To Order**. The **Manufacture** route takes "
+"precedence over the **Buy** route, so selecting the latter will have no "
+"effect."
+msgstr ""
+
+#: ../../manufacturing/overview/bill_of_materials/sub_assemblies.rst:39
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:117
+msgid ""
+"If you would like to be able to purchase the subassembly in addition to "
+"manufacturing it, select **Can be Purchased**. All other fields on the "
+"subassembly product form may be configured according to your preference."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started.rst:3
+msgid "Getting Started"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started.rst:5
+msgid "How to consume composents to make a finished product"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:3
+msgid "How to create a Bill of Materials"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:5
+msgid ""
+"A bill of materials (BoM) is a document that describes the component "
+"products, the quantity of each component, and the process required to "
+"manufacture a product, including a routing and individual steps."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:9
+msgid ""
+"In Odoo, each product may have multiple BoMs associated with it, but a BoM "
+"can only be associated with a single product. A single BoM can, however, "
+"describe multiple variants of the same product."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:14
+msgid "Setting up a Basic BoM"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:16
+msgid ""
+"If you choose to manage your manufacturing operations using manufacturing "
+"orders only, you will define basic bills of materials without routings. For "
+"more information about which method of management to use, review the "
+"**Getting Started** section of the *Manufacturing* chapter of the "
+"documentation."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:22
+msgid ""
+"Before creating your first bill of materials, you will need to create a "
+"product and at least one component (components are considered products in "
+"Odoo). You can do so from :menuselection:`Master Data --> Products`, or on "
+"the fly from the relevant fields on the BoM form. Review the Inventory "
+"chapter for more information about configuring products. Once you have "
+"created a product and at least one component, select them from the relevant "
+"dropdown menus to add them to your bill of materials. A new bill of "
+"materials can be created from :menuselection:`Master Data --> Bills of "
+"Materials`, or using the button on the top of the product form."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:32
+msgid ""
+"Under the **Miscellaneous** tab, you can fill additional fields. "
+"**Sequence** defines the order in which your BoMs will be selected for "
+"production orders, with lower numbers having higher priority. **Version** "
+"allows you to track changes to your BoM over time."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:38
+msgid "Adding a Routing to a BoM"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:40
+msgid ""
+"A routing defines a series of operations required to manufacture a product "
+"and the work center at which each operation is performed. A routing may be "
+"added to multiple BoMs, though a BoM may only have one routing. For more "
+"information about configuring routings, review the chapter on routings."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:46
+msgid ""
+"After enabling routings from :menuselection:`Configuration --> Settings`, "
+"you will be able to add a routing to a bill of materials by selecting a "
+"routing from the dropdown list or creating one on the fly."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:50
+msgid ""
+"You may define the work operation or step in which each component is "
+"consumed using the field, **Consumed in Operation** under the **Components**"
+" tab. Similarly, you can define the operation at which the product will be "
+"produced under the **Miscellaneous** tab using the field **Produced at "
+"Operation**. If this field is left blank, the products will be "
+"consumed/produced at the final operation in the routing."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:61
+msgid "Adding Byproducts to a BoM"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:63
+msgid ""
+"In Odoo, a byproduct is any product produced by a BoM in addition to the "
+"primary product."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:66
+msgid ""
+"To add byproducts to a BoM, you will first need to enable them from "
+":menuselection:`Configuration --> Settings`."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:72
+msgid ""
+"Once byproducts are enabled, you can add them to your bills of materials "
+"under the **Byproducts** tab of the bill of materials. You can add any "
+"product or products as byproducts. Byproducts are produced in the same step "
+"of the routing as the primary product of the BoM."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:81
+msgid "Setting up a BoM for a Product With Sub-Assemblies"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:97
+msgid "Configure the Top-Level Product BoM"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/bill_configuration.rst:123
+msgid "Using a Single BoM to Describe Several Variants of a Single Product"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:3
+msgid "How to process a manufacturing order"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:6
+msgid "Introduction"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:8
+msgid ""
+"There are two basic ways to manage manufacturing in Odoo. The first way "
+"manages work with one document only. This document is the **manufacturing "
+"order**. The second way uses additional documents to give you more precise "
+"control over the manufacturing process. In this way, **Manufacturing "
+"orders** are divided into one or more steps defined by **work orders**, "
+"performed in an order defined by **routings**."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:17
+msgid "How to manage manufacturing without routings"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:19
+msgid ""
+"You will most likely use manufacturing orders without routings if all the "
+"work to produce your product is performed in one place, by one person, in "
+"one step, and/or you do not need the level of granular control afforded by "
+"work orders and routings."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:24
+msgid ""
+"Managing your operations in this way is the default behavior in Odoo. There "
+"are two basic phases from planning to production:"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:27
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:52
+msgid "Create manufacturing orders"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:29
+msgid "Record Production"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:32
+msgid "How to manage manufacturing with routings and work orders"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:34
+msgid ""
+"To use work orders and routings, you will need to enable the option **Manage"
+" production by work orders** From :menuselection:`Configuration --> "
+"Settings`. You will then be able to add routings to bills of materials, and "
+"configure some additional related fields. You will also be able to create "
+"**work centers**, the locations at which work orders are performed."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:41
+msgid ""
+"When manufacturing with routings and work orders, each work order is "
+"scheduled individually. You will also have access to time and capacity "
+"planning, and reports on costing and efficiency on a work center level."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:45
+msgid ""
+"Manufacturing using routings can be broken down into several steps. When "
+"configuring your BoM, you will need to add a routing defining the component "
+"work orders. After planning the manufacturing order, you will have the added"
+" step of scheduling work orders."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:50
+msgid "The workflow is thus divided into three basic phases, as follows:"
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:54
+msgid "Schedule the associated work orders."
+msgstr ""
+
+#: ../../manufacturing/overview/getting_started/manufacturing_order.rst:56
+msgid "Perform the scheduled work and record production."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts.rst:3
+msgid "Main Concepts"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/intro.rst:3
+msgid "Introduction to Odoo Manufacturing"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/intro.rst:11
+msgid "Transcript"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/intro.rst:13
+msgid "Work in progress."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:3
+msgid "Manufacturing Terminologies"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:9
+msgid ""
+"A bill of materials (BoM) is a document that describes the materials, the "
+"quantity of each material, and the steps required to manufacture a product. "
+"Depending on the industry and the nature of the finished product, a "
+"different name may be used to describe the same document. For example, in "
+"the pharmaceutical industry, the term “recipe” may be used."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:14
+msgid "Cycle"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:17
+msgid ""
+"A production cycle is a frame of time during which an entire manufacturing "
+"process can be fulfilled."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:19
+msgid "Downtime or Leave"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:22
+msgid ""
+"Time during which a resource is unavailable. If the resource is a machine, "
+"the unavailability is downtime, while if the resource is human, unavailable "
+"time is called a Leave."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:25
+msgid "Finished products"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:28
+msgid ""
+"Finished products are the final output of a manufacturing process. They are "
+"normally not intended to be used as input into another manufacturing order "
+"of the company."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:31
+msgid "Kit"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:34
+msgid ""
+"A kit is a set of components that are described by a bill of materials, but "
+"which are delivered separately rather than assembled or mixed."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:36
+msgid "Multi-level Bill of Materials"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:39
+msgid ""
+"A bill of material can quickly grow very complex. To keep it manageable, it "
+"can be broken down into several smaller manufactured parts, each having its "
+"own BOM. These parts are typically referred to as sub-assembly of "
+"intermediate products."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:44
+msgid ""
+"Defining a BOM in multiple levels reduces the complexity of the top-level "
+"document and allows components to be reused in other BoMs."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:46
+msgid "Phantom Bill of Material"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:49
+msgid ""
+"A phantom bill of material is always used in the context of multi-level "
+"BOMs. It allows to add a sub-assembly as part of a bigger end-product while "
+"avoiding to trigger a separate manufacturing order for the sub-assembly."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:54
+msgid ""
+"As such, when a manufacturing order for the final product is launched, the "
+"components of the sub-assembly are reflected in the parent BOM as if they "
+"were direct components of the parent BOM."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:58
+msgid ""
+"Phantom BOM are thus used for grouping a set of components with the aim of "
+"reusing them in many other BOM without the need to launch separate "
+"manufacturing orders for the sub-assemblies."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:61
+msgid "Raw Materials"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:64
+msgid ""
+"Raw materials and components constitute the input that are transformed to "
+"produce semi-finished or finished goods."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:67
+msgid ""
+"The transformation here can take many aspects according to the industry. It "
+"can be simple assembly, welding, mixing, etc."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:69
+msgid "Routing"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:72
+msgid ""
+"A routing is a document that describes a series of Work Orders and the Work "
+"Centers at which they will be carried out"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:74
+msgid "Semi-finished products and sub-assemblies"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:77
+msgid ""
+"These are products which are manufactured with the purpose to be consumed in"
+" another manufacturing order."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:79
+msgid "Work Order Operations"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:82
+msgid ""
+"Work Order Operations specify the set of activities necessary to fully "
+"process a manufacturing order. Each activity or operation takes some time to"
+" be completed and is performed into a determined production unit (also "
+"called work center)."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:86
+msgid "Work Order"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:89
+msgid ""
+"A work order is a single manufacturing operation that is scheduled for "
+"execution on a given date and a given duration."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:91
+msgid "Work Center"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:94
+msgid ""
+"Work centers identify production units and their resources. They are used to"
+" represent the plant capacity as well as costing information. The capacity "
+"is a combination of resources and their availability time."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:97
+msgid "Resources"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:100
+msgid ""
+"In manufacturing a resource can be a human being (employee) or machine "
+"available in a work center."
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:102
+msgid "Working Time"
+msgstr ""
+
+#: ../../manufacturing/overview/main_concepts/terminologies.rst:105
+msgid ""
+"Each resource has its normal working time. For instance, machines can be set"
+" up to operate 7 days a week 20 hours out of 24."
+msgstr ""

locale/ru/LC_MESSAGES/practical.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../practical.rst:3
+msgid "Practical Information"
+msgstr ""

locale/ru/LC_MESSAGES/recruitment.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo Business package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Business 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-22 13:16+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: ../../recruitment.rst:5
+msgid "Recruitment"
+msgstr ""

locale/sources/accounting.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,7 +79,6 @@ msgstr ""
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:23
 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31
 msgid "Configuration"
 msgstr ""
@@ -574,7 +573,6 @@ msgstr ""
 
 #: ../../accounting/bank/misc/batch.rst:124
 #: ../../accounting/payables/pay/sepa.rst:113
-#: ../../accounting/receivables/customer_payments/paypal.rst:134
 msgid "Troubleshooting"
 msgstr ""
 
@@ -1067,6 +1065,11 @@ msgstr ""
 msgid "In the tab Journal Entries, the Default Debit and Credit Account can be configured as well as the currency of the journal"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr ""
@@ -1083,83 +1086,164 @@ msgstr ""
 msgid "Select 'General' for miscellaneous operations journals."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Company"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Short Code"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Dedicated Refund Sequence"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Entry Sequence"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "This field contains the information related to the numbering of the journal entries of this journal."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Refund Entry Sequence"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "This field contains the information related to the numbering of the refund entries of this journal."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Debit Account"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for debit amount"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Default Credit Account"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for credit amount"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Currency"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Debit Methods"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Payment Methods"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Means of payment for sending money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Group Invoice Lines"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Profit Account"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Used to register a profit when the ending balance of a cash register differs from what the system computes"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Loss Account"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Used to register a loss when the ending balance of a cash register differs from what the system computes"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Show journal on dashboard"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Printing Payment Method Selected"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Technical feature used to know whether check printing was enabled as payment method."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Check Sequence"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Checks numbering sequence."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Manual Numbering"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check this option if your pre-printed checks are not numbered."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Next Check Number"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Sequence number of the next printed check."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Active in Point of Sale"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Check this box if this journal define a payment method that can be used in a point of sale."
 msgstr ""
 
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+msgid "Amount Authorized Difference"
+msgstr ""
+
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "This field depicts the maximum difference allowed between the ending balance and the theoretical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager."
 msgstr ""
@@ -1301,6 +1385,10 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Status"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "When an asset is created, the status is 'Draft'."
 msgstr ""
@@ -1313,22 +1401,42 @@ msgstr ""
 msgid "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Category"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Category of asset"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Date"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Date of asset"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Gross Value"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Gross value of asset"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Salvage Value"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Computation Method"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Choose the method to use to compute the amount of depreciation lines."
 msgstr ""
@@ -1341,6 +1449,10 @@ msgstr ""
 msgid "* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Time Method Based On"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Choose the method to use to compute the dates and number of depreciation lines."
 msgstr ""
@@ -1353,14 +1465,26 @@ msgstr ""
 msgid "* Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Prorata Temporis"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Depreciations"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
+#: ../../accounting/others/adviser/assets.rst:0
+msgid "Number of Months in a Period"
+msgstr ""
+
 #: ../../accounting/others/adviser/assets.rst:0
 msgid "The amount of time between two depreciations, in months"
 msgstr ""
@@ -2036,6 +2160,9 @@ msgstr ""
 
 #: ../../accounting/others/analytic/usage.rst:64
 #: ../../accounting/others/analytic/usage.rst:157
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:48
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:62
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:74
 #: ../../accounting/overview/process_overview/customer_invoice.rst:107
 #: ../../accounting/overview/process_overview/customer_invoice.rst:128
 msgid "**Debit**"
@@ -2043,6 +2170,9 @@ msgstr ""
 
 #: ../../accounting/others/analytic/usage.rst:64
 #: ../../accounting/others/analytic/usage.rst:157
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:48
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:62
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:74
 #: ../../accounting/overview/process_overview/customer_invoice.rst:107
 #: ../../accounting/overview/process_overview/customer_invoice.rst:128
 msgid "**Credit**"
@@ -2489,18 +2619,34 @@ msgstr ""
 msgid "Account Type is used for information purpose, to generate country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."
 msgstr ""
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Tags"
+msgstr ""
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
 msgstr ""
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Account Currency"
+msgstr ""
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
 msgstr ""
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Internal Type"
+msgstr ""
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "The 'Internal Type' is used for features available on different types of accounts: liquidity type is for cash or bank accounts, payable/receivable is for vendor/customer accounts."
 msgstr ""
 
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Allow Reconciliation"
+msgstr ""
+
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Check this box if this account allows invoices & payments matching of journal items."
 msgstr ""
@@ -3735,6 +3881,86 @@ msgstr ""
 msgid ":doc:`B2B_B2C`"
 msgstr ""
 
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:3
+msgid "How to manage cash basis taxes"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:5
+msgid "The cash basis taxes are due when the payment has been done and not at the validation of the invoice (as it is the case with standard taxes). Reporting your income and expenses to the administration based on the cash basis method is legal in some countries and under some conditions."
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:10
+msgid "Example : You sell a product in the 1st quarter of your fiscal year and receive the payment the 2nd quarter of your fiscal year. Based on the cash basis method, the tax you have to pay to the administration is due for the 2nd quarter."
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:16
+msgid "How to configure cash basis taxes ?"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:18
+msgid "You first have to activate the setting in :menuselection:`Accounting --> Configuration --> Settings --> Allow Tax Cash Basis`. You will be asked to define the Tax Cash Basis Journal."
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:27
+msgid "Once this is done, you can configure your taxes in :menuselection:`Accounting --> Configuration --> Taxes`. You can open a tax and in the *Advanced Options* tab you will see the checkbox *Use Cash Basis*. You will then have to define the *Tax Received Account*."
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:39
+msgid "What is the impact of cash basis taxes in my accounting ?"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:41
+msgid "Let’s take an example. You make a sale of $100 with a 15% cash basis tax. When you validate the customer invoice, the following entry is created in your accounting:"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:46
+msgid "Customer Invoices Journal"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:50
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:66
+msgid "Receivables $115"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:52
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:76
+msgid "Tax Account $15"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:54
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:80
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:82
+msgid "Income Account $100"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:57
+msgid "A few days later, you receive the payment:"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:60
+msgid "Bank Journal"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:64
+msgid "Bank $115"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:69
+msgid "When you reconcile the invoice and the payment, this entry is generated:"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:72
+msgid "Tax Cash Basis Journal"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:78
+msgid "Tax Received Account $15"
+msgstr ""
+
+#: ../../accounting/others/taxes/cash_basis_taxes.rst:86
+msgid "The two journal items created in the Income Account are neutral but they are needed to insure correct tax reports in Odoo."
+msgstr ""
+
 #: ../../accounting/others/taxes/create.rst:3
 msgid "How to create new taxes"
 msgstr ""
@@ -5589,18 +5815,34 @@ msgstr ""
 msgid "Explanation of the fields of the payment screen:"
 msgstr ""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Has Invoices"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used for usability purposes"
 msgstr ""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Hide Payment Method"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'"
 msgstr ""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Code"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Technical field used to adapt the interface to the payment type selected."
 msgstr ""
 
+#: ../../accounting/payables/pay/check.rst:0
+msgid "Check Number"
+msgstr ""
+
 #: ../../accounting/payables/pay/check.rst:0
 msgid "The selected journal is configured to print check numbers. If your pre-printed check paper already has numbers or if the current numbering is wrong, you can change it in the journal configuration page."
 msgstr ""
@@ -7109,7 +7351,7 @@ msgid "**Default credit account**: Credit cards"
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:50
-msgid "Once it's done, don't forget to set the \"Credit cards\" account as \"Allow Reconciliation\"."
+msgid "The account type should be \"Credit Card\". Once it's done, don't forget to set the \"Credit cards\" account as \"Allow Reconciliation\"."
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:57
@@ -7189,7 +7431,7 @@ msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:167
 #: ../../accounting/receivables/customer_payments/recording.rst:128
-msgid ":doc:`paypal`"
+msgid ":doc:`../../bank/feeds/paypal`"
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:169
@@ -7357,168 +7599,6 @@ msgstr ""
 msgid "You can get the DSO of your company from the Executive Summary report under Reporting (check the KPI average debtors days)."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/paypal.rst:3
-msgid "How to accept paypal payments on invoices?"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:5
-msgid "The \"Paypal Payment Acquirer\" module allows you to accept payments via paypal, for your sales orders, invoices, or online orders. As paypal accepts payments through credit cards (VISA, Mastercard, …), you will be able to process most payment methods."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:10
-msgid "Paypal support two modes:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:12
-msgid "Paypal Merchant Account: the user is redirected to paypal to do the payment (either with a credit card or a paypal account)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:15
-msgid "PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to paypal and the payment can be done in the background. This method is mostly used for subscription businesses where you need to charge your customers periodically."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:20
-msgid "As of today, Odoo only support the normal Paypal Merchant Account."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:26
-msgid "Install the \"PayPal Payment Acquirer\" module"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:28
-msgid "Start by installing the **PayPal Payment Acquirer** module."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:30
-msgid "Once the module is installed, you should see a new payment acquirer in the Setting application, menu \"Payment Acquirers\"."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:36
-msgid "By default, Paypal is configured to work in a test environment, out-of-the-box. It means you can already test the full order to payment flow with the paypal sandbox, without having to configure the next steps."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:42
-msgid "Creating and configuring a PayPal merchant account"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:45
-msgid "Create a basic Paypal account"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:47
-msgid "Existing or newly created Personal Paypal account can be used."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:49
-msgid "Or upgrade your account to Business account (merchant) if needed"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:55
-msgid "Paypal Account Summary page"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:58
-msgid "Paypal Configuration"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:60
-msgid "Access \"Seller preferences\" menu from `PayPal website <https://www.paypal.com/myaccount/home>`__"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:66
-msgid "Access \"Website preferences\" and configure Auto Return (Payment Data Transfer must be left to Off)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:69
-msgid "**Database name**: yourcompany"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:70
-#: ../../accounting/receivables/customer_payments/paypal.rst:88
-msgid "**Website URL**: https://yourcompany.odoo.com/"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:71
-msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:76
-msgid "These settings will redirect your buyer to your web confirmation page."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:80
-msgid "Access and edit Instant payment notifications settings - IPN"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:85
-msgid "Example"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:87
-msgid "**Database name**: \"yourcompany\""
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:89
-msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:91
-msgid "Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you use the odoo.com domain, we advise you to use HTTPS."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:94
-msgid "Set the encoding to UTF-8 from the menu :menuselection:`Settings --> Language Encoding --> More Options --> More selling tools`"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:103
-msgid "Record your Merchant Paypal ID (personal or business account both will have it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> Account Options`."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:111
-msgid "If you want your customers to be able to pay through Paypal while not having a Paypal account- following setting \"Paypal Account Optional\" needs to be set to **ON**. All users will be able to choose Credit/debit card payment option - Paypal account not required."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:120
-msgid "Setup your Paypal Payment Acquirer account credentials in Odoo"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:122
-msgid ":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:124
-msgid "**Paypal Email ID**: your paypal account email address"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:126
-msgid "**Paypal Merchant ID**: ID retrieved at previous step"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:136
-msgid "If your eCommerce customer gets this Error Message after completing Paypal payment instead of being redirected to your database:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:142
-msgid "Verify the settings you have `configured in Paypal <WebsitePreferences_>`_:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:144
-msgid "Auto Return should be on (the value can be quite generic, like <odoo_instance>/shop/confirmation; the correct URL will be set for each transaction)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:148
-msgid "Payment Data Transfer should be off"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:150
-msgid "On-premise databases must be accessible through classic HTTP/HTTPS ports (80/443) for Paypal to work correctly, usually through a reverse proxy. Contact your integrating partner if you are unsure this is the case. Databases hosted on odoo.com are already configured correctly."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/paypal.rst:157
-#: ../../accounting/receivables/customer_payments/recording.rst:127
-msgid ":doc:`credit_cards`"
-msgstr ""
-
 #: ../../accounting/receivables/customer_payments/recording.rst:3
 msgid "What are the different ways to record a payment?"
 msgstr ""
@@ -7619,6 +7699,10 @@ msgstr ""
 msgid "When making an internal transfer from one bank account to another, select the bank you want to apply the transfer from in the dashboard, and in the register payments screen, you select the transfer to account. Do not go through this process again in the other bank account or else you will end up with two journal entries for the same transaction."
 msgstr ""
 
+#: ../../accounting/receivables/customer_payments/recording.rst:127
+msgid ":doc:`credit_cards`"
+msgstr ""
+
 #: ../../accounting/receivables/getting_paid.rst:3
 msgid "How to get paid?"
 msgstr ""

locale/sources/applications.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/sources/crm.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,35 +25,71 @@ msgid "Calendar"
 msgstr ""
 
 #: ../../crm/calendar/google_calendar_credentials.rst:3
-msgid "How to synchronize your calendar with Google Calendar"
+msgid "How to synchronize your Odoo Calendar with Google Calendar"
 msgstr ""
 
 #: ../../crm/calendar/google_calendar_credentials.rst:5
-msgid "Connect on your google account and go to `https://console.developers.google.com/ <https://console.developers.google.com/>`_."
+msgid "Odoo is perfectly integrated with Google Calendar so that you can see & manage your meetings from both platforms (updates go through both directions)."
 msgstr ""
 
-#: ../../crm/calendar/google_calendar_credentials.rst:7
-msgid "Click on **Create a project...** and enter a project name and change your id if you want. Don't forget to accept the Terms of Services"
+#: ../../crm/calendar/google_calendar_credentials.rst:10
+msgid "Setup in Google"
 msgstr ""
 
-#: ../../crm/calendar/google_calendar_credentials.rst:13
-msgid "In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on 'Calendar API'. Activate the Calendar API by clicking on the blue button 'Enable API'. When it's done, the Calendar API overview will be available"
+#: ../../crm/calendar/google_calendar_credentials.rst:11
+msgid "Go to `Google APIs platform <https://console.developers.google.com>`__ to generate Google Calendar API credentials. Log in with your Google account."
 msgstr ""
 
-#: ../../crm/calendar/google_calendar_credentials.rst:26
-msgid "In the menu on left side, select the sub menu 'Credentials' (from menu APIs and auth) and click on button 'Create new Client ID'"
+#: ../../crm/calendar/google_calendar_credentials.rst:14
+msgid "Choose *Calendar API*."
 msgstr ""
 
-#: ../../crm/calendar/google_calendar_credentials.rst:32
-msgid "Check that the Application type is set on 'Web Application', then click on 'Configure consent screen'. Specify an email address and a product name, then save."
+#: ../../crm/calendar/google_calendar_credentials.rst:19
+msgid "Create a new project and give it a name (e.g. Odoo). This project is needed to store your API credentials."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:25
+msgid "Enable the API."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:30
+msgid "Create credentials to use in Odoo."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:35
+msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data."
 msgstr ""
 
 #: ../../crm/calendar/google_calendar_credentials.rst:41
-msgid "You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field \"Authorized redirect URI\" and set as value (your own domain followed by '/google_account/authentication'): ==> http://mydomain.odoo.com/google_account/authentication You can now click on 'Create Client ID'"
+msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'."
 msgstr ""
 
-#: ../../crm/calendar/google_calendar_credentials.rst:48
-msgid "Once done, you will have the both informations (Client ID and Client Secret) that you need to insert in the 2 fields below!"
+#: ../../crm/calendar/google_calendar_credentials.rst:50
+msgid "Go through the Consent Screen step by entering a product name (e.g. Odoo). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:55
+msgid "Finally you are provided with your **Client ID**. Go to *Credentials* to get the **Client secret** as well. You will need both of them in Odoo."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:62
+msgid "Setup in Odoo"
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:64
+msgid "Install **Google Calendar** app."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:69
+msgid "Go to :menuselection:`Settings --> General Settings` and enter your credentials in Google Calendar option."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:75
+msgid "The setup is now ready. Open your Odoo Calendar and sync with Google. The first time you do it you are redirected to Google to authorize the connection. Once back in Odoo, click the sync button again. You can click it whenever you want to synchronize your calendar."
+msgstr ""
+
+#: ../../crm/calendar/google_calendar_credentials.rst:83
+msgid "As of now you no longer have excuses to miss a meeting!"
 msgstr ""
 
 #: ../../crm/leads.rst:3
@@ -230,22 +266,22 @@ msgid "Go to :menuselection:`Sales --> Leads` and click the **Create** button."
 msgstr ""
 
 #: ../../crm/leads/generate/manual.rst:33
-msgid "From the contact form, provide all the details in your possession (contact name, email, phone, address, etc.) as well as some additional information in the **Internal notes** field. You can also link the lead to an existing company by editing the**Customer** field. Click on save and the contact will be visible as a lead in your pipeline ."
+msgid "From the contact form, provide all the details in your possession (contact name, email, phone, address, etc.) as well as some additional information in the **Internal notes** field."
 msgstr ""
 
-#: ../../crm/leads/generate/manual.rst:41
+#: ../../crm/leads/generate/manual.rst:39
 msgid "your lead can be directly handed over to specific sales team and salesperson by clicking on **Convert to Opportunity** on the upper left corner of the screen."
 msgstr ""
 
-#: ../../crm/leads/generate/manual.rst:45
+#: ../../crm/leads/generate/manual.rst:43
 msgid "Create a new opportunity"
 msgstr ""
 
-#: ../../crm/leads/generate/manual.rst:47
+#: ../../crm/leads/generate/manual.rst:45
 msgid "You can also directly add a contact into a specific sales team without having to convert the lead first. On the Sales module, go to your dashboard and click on the **Pipeline** button of the desired sales team. If you don't have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`. Then, click on **Create** and fill in the contact details as shown here above. By default, the newly created opportunity will appear on the first stage of your sales pipeline."
 msgstr ""
 
-#: ../../crm/leads/generate/manual.rst:55
+#: ../../crm/leads/generate/manual.rst:53
 msgid "Another way to create an opportunity is by adding it directly on a specific stage. For example, if you have have spoken to Mr. Smith at a meeting and you want to send him a quotation right away, you can add his contact details on the fly directly into the **Proposition** stage. From the Kanban view of your sales team, just click on the **+** icon at the right of your stage to create the contact. The new opportunity will then pop up into the corresponding stage and you can then fill in the contact details by clicking on it."
 msgstr ""
 

locale/sources/db_management.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -313,7 +313,7 @@ msgid "Uninstalling Apps"
 msgstr ""
 
 #: ../../db_management/documentation.rst:73
-msgid "Make sure you first test what you are about to do on a :ref:`duplicate <duplicate>` of your database before making any changes (*especially* installing/uninstalling apps)."
+msgid "Make sure you first test what you are about to do on a :ref:`duplicate <duplicate_online>` of your database before making any changes (*especially* installing/uninstalling apps)."
 msgstr ""
 
 #: ../../db_management/documentation.rst:77

locale/sources/discuss.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgid "Discuss"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:3
-msgid "How to use my own email servers to send and receive messages in Odoo"
+msgid "How to use my own email servers to send and receive email in Odoo"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:6
@@ -29,95 +29,155 @@ msgid "When is it needed"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:7
-msgid "You need it if you use Odoo Community or Enterprise."
+msgid "Using your own email servers is required to send and receive messages in Odoo Community or Enterprise. Odoo Online embeds an out-of-box email solution that works straight away. However you can still use your own email servers with the online edition. Some insights are provided here below."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:10
-msgid "What if I use Odoo Online"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:11
-msgid "You are done! Odoo Online comes up with an embedded and ready-to-use email server (*@yourcompany.odoo.com*). We recommend to keep this default setting as is as it is really convenient."
+#: ../../discuss/email_servers.rst:14
+msgid "How to set it up"
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
-msgid "Indeed, while it is branded by Odoo, the visible source of any message sent from Odoo will be your personal email address (your Odoo login). Your contacts will therefore trust your messages."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:20
-msgid "How does it work when a contact replies to an email sent from Odoo"
+msgid "As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers* (watch out: this checkbox only shows up after Odoo 10). Then, go through the following steps."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:21
-msgid "Default reply-to is a generic address used to automatically route any incoming email to the discussion thread of the origin business object (opportunity, order, task, etc.) and to the inbox of all its followers. By default this address is \"catchall@\" but it can be changed. Thanks to it, you get a perfect message thread in Odoo and you don't pollute your external email box with Odoo-related topics."
+msgid "Office 365 doesn't allow external hosts like Odoo. Consequently you can't use Office 365 email servers to send or receive messages in Odoo."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:29
-msgid "How to use my own email servers"
-msgstr ""
-
-#: ../../discuss/email_servers.rst:30
-msgid "You need to be a system admin to set this up. Go to :menuselection:`Settings --> General Settings` and check *External Email Servers* (watch out: this checkbox only shows up after Odoo 10). Then, go through the following steps."
-msgstr ""
-
-#: ../../discuss/email_servers.rst:36
+#: ../../discuss/email_servers.rst:26
 msgid "Set an outgoing email server for outbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:37
+#: ../../discuss/email_servers.rst:27
 msgid "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, etc.) as well as your admin credentials. Once all the information has been filled out, click on *Test Connection*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:45
+#: ../../discuss/email_servers.rst:35
 msgid "Set an incoming email server for inbound messages"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:46
+#: ../../discuss/email_servers.rst:36
 msgid "Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:53
+#: ../../discuss/email_servers.rst:43
 msgid "By default inbound messages are fetched every 5 minutes. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:59
+#: ../../discuss/email_servers.rst:49
 msgid "Set the domain name"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:60
+#: ../../discuss/email_servers.rst:50
 msgid "Enter the domain name of your email servers (e.g. mycompany.com) in General Settings."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:67
+#: ../../discuss/email_servers.rst:57
 msgid "Create a catchall address"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:68
+#: ../../discuss/email_servers.rst:58
+msgid "When a contact replies to an email sent from Odoo, the *reply-to* address is a generic address used to route the reply to the right discussion thread in Odoo (opportunity, order, task, etc.) and to the inbox of all its followers. By default this address is \"catchall@\" but it can be changed."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:63
 msgid "Create a catchall address in your email server settings. We advise you to use \"catchall@\" so that everything works out straight away. If you want to use another alias, you have extra steps in Odoo:"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:72
+#: ../../discuss/email_servers.rst:67
 msgid "Activate the developer mode from your Settings Dashboard."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:77
+#: ../../discuss/email_servers.rst:72
 msgid "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and enter your custom catchall alias in *mail.catchall.alias*."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:84
+#: ../../discuss/email_servers.rst:79
 msgid "You can edit the email alias used for bounced messages the same way."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:87
-msgid "How to perfectly combine Odoo Discuss and my traditional email tool"
+#: ../../discuss/email_servers.rst:82
+msgid "How to use my own email servers with Odoo Online"
 msgstr ""
 
-#: ../../discuss/email_servers.rst:88
-msgid "Odoo Discuss is a perfect tool to send and read messages related to business objects. But it doesn't aim to replace a full-featured email software (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of both systems without mingling them: What is related to Odoo business objects or applications goes into Odoo; What is not stays into your external email boxes."
+#: ../../discuss/email_servers.rst:83
+msgid "Odoo Online comes up with an embedded and ready-to-use email server (*@yourcompany.odoo.com*). We recommend to keep this default setting as it is really convenient. Indeed, while it is Odoo-labelled, the visible source of any message sent from Odoo will be your personal email address (your Odoo login). Your contacts will therefore trust your messages."
 msgstr ""
 
-#: ../../discuss/email_servers.rst:95
-msgid "To do so, create specific email aliases to use in Odoo (to generate leads or opportunities, helpdesk tickets, etc.). If you take an email alias already used for messaging outside of Odoo, incoming messages will land into both systems. This will negatively impact your productivity when it comes to process them."
+#: ../../discuss/email_servers.rst:90
+msgid "You can still use your own email servers if you want your contacts to see your historic email address when they reply to your messages or if you want to manage the reputation of your email servers yourself."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:94
+msgid "There are 2 methods:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:96
+msgid "[Recommended] **Use a catchall redirection** (your server -> Odoo server) to receive emails in Odoo in real time thanks to the Odoo email server. Create a catchall address in your email server settings. Then apply following redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. That's it you're ready to go!"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:102
+msgid "**Use a catchall mailbox** to exclusively use your own email server. That way you can also manage your email server reputation (blacklisting, etc). However, incoming messages are fetched from the email server thanks to a cron running every hour. This is the shortest time lap for crons in Online instances. If you opt for this solution, simply follow the procedure of above section."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:111
+msgid "How to be SPF-compliant when using external email servers in Odoo"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:112
+msgid "Sender Policy Framework (SPF) is an email-validation system that checks that incoming mail from a domain comes from a host authorized by that domain's administrator. Such a security system is used in most email servers. If you don't comply with it, your emails sent from Odoo will be likely flagged as spam."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:118
+msgid "To be SPF-compliant, you need to authorize Odoo as a sending host in your domain name settings:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:121
+msgid "Sign in to your domain’s account at your domain host."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:122
+msgid "Locate the page for updating your domain’s DNS records."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:123
+msgid "If no TXT record is set, create one with following definition: v=spf1 include:_spf.odoo.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:125
+msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:127
+msgid "e.g. for a Gmail server it should be:"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:129
+msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:131
+msgid "Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to create or modify TXT records in your own domain registrar."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:134
+msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:137
+msgid "Adding more than one SPF record for a domain can cause problems with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:142
+msgid "How to choose between Odoo and my traditional email box"
+msgstr ""
+
+#: ../../discuss/email_servers.rst:143
+msgid "Odoo Discuss is a perfect tool to send and read messages related to business documents. However it doesn't aim to replace a full-featured email solution (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of both systems without mingling them: What is related to Odoo business objects or applications goes into Odoo; What is not can be managed into your external email box."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:150
+msgid "To do so, create specific email aliases to use in Odoo (to generate leads or opportunities, helpdesk tickets, etc.). If you take an email alias already used for messaging outside of Odoo, incoming messages will land into both systems. This will negatively impact your productivity."
 msgstr ""
 
 #: ../../discuss/mail_twitter.rst:3

locale/sources/ecommerce.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,94 +165,94 @@ msgid "How to manage product variants"
 msgstr ""
 
 #: ../../ecommerce/managing_products/variants.rst:5
-msgid "Product variants are used to offer variations of the same product to your customers on the products page. For example, the customer chooses a T-shirt and then selects its size and color."
-msgstr ""
-
-#: ../../ecommerce/managing_products/variants.rst:13
-msgid "How to create attributes & variants"
+msgid "Product variants are used to offer variations of the same product to your customers on the products page. For example, the customer chooses a T-shirt and then selects its size and color.  In the example below, the customer chooses a phone, and then selects the memory; color and Wi-Fi band from the available options."
 msgstr ""
 
 #: ../../ecommerce/managing_products/variants.rst:15
+msgid "How to create attributes & variants"
+msgstr ""
+
+#: ../../ecommerce/managing_products/variants.rst:17
 msgid "Turn on *Products can have several attributes, defining variants (Example: size, color,...)* in :menuselection:`Sales --> Settings`."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:18
+#: ../../ecommerce/managing_products/variants.rst:20
 msgid "Select a product from the Products list, go to the *Variants* tab."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:20
+#: ../../ecommerce/managing_products/variants.rst:22
 msgid "Add as many attributes as you need from 3 different types: radio buttons, drop-down menu or color buttons. You get several variants as soon as there are 2 values for 1 attribute."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:28
+#: ../../ecommerce/managing_products/variants.rst:30
 msgid "How to edit variants"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:30
+#: ../../ecommerce/managing_products/variants.rst:32
 msgid "See all the variants from the product template detail form."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:38
+#: ../../ecommerce/managing_products/variants.rst:40
 msgid "You can edit following data:"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:40
+#: ../../ecommerce/managing_products/variants.rst:42
 msgid "Picture (will update in real time on the website),"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:41
+#: ../../ecommerce/managing_products/variants.rst:43
 msgid "Barcode,"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:42
+#: ../../ecommerce/managing_products/variants.rst:44
 msgid "Internal Reference (SKU #),"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:43
+#: ../../ecommerce/managing_products/variants.rst:45
 msgid "Volume,"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:44
+#: ../../ecommerce/managing_products/variants.rst:46
 msgid "Weight,"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:45
+#: ../../ecommerce/managing_products/variants.rst:47
 msgid "Active (available in quotes & website)."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:48
+#: ../../ecommerce/managing_products/variants.rst:50
 msgid "Both the Barcode and the Internal Reference are variant-specific. You need to populate them once the variants generated."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:52
+#: ../../ecommerce/managing_products/variants.rst:54
 msgid "See and edit all the variants from :menuselection:`Sales --> Sales --> Product Variants` as well. This might be quicker if you manage lots of variants."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:56
+#: ../../ecommerce/managing_products/variants.rst:58
 msgid "How to set specific prices per variant"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:58
+#: ../../ecommerce/managing_products/variants.rst:60
 msgid "You can also set a specific public price per variant by clicking *Variant Prices* in the product detail form (action in top-left corner)."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:64
+#: ../../ecommerce/managing_products/variants.rst:66
 msgid "The Price Extra is added to the product price whenever the corresponding attribute value is selected."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:74
+#: ../../ecommerce/managing_products/variants.rst:76
 msgid "Pricelist formulas let you set advanced price computation methods for product variants. See :doc:`../maximizing_revenue/pricing`."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:78
+#: ../../ecommerce/managing_products/variants.rst:80
 msgid "How to disable/archive variants"
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:80
+#: ../../ecommerce/managing_products/variants.rst:82
 msgid "You can disable/archive specific variants so that they are no longer available in quotes & website (not existing in your stock, deprecated, etc.). Simply uncheck *Active* in their detail form."
 msgstr ""
 
-#: ../../ecommerce/managing_products/variants.rst:86
+#: ../../ecommerce/managing_products/variants.rst:88
 msgid "To retrieve such archived items, hit *Archived* on searching the variants list. You can reactivate them the same way."
 msgstr ""
 
@@ -534,19 +534,19 @@ msgid "Launch my website"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience.rst:3
-msgid "Improve shopper experience"
+msgid "Get paid"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:3
-msgid "How to set up payment methods"
+msgid "How to get paid with payment acquirers"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:5
-msgid "To collect payments, you can either request your customers to process it manually (e.g. wire transfer) or redirect them to payment acquirers. The payment process described hereunder is common to both eCommerce and online quotations."
+msgid "Odoo embeds several payment methods to get paid on eCommerce, Sales and Invoicing apps."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:10
-msgid "Payment methods"
+msgid "What are the payment methods available"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:13
@@ -554,323 +554,417 @@ msgid "Wire transfer"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:15
-msgid "Wire Transfer is the default payment method available. The aim is providing your customers with your bank details so that they can pay via their bank. This is very easy to start with but slow and inefficient process-wise. Opt for online acquirers as soon as you can!"
+msgid "Wire Transfer is the default payment method available. The aim is providing your customers with your bank details so they can pay on their own via their bank. This is very easy to start with but slow and inefficient process-wise. Opt for online acquirers as soon as you can!"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:21
-msgid "For B2B users: you can create new manually-processed payment methods (check, purchase order, etc.) by renaming 'Wire Transfer' or duplicating it."
+msgid "Payment acquirers"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:25
-msgid "Online payment acquirers"
+#: ../../ecommerce/shopper_experience/payment.rst:23
+msgid "Redirect your customers to payment platforms to collect money effortless and track the payment status (call-back). Odoo supports more and more platforms over time:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:27
-msgid "Redirect your customers to payment acquirer platforms to collect money effortless. Odoo supports more and more platforms over time: Paypal, Ingenico, Authorize.net, etc. Once the payment accepted, orders are confirmed in Odoo so that the delivery & invoicing processes are triggered automatically."
+msgid "`Paypal <paypal.html>`__"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:28
+msgid "Ingenico"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:29
+msgid "Authorize.net"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:30
+msgid "Adyen"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:31
+msgid "Buckaroo"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:32
+msgid "PayUmoney"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:33
-msgid "Custom (advanced)"
+msgid "Sips"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:35
-msgid "Can be used to request payments to any payment acquirer not listed in Odoo."
+#: ../../ecommerce/shopper_experience/payment.rst:34
+msgid "Stripe"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:38
-msgid "Edit a payment method"
+msgid "How to go live"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:40
-msgid "To make payment methods intuitive for your customers feel free to customize them by editing:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:42
-msgid "the name,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:44
-msgid "the picture,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:46
-msgid "the notification messages (thank you & next step, error, cancellation)."
+msgid "Once the payment method ready, make it visible in the payment interface and activate the **Production** mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:48
-msgid "Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers` to do so."
+msgid "How to let customers save and reuse credit cards"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:51
-msgid "Generic setup"
+#: ../../ecommerce/shopper_experience/payment.rst:49
+msgid "To ease the payment of returning customers, you can let them save and reuse a credit card if they want to. If so, a payment token will be saved in Odoo. This option is available with Ingenico and Authorize.net."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:53
-msgid "Review the elements here above."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:55
-msgid "Enter your credentials (online acquirers only)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:57
-msgid "Choose your order confirmation preference (see below)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:59
-msgid "Publish the payment method."
+#: ../../ecommerce/shopper_experience/payment.rst:54
+#: ../../ecommerce/shopper_experience/payment.rst:68
+msgid "You can turn this on from the acquirer configuration form."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:61
-msgid "Test the payment flow in *Test* mode (default mode)."
+msgid "How to debit credit cards to pay subscriptions"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:63
-msgid "Switch to *Production* mode."
+#: ../../ecommerce/shopper_experience/payment.rst:62
+msgid "`Odoo Subscription <https://www.odoo.com/page/subscriptions>`__ allows to bill services automatically on a recurring basis. Along with it, you can have an automatic debit of the customer's credit card."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:65
-msgid "Se your default payment acquirer in :menuselection:`Accounting --> Configuration --> Settings`. It will be auto-selected for your customers when they enter the payment screen."
+#: ../../ecommerce/shopper_experience/payment.rst:66
+msgid "This option is available with Ingenico and Authorize.net."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:69
-msgid "Rely on the documentation related to your payment acquirer to go through step 2, 5 and 6. Some acquirers provides you with specific credentials for test and production modes (Paypal). Others let you switch mode in their setup interface (Authorize.net)."
+#: ../../ecommerce/shopper_experience/payment.rst:73
+msgid "That way a payment token will be recorded when the customer goes for the subscription and an automatic debit will occur whenever an invoice is issued from the subscription."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:74
-msgid "With Ingenico and Authorize.net, you can let your customers save and reuse a payment card to accelerate the process on next checkouts. See *Store Card Data* in Configuration tab."
+#: ../../ecommerce/shopper_experience/payment.rst:79
+msgid "How to use other acquirers (advanced)"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:78
-msgid "Payment flow"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:80
-msgid "When choosing the payment method, the customer is taken to the payment acquirer interface to process the payment."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:83
-msgid "Once done he is taken back to Odoo's confirmation page. The transaction status shows up:"
+#: ../../ecommerce/shopper_experience/payment.rst:81
+msgid "Odoo can submit single payment requests and redirect to any payment acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction status. So you will confirm orders manually once you get paid."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:85
-msgid "*Pending*: the order will be confirmed as soon as you authorize the transaction in the acquirer interface."
+msgid "How to:"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:87
-msgid "*Confirmed*: the payment has been authorized automatically."
+msgid "Switch to developer mode."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:89
-msgid "A confirmation email is sent to the customer with a copy of the order in pdf. It shows the payment status."
+msgid "Take the **Custom** payment method."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:91
-msgid "Launch the delivery and invoicing from:"
+msgid "Set up the payment form (S2S Form Template) as instructed by your payment acquirer. You can start from *default_acquirer_button* that you can duplicate."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:93
-msgid "eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`,"
+#: ../../ecommerce/shopper_experience/payment.rst:96
+msgid "Other configurations"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:95
-msgid "online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales Orders`."
+#: ../../ecommerce/shopper_experience/payment.rst:98
+msgid "Odoo can also be used for more advanced payment processes like installment plans (e.g. `Paypal Installment Plans <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/installment_buttons>`__)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/payment.rst:97
-msgid "For internal tracking purposes, a link to the transaction status is provided in the sales order."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:100
-msgid "If the customer cancels the payment while on the payment acquirer form, it is taken back to the store page (or online quotation) in order to reprocess the order. The payment is marked as *Cancelled* in Odoo."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:105
-msgid "You can edit the confirmation email template from :menuselection:`Website Admin --> Configuration --> Settings`."
+#: ../../ecommerce/shopper_experience/payment.rst:102
+msgid "Such a customization service is made on-demand by our technical experts based on your own requirements. A business advisor can reach you out for such matter. `Contact us. <https://www.odoo.com/page/contactus>`__"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/payment.rst:109
-msgid "Order confirmation preferences"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:111
-msgid "There are 4 different behaviors available for any payment acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:114
-msgid "No automatic confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:116
-msgid "This is the default mode for *Wire Transfer*. It means Odoo does not confirm orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid Order*). Once you get the payment, you are expected to confirm the order manually to pursue the process (delivery, invoicing)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:121
-msgid "Authorize the amount and confirm the SO on acquirer confirmation (capture manually)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:123
-msgid "Odoo confirms the order as soon as the payment success notification comes in. To get the money however, you need to capture it from your payment transaction. In lots of countries you are indeed requested to deliver your goods before capturing the amount."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:128
-msgid "Authorize & capture the amount and confirm the SO on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:130
-msgid "This is the default mode for payment acquirers. The amount is captured automatically."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:133
-msgid "For B2B: if you use a manual payment method like *Wire Transfer* and don't expect any upfront payment to launch the delivery, switch to this mode as well."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:137
-msgid "Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:139
-msgid "If you invoice upfront and not at the delivery, switch to this last mode to automate everything. You are requested to select a Payment Journal to record such payments (see :doc:`../../accounting/receivables/customer_payments/credit_cards`)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:144
-msgid "Custom payment acquirers (advanced)"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:146
-msgid "Odoo can submit payment requests and redirect to any payment acquirer. In such a case, you need to confirm the sale manually in Odoo once you get paid because Odoo cannot read any payment status sent by the acquirer."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:150
-msgid "To configure this:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:152
-msgid "switch to developer mode,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:154
-msgid "edit the *Custom* payment method,"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:156
-msgid "set up the payment form (S2S Form Template) as instructed by your payment acquirer. You can start from *default_acquirer_button* that you can duplicate."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:160
-msgid "Recurring payments & Installment plans"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:162
-msgid "The Ingenico integration allows you to process and manage recurring payments from Odoo Subscriptions app out-of-the-box (more information coming soon)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:165
-msgid "With some customization, Odoo can also trigger installment plans if this is permitted by your payment acquirer’s API:"
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:168
-msgid "e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/installment_buttons)."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:170
-msgid "Such a service is made on-demand by our technical experts based on your own requirements. Ask our business advisors at info@odoo.com."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/payment.rst:175
 msgid ":doc:`paypal`"
 msgstr ""
 
+#: ../../ecommerce/shopper_experience/payment.rst:110
+msgid ":doc:`wire_transfer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment.rst:111
+#: ../../ecommerce/shopper_experience/paypal.rst:155
+msgid ":doc:`payment_acquirer`"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3
+msgid "How to manage orders paid with payment acquirers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5
+msgid "Odoo confirms orders automatically as soon as the payment is authorized by a payment acquirer. This triggers the delivery. If you invoice based on ordered quantities, you are also requested to invoice the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12
+msgid "What are the payment status"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13
+msgid "At anytime, the salesman can check the transaction status from the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18
+msgid "*Draft*: transaction under processing."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20
+msgid "*Pending*: the payment acquirer keeps the transaction on hold and you need to authorize it from the acquirer interface."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23
+msgid "*Authorized*: the payment has been authorized but not yet captured. In Odoo, the order is already confirmed. Once the delivery done, you can capture the amount from the acquirer interface (or from Odoo if you use Authorize.net)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28
+msgid "*Done*: the payment is authorized and captured. The order has been confirmed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30
+msgid "*Error*: an error has occured during the transaction. The customer needs to retry the payment. The order is still in draft."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34
+msgid "*Cancelled*: when the customer cancels the payment in the payment acquirer form. They are taken back to Odoo in order to modify the order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37
+msgid "Specific messages are provided to your customers for every payment status, when they are redirected to Odoo after the transaction. To edit such messages, go to the *Messages* tab of the payment method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44
+msgid "Auto-validate invoices at order"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46
+msgid "When the order is confirmed you can also have an invoice automatically issued and paid. This fully-automated made for businesses that invoice orders straight on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53
+msgid "If you choose this mode you are requested to select a payment journal in order to record payments in your books. This payment is automatically reconcilied with the invoice, marking it as paid. Select your **bank account** if you get paid immediately on your bank account. If you don't you can create a specific journal for the payment acquirer (type = Bank). That way, you can track online payments in an intermediary account of your books until you get paid into your bank account (see `How to register credit card payments <../../accounting/receivables/customer_payments/credit_cards.html>`__)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64
+msgid "Capture the payment after the delivery"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65
+msgid "With this mode, the order is confirmed but the amount is kept on hold. Once the delivery processed, you can capture the payment from Odoo. This mode is only available with Authorize.net."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72
+msgid "To capture the payment, open the transaction from the order. Then click *Capture Transaction*."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78
+msgid "With other payment acquirers, you can manage the capture in their own interfaces, not from Odoo."
+msgstr ""
+
 #: ../../ecommerce/shopper_experience/paypal.rst:3
-msgid "How to collect payments with Paypal"
+msgid "How to get paid with Paypal"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:5
-msgid "Paypal is the easiest payment method to configure. It is also the only one without any subscription free."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/paypal.rst:9
-msgid "Setup your Paypal account"
+msgid "Paypal is the easiest online payment method to configure. It is also the only one without any subscription fee. We definitely advise it to any starter."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:11
-msgid "1. Create a business account at Paypal.com (see: https://www.paypal.com/in/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-outside) or upgrade your account to Business account (merchant) if you have a basic account."
+msgid "Set up your Paypal account"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:15
-msgid "2. Log in to your account at Paypal.com and go to :menuselection:`My Account --> Profile --> My Selling Tools`. There click *PayPal button language encoding* under *More Selling Tools* section. Then, click *More Options* and replace the two default encoding formats by *UTF-8*."
+#: ../../ecommerce/shopper_experience/paypal.rst:13
+msgid "Create a `Paypal Business Account <https://www.paypal.com>`__ or upgrade your account to *Business account* if you have a basic account."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:20
-msgid "Open Paypal setup form in Odoo and enter your *Email ID*."
+#: ../../ecommerce/shopper_experience/paypal.rst:16
+msgid "Log in to `Paypal <https://www.paypal.com>`__ and open the settings of your **Profile**."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/paypal.rst:22
-msgid "4. The Paypal Merchant ID is not mandatory (extra verification level). It is provided in Paypal under :menuselection:`My Account --> Overview`."
+msgid "Now enter the menu **My selling tools**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:25
-msgid "5. Configure the IPN feedback (Paypal contacting your Odoo instance without needing the redirection). The setting can be found in :menuselection:`Profile --> My Selling Tools --> Instant payment notification`. Activate it and set it to <odoo_instance_url>/payment/paypal/ipn."
+#: ../../ecommerce/shopper_experience/paypal.rst:27
+msgid "Let's start with the **Website Preferences**."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:30
-msgid "6. To test the workflow, you can create sandbox accounts by logging in at https://developer.paypal.com/webapps/developer/applications/myapps with the same Paypal credentials. Two default sandbox accounts are automatically generated when you register to Paypal: one is a buyer, the  other is a shopper."
+#: ../../ecommerce/shopper_experience/paypal.rst:29
+msgid "Turn on **Auto Return** and enter the **Return URL**: <odoo_instance_url>/shop/confirmation. Verify that this address uses the correct protocol (HTTP/HTTPS)."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:35
-msgid "7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com (same password than real account) and apply the same format change."
+#: ../../ecommerce/shopper_experience/paypal.rst:36
+msgid "Turn on **Payment Data Transfer**. When saving, an **Identity Token** is generated. You will be later requested to enter it in Odoo."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:39
-msgid "To automatically redirect your customers when the payment is completed, go to your Website Preferences and turn *Auto Return* on. Set *Return URL* to <odoo_instance_url>/shop/confirmation. Verify that your *Notify URL* uses the correct protocol (HTTP/HTTPS)."
+#: ../../ecommerce/shopper_experience/paypal.rst:43
+msgid "Then, get back to your profile to activate the **Instant Payment Notification (IPN)** in *My selling tools*."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:44
-msgid "If you want your customers to pay without creating a Paypal account, *Paypal Account Optional* needs to be turned on."
+#: ../../ecommerce/shopper_experience/paypal.rst:46
+msgid "Enter the **Notification URL**: <odoo_instance_url>/payment/paypal/ipn"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:48
+#: ../../ecommerce/shopper_experience/paypal.rst:51
+msgid "Now you must change the encoding format of the payment request sent by Odoo to Paypal. To do so, get back to *My selling tools* and click **PayPal button language encoding** in *More Selling Tools* section."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:58
+msgid "Then, click *More Options* and set the two default encoding formats as **UTF-8**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:66
+msgid "If you want your customers to pay without creating a Paypal account, **Paypal Account Optional** needs to be turned on."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:74
+msgid "Set up Paypal's payment method in Odoo"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:75
+msgid "Open Paypal setup form in :menuselection:`Website or Sales or Accounting --> Settings --> Payment Acquirers+`. Enter both your **Email ID** and your **Merchant ID** and check **Use IPN**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:82
+msgid "They are both provided in your Paypal profile, under :menuselection:`My business info`."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:85
+msgid "Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so, open the *Settings* and activate the **Developer Mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:91
+msgid "Then, go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and create a parameter with following values:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:94
+msgid "Key: payment_paypal.pdt_token"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:95
+msgid "Value: your Paypal *Identity Token*"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:102
+msgid "Go live"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:103
+msgid "Your configuration is now ready! You can make Paypal visible on your merchant interface and activate the **Production mode**."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:112
 msgid "Transaction fees"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:50
+#: ../../ecommerce/shopper_experience/paypal.rst:114
 msgid "You can charge an extra to the customer to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra applied to the order amount."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/paypal.rst:53
-msgid "To activate this, go to the *Configuration* tab and check *Add Extra Fees*. Default fees are the ones charged by Paypal."
+#: ../../ecommerce/shopper_experience/paypal.rst:117
+msgid "To activate this, go to the *Configuration* tab of Paypal config form in Odoo and check *Add Extra Fees*. Default fees for US can be seen here below."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:123
+msgid "To apply the right fees for your country, please refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-fees>`__."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:128
+msgid "Test the payment flow"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:130
+msgid "You can test the entire payment flow thanks to Paypal Sandbox accounts."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:132
+msgid "Log in to `Paypal Developer Site <https://developer.paypal.com>`__ with your Paypal credentials. This will create two sandbox accounts:"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:136
+msgid "A business account (to use as merchant, e.g. pp.merch01-facilitator@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:137
+msgid "A default personal account (to use as shopper, e.g. pp.merch01-buyer@example.com)."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:139
+msgid "Log in to `Paypal Sandbox <https://www.sandbox.paypal.com>`__ with the merchant account and follow the same configuration instructions."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:142
+msgid "Enter your sandbox credentials in Odoo and make sure Paypal is still set on *Test* mode. Also, make sure the confirmation mode of Paypal is not *Authorize & capture the amount, confirm the SO and auto-validate the invoice on acquirer confirmation*. Otherwise a confirmed invoice will be automatically generated when the transaction is completed."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:150
+msgid "Run a test transaction from Odoo using the sandbox personal account."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/paypal.rst:154
+msgid ":doc:`payment`"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:3
-msgid "How customers can access their portal"
+msgid "How customers can access their customer account"
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:5
-msgid "It has never been so easy for your customers to access their documents through a portal. Forget endless signup forms, Odoo makes it as easy as ABC. With eCommerce and Online Quotation apps, your customers are requested to create a portal account (name, email, password only) from the very first order confirmation or online quotation email they get from you."
-msgstr ""
-
-#: ../../ecommerce/shopper_experience/portal.rst:12
-msgid "Sign up"
+msgid "It has never been so easy for your customers to access their customer account. Forget endless signup forms, Odoo makes it as easy as ABC. They are suggested to sign up (name, email, password) when the order is placed, and not before. Indeed, nothing is more annoying than going through a signup process before buying something."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:14
-msgid "When clicking the link in the email or when clicking *Sign up* in the checkout process, your customer is directed to the *Sign up* page."
+msgid "Sign up"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:21
-msgid "Customer account"
+#: ../../ecommerce/shopper_experience/portal.rst:16
+msgid "The invitation to sign up shows up when the customer wants to visualize the order from order confirmation email."
 msgstr ""
 
 #: ../../ecommerce/shopper_experience/portal.rst:23
-msgid "Once logged in the customer will access his account by clicking *My Account* in the login dropdown menu."
+msgid "Customer account"
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:29
-msgid "From the portal menu all the customer history can be reviewed. The main address (billing) can also be modified."
+#: ../../ecommerce/shopper_experience/portal.rst:25
+msgid "Once logged in the customer will access the account by clicking *My Account* in the login dropdown menu."
 msgstr ""
 
-#: ../../ecommerce/shopper_experience/portal.rst:36
-msgid "If a portal user is a contact of a company (*Company* field set in customer detail form), this last will see all the documents of the company and all its other contacts through the portal."
+#: ../../ecommerce/shopper_experience/portal.rst:31
+msgid "THere they find all their history. The main address (billing) can also be modified."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/portal.rst:37
+msgid "If the customer is set as a contact of a company in your address book, they will see all the documents whose the customer belongs to this company."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:3
+msgid "How to get paid with wire transfers"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:5
+msgid "**Wire Transfer** is the default payment method available. The aim is providing your customers with your bank details so they can pay on their own. This is very easy to start with but slow and inefficient process-wise. Opt for payment acquirers as soon as you can!"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:13
+msgid "How to provide customers with payment instructions"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:14
+msgid "Put your payment instructions in the **Thanks Message** of your payment method."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:19
+msgid "They will appear to the customers when they place an order."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:26
+msgid "How to manage an order once you get paid"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:28
+msgid "Whenever a customer pays by wire transfer, the order stays in an intermediary stage **Quotation Sent** (i.e. unpaid order). When you get paid, you confirm the order manually to launch the delivery."
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:35
+msgid "How to create other manual payment methods"
+msgstr ""
+
+#: ../../ecommerce/shopper_experience/wire_transfer.rst:37
+msgid "If you manage a B2B business, you can create other manually-processed payment methods like paying by check. To do so, just rename *Wire Transfer* or duplicate it."
 msgstr ""
 
 #: ../../ecommerce/taxes.rst:3

locale/sources/expense.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/sources/general.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-05-09 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgid "General"
 msgstr ""
 
 #: ../../general/auth.rst:3
-msgid "Authentification"
+msgid "Authentication"
 msgstr ""
 
 #: ../../general/auth/google.rst:3
@@ -65,310 +65,403 @@ msgid "Once done, you receive two information (your Client ID and Client Secret)
 msgstr ""
 
 #: ../../general/base_import.rst:3
-msgid "BASE IMPORT"
+msgid "Data Import"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:3
+msgid "How to adapt an import template"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:5
+msgid "Import templates are provided in the import tool of the most common data to import (contacts, products, bank statements, etc.). You can open them with any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, etc.)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:11
+msgid "How to customize the file"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:13
+msgid "Remove columns you don't need. We advise to not remove the *ID* one (see why here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:15
+#: ../../general/base_import/import_faq.rst:26
+msgid "Set a unique ID to every single record by dragging down the ID sequencing."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:20
+msgid "When you add a new column, Odoo might not be able to map it automatically if its label doesn't fit any field of the system. If so, find the corresponding field using the search."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:27
+msgid "Then, use the label you found in your import template in order to make it work straight away the very next time you try to import."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:31
+msgid "Why an “ID” column"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:33
+msgid "The **ID** (External ID) is an unique identifier for the line item. Feel free to use the one of your previous software to ease the transition to Odoo."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:36
+msgid "Setting an ID is not mandatory when importing but it helps in many cases:"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:38
+msgid "Update imports: you can import the same file several times without creating duplicates;"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:39
+msgid "Import relation fields (see here below)."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:42
+msgid "How to import relation fields"
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:44
+msgid "An Odoo object is always related to many other objects (e.g. a product is linked to product categories, attributes, vendors, etc.). To import those relations you need to import the records of the related object first from their own list menu."
+msgstr ""
+
+#: ../../general/base_import/adapt_template.rst:48
+msgid "You can do it using either the name of the related record or its ID. The ID is expected when two records have the same name. In such a case add \" / ID\" at the end of the column title (e.g. for product attributes: Product Attributes / Attribute / ID)."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:3
-msgid "Import CSV file to Odoo"
+msgid "How to import data into Odoo"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:8
-msgid "Frequently Asked Questions"
+#: ../../general/base_import/import_faq.rst:6
+msgid "How to start"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:12
-msgid "Need to import data from an other application?"
+#: ../../general/base_import/import_faq.rst:7
+msgid "You can import data on any Odoo's business object using either Excel (.xlsx) or CSV (.csv) formats: contacts, products, bank statements, journal entries and even orders!"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:14
-msgid "In order to re-create relationships between different records, you should use the unique identifier from the original application and map it to the **ID** (External ID) column in Odoo. When you import an other record that links to the first one, use **XXX/ID** (XXX/External ID) to the original unique identifier."
+#: ../../general/base_import/import_faq.rst:11
+msgid "Open the view of the object you want to populate and click *Import*."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:16
-msgid "The **ID** (External ID) will also be used to update the original import if you need to re-import modified data later, it's thus good practice to specify it whenever possible."
+msgid "There you are provided with templates you can easily populate with your own data. Such templates can be imported in one click; The data mapping is already done."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:21
-msgid "I cannot find the field I want to map my column to?"
+#: ../../general/base_import/import_faq.rst:22
+msgid "How to adapt the template"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:23
-msgid "Odoo try to find with some heuristic, based on the first ten lines of the files, the type of field for each columns inside your file. For example if you have a column only containing numbers, only the fields that are of type integer will be displayed for you to choose from. While this behaviour might be good and easy for most cases scenarios, it is also possible that it goes wrong sometimes or that you want to map your column to a field that is not proposed by default."
+#: ../../general/base_import/import_faq.rst:24
+msgid "Add, remove and sort columns to fit at best your data structure."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:25
-msgid "If that happens, you just have to check the **Show all fields for completion (advanced)** option, you will then be able to choose from the complete list of fields for each columns."
+msgid "We advise to not remove the **ID** one (see why in the next section)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:30
-msgid "Where can I change the date import format?"
+#: ../../general/base_import/import_faq.rst:31
+msgid "When you add a new column, Odoo might not be able to map it automatically if its label doesn't fit any field in Odoo. Don't worry! You can map new columns manually when you test the import. Search the list for the corresponding field."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:32
-msgid "Odoo can automatically detect if a column is a date and it will try to guess the date format from a set of most used date format. While this process can work for a lot of simple date format, some exotic date format will not be recognize and it is also possible to have some confusion (day and month inverted as example) as it is difficult to guess correctly which part is the day and which one is the month in a date like '01-03-2016'."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:34
-msgid "To view which date format Odoo has found from your file you can check the **Date Format** that is shown when clicking on **Options** under the file selector. If this format is incorrect you can change it to your liking using the *ISO 8601* to define the format."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:37
-msgid "If you are importing an excel (.xls, .xlsx) file, you can use date cells to store dates as the display of dates in excel is different from the way it is stored. That way you will be sure that the date format is correct in Odoo whatever your locale date format is."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:42
-msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
+#: ../../general/base_import/import_faq.rst:39
+msgid "Then, use this field's label in your file in order to make it work straight on the very next time."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:44
-msgid "Yes, we fully support numbers with parenthesis to represent negative sign as well as numbers with currency sign attached to them. Odoo also automatically detect which thousand/decimal separator you use (you can change those under **options**). If you use a currency symbol that is not known to Odoo, it might not be recognized as a number though and it will crash."
+msgid "How to import from another application"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:46
-msgid "Examples of supported numbers (using thirty-two thousands as an example):"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:48
-msgid "32.000,00"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:49
-msgid "32000,00"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:50
-msgid "32,000.00"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:51
-msgid "-32000.00"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:52
-msgid "(32000.00)"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:53
-msgid "$ 32.000,00"
+msgid "In order to re-create relationships between different records, you should use the unique identifier from the original application and map it to the **ID** (External ID) column in Odoo. When you import another record that links to the first one, use **XXX/ID** (XXX/External ID) to the original unique identifier. You can also find this record using its name but you will be stuck if at least 2 records have the same name."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:54
-msgid "(32000.00 €)"
+msgid "The **ID** will also be used to update the original import if you need to re-import modified data later, it's thus good practice to specify it whenever possible."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:56
-msgid "Example that will not work:"
+#: ../../general/base_import/import_faq.rst:60
+msgid "I cannot find the field I want to map my column to"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:58
-msgid "ABC 32.000,00"
+#: ../../general/base_import/import_faq.rst:62
+msgid "Odoo tries to find with some heuristic, based on the first ten lines of the files, the type of field for each column inside your file. For example if you have a column only containing numbers, only the fields that are of type *Integer* will be displayed for you to choose from. While this behavior might be good and easy for most cases, it is also possible that it goes wrong or that you want to map your column to a field that is not proposed by default."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:59
-msgid "$ (32.000,00)"
+#: ../../general/base_import/import_faq.rst:71
+msgid "If that happens, you just have to check the ** Show fields of relation fields (advanced)** option, you will then be able to choose from the complete list of fields for each column."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:64
-msgid "What can I do when the Import preview table isn't displayed correctly?"
+#: ../../general/base_import/import_faq.rst:79
+msgid "Where can I change the date import format?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:66
-msgid "By default the Import preview is set on commas as field separators and quotation marks as text delimiters. If your csv file does not have these settings, you can modify the File Format Options (displayed under the Browse CSV file bar after you select your file)."
+#: ../../general/base_import/import_faq.rst:81
+msgid "Odoo can automatically detect if a column is a date and it will try to guess the date format from a set of most used date format. While this process can work for a lot of simple date format, some exotic date format will not be recognize and it is also possible to have some confusion (day and month inverted as example) as it is difficult to guess correctly which part is the day and which one is the month in a date like '01-03-2016'."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:68
-msgid "Note that if your CSV file has a tabulation as separator, Odoo will not detect the separations. You will need to change the file format options in your spreadsheet application. See the following question."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:73
-msgid "How can I change the CSV file format options when saving in my spreadsheet application?"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:75
-msgid "If you edit and save CSV files in speadsheet applications, your computer's regional settings will be applied for the separator and delimiter. We suggest you use OpenOffice or LibreOffice Calc as they will allow you to modify all three options (in 'Save As' dialog box > Check the box 'Edit filter settings' > Save)."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:77
-msgid "Microsoft Excel will allow you to modify only the encoding when saving (in 'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:82
-msgid "What's the difference between Database ID and External ID?"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:84
-msgid "Some fields define a relationship with another object. For example, the country of a contact is a link to a record of the 'Country' object. When you want to import such fields, Odoo will have to recreate links between the different records. To help you import such fields, Odoo provides 3 mechanisms. You must use one and only one mechanism per field you want to import."
+#: ../../general/base_import/import_faq.rst:83
+msgid "To view which date format Odoo has found from your file you can check the **Date Format** that is shown when clicking on **Options** under the file selector. If this format is incorrect you can change it to your liking using the *ISO 8601* to define the format."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:86
-msgid "For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:"
+msgid "If you are importing an excel (.xls, .xlsx) file, you can use date cells to store dates as the display of dates in excel is different from the way it is stored. That way you will be sure that the date format is correct in Odoo whatever your locale date format is."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:88
-msgid "Country: the name or code of the country"
+#: ../../general/base_import/import_faq.rst:91
+msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:89
-msgid "Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:90
-msgid "Country/External ID: the ID of this record referenced in another application (or the .XML file that imported it)"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:92
-msgid "For the country Belgium, you can use one of these 3 ways to import:"
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:94
-msgid "Country: Belgium"
+#: ../../general/base_import/import_faq.rst:93
+msgid "Yes, we fully support numbers with parenthesis to represent negative sign as well as numbers with currency sign attached to them. Odoo also automatically detect which thousand/decimal separator you use (you can change those under **options**). If you use a currency symbol that is not known to Odoo, it might not be recognized as a number though and it will crash."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:95
-msgid "Country/Database ID: 21"
+msgid "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:96
-msgid "Country/External ID: base.be"
+#: ../../general/base_import/import_faq.rst:97
+msgid "32.000,00"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:98
-msgid "According to your need, you should use one of these 3 ways to reference records in relations. Here is when you should use one or the other, according to your need:"
+msgid "32000,00"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:99
+msgid "32,000.00"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:100
-msgid "Use Country: This is the easiest way when your data come from CSV files that have been created manually."
+msgid "-32000.00"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:101
-msgid "Use Country/Database ID: You should rarely use this notation. It's mostly used by developers as it's main advantage is to never have conflicts (you may have several records with the same name, but they always have a unique Database ID)"
+msgid "(32000.00)"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:102
-msgid "Use Country/External ID: Use External ID when you import data from a third party application."
+msgid "$ 32.000,00"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:104
-msgid "When you use External IDs, you can import CSV files with the \"External ID\" column to define the External ID of each record you import. Then, you will be able to make a reference to that record with columns like \"Field/External ID\". The following two CSV files give you an example for Products and their Categories."
+#: ../../general/base_import/import_faq.rst:103
+msgid "(32000.00 €)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:106
-msgid "`CSV file for categories <../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
+#: ../../general/base_import/import_faq.rst:105
+msgid "Example that will not work:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:107
+msgid "ABC 32.000,00"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:108
-msgid "`CSV file for Products <../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
+msgid "$ (32.000,00)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:112
-msgid "What can I do if I have multiple matches for a field?"
+#: ../../general/base_import/import_faq.rst:113
+msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:114
-msgid "If for example you have two product categories with the child name \"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other Products/Sellable\"), your validation is halted but you may still import your data. However, we recommend you do not import the data because they will all be linked to the first 'Sellable' category found in the Product Category list (\"Misc. Products/Sellable\"). We recommend you modify one of the duplicates' values or your product category hierarchy."
+#: ../../general/base_import/import_faq.rst:115
+msgid "By default the Import preview is set on commas as field separators and quotation marks as text delimiters. If your csv file does not have these settings, you can modify the File Format Options (displayed under the Browse CSV file bar after you select your file)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:116
-msgid "However if you do not wish to change your configuration of product categories, we recommend you use make use of the external ID for this field 'Category'."
+#: ../../general/base_import/import_faq.rst:117
+msgid "Note that if your CSV file has a tabulation as separator, Odoo will not detect the separations. You will need to change the file format options in your spreadsheet application. See the following question."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:121
-msgid "How can I import a many2many relationship field (e.g. a customer that has multiple tags)?"
+#: ../../general/base_import/import_faq.rst:122
+msgid "How can I change the CSV file format options when saving in my spreadsheet application?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:123
-msgid "The tags should be separated by a comma without any spacing. For example, if you want your customer to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column of your CSV file."
+#: ../../general/base_import/import_faq.rst:124
+msgid "If you edit and save CSV files in speadsheet applications, your computer's regional settings will be applied for the separator and delimiter. We suggest you use OpenOffice or LibreOffice Calc as they will allow you to modify all three options (in 'Save As' dialog box > Check the box 'Edit filter settings' > Save)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:125
-msgid "`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`_."
+#: ../../general/base_import/import_faq.rst:126
+msgid "Microsoft Excel will allow you to modify only the encoding when saving (in 'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:130
-msgid "How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?"
+#: ../../general/base_import/import_faq.rst:131
+msgid "What's the difference between Database ID and External ID?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:132
-msgid "If you want to import sales order having several order lines; for each order line, you need to reserve a specific row in the CSV file. The first order line will be imported on the same row as the information relative to order. Any additional lines will need an addtional row that does not have any information in the fields relative to the order. As an example, here is purchase.order_functional_error_line_cant_adpat.CSV file of some quotations you can import, based on demo data."
+#: ../../general/base_import/import_faq.rst:133
+msgid "Some fields define a relationship with another object. For example, the country of a contact is a link to a record of the 'Country' object. When you want to import such fields, Odoo will have to recreate links between the different records. To help you import such fields, Odoo provides 3 mechanisms. You must use one and only one mechanism per field you want to import."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:135
-msgid "`File for some Quotations <../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
+msgid "For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:137
-msgid "The following CSV file shows how to import purchase orders with their respective purchase order lines:"
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:138
+msgid "Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:139
-msgid "`Purchase orders with their respective purchase order lines <../../_static/example_files/o2m_purchase_order_lines.csv>`_."
+msgid "Country/External ID: the ID of this record referenced in another application (or the .XML file that imported it)"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:141
-msgid "The following CSV file shows how to import customers and their respective contacts:"
+msgid "For the country Belgium, you can use one of these 3 ways to import:"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:143
-msgid "`Customers and their respective contacts <../../_static/example_files/o2m_customers_contacts.csv>`_."
+msgid "Country: Belgium"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:148
-msgid "Can I import several times the same record?"
+#: ../../general/base_import/import_faq.rst:144
+msgid "Country/Database ID: 21"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:145
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:147
+msgid "According to your need, you should use one of these 3 ways to reference records in relations. Here is when you should use one or the other, according to your need:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:149
+msgid "Use Country: This is the easiest way when your data come from CSV files that have been created manually."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:150
-msgid "If you import a file that contains one of the column \"External ID\" or \"Database ID\", records that have already been imported will be modified instead of being created. This is very usefull as it allows you to import several times the same CSV file while having made some changes in between two imports. Odoo will take care of creating or modifying each record depending if it's new or not."
+msgid "Use Country/Database ID: You should rarely use this notation. It's mostly used by developers as it's main advantage is to never have conflicts (you may have several records with the same name, but they always have a unique Database ID)"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:152
-msgid "This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your favorite spreadsheet application."
+#: ../../general/base_import/import_faq.rst:151
+msgid "Use Country/External ID: Use External ID when you import data from a third party application."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:153
+msgid "When you use External IDs, you can import CSV files with the \"External ID\" column to define the External ID of each record you import. Then, you will be able to make a reference to that record with columns like \"Field/External ID\". The following two CSV files give you an example for Products and their Categories."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:155
+msgid "`CSV file for categories <../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:157
-msgid "What happens if I do not provide a value for a specific field?"
+msgid "`CSV file for Products <../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:159
-msgid "If you do not set all fields in your CSV file, Odoo will assign the default value for every non defined fields. But if you set fields with empty values in your CSV file, Odoo will set the EMPTY value in the field, instead of assigning the default value."
+#: ../../general/base_import/import_faq.rst:161
+msgid "What can I do if I have multiple matches for a field?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:164
-msgid "How to export/import different tables from an SQL application to Odoo?"
+#: ../../general/base_import/import_faq.rst:163
+msgid "If for example you have two product categories with the child name \"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other Products/Sellable\"), your validation is halted but you may still import your data. However, we recommend you do not import the data because they will all be linked to the first 'Sellable' category found in the Product Category list (\"Misc. Products/Sellable\"). We recommend you modify one of the duplicates' values or your product category hierarchy."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:166
-msgid "If you need to import data from different tables, you will have to recreate relations between records belonging to different tables. (e.g. if you import companies and persons, you will have to recreate the link between each person and the company they work for)."
-msgstr ""
-
-#: ../../general/base_import/import_faq.rst:168
-msgid "To manage relations between tables, you can use the \"External ID\" facilities of Odoo. The \"External ID\" of a record is the unique identifier of this record in another application. This \"External ID\" must be unique accoss all the records of all objects, so it's a good practice to prefix this \"External ID\" with the name of the application or table. (like 'company_1', 'person_1' instead of '1')"
+#: ../../general/base_import/import_faq.rst:165
+msgid "However if you do not wish to change your configuration of product categories, we recommend you use make use of the external ID for this field 'Category'."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:170
-msgid "As an example, suppose you have a SQL database with two tables you want to import: companies and persons. Each person belong to one company, so you will have to recreate the link between a person and the company he work for. (If you want to test this example, here is a <a href=\"/base_import/static/csv/database_import_test.sql\">dump of such a PostgreSQL database</a>)"
+msgid "How can I import a many2many relationship field (e.g. a customer that has multiple tags)?"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:172
-msgid "We will first export all companies and their \"External ID\". In PSQL, write the following command:"
+msgid "The tags should be separated by a comma without any spacing. For example, if you want your customer to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column of your CSV file."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:178
-msgid "This SQL command will create the following CSV file::"
+#: ../../general/base_import/import_faq.rst:174
+msgid "`CSV file for Manufacturer, Retailer <../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:185
-msgid "To create the CSV file for persons, linked to companies, we will use the following SQL command in PSQL:"
+#: ../../general/base_import/import_faq.rst:179
+msgid "How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?"
 msgstr ""
 
-#: ../../general/base_import/import_faq.rst:191
-msgid "It will produce the following CSV file::"
+#: ../../general/base_import/import_faq.rst:181
+msgid "If you want to import sales order having several order lines; for each order line, you need to reserve a specific row in the CSV file. The first order line will be imported on the same row as the information relative to order. Any additional lines will need an addtional row that does not have any information in the fields relative to the order. As an example, here is purchase.order_functional_error_line_cant_adpat.CSV file of some quotations you can import, based on demo data."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:184
+msgid "`File for some Quotations <../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:186
+msgid "The following CSV file shows how to import purchase orders with their respective purchase order lines:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:188
+msgid "`Purchase orders with their respective purchase order lines <../../_static/example_files/o2m_purchase_order_lines.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:190
+msgid "The following CSV file shows how to import customers and their respective contacts:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:192
+msgid "`Customers and their respective contacts <../../_static/example_files/o2m_customers_contacts.csv>`_."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:197
+msgid "Can I import several times the same record?"
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:199
-msgid "As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and Eric is working for the Organi company. The relation between persons and companies is done using the External ID of the companies. We had to prefix the \"External ID\" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the orignial database)."
+msgid "If you import a file that contains one of the column \"External ID\" or \"Database ID\", records that have already been imported will be modified instead of being created. This is very usefull as it allows you to import several times the same CSV file while having made some changes in between two imports. Odoo will take care of creating or modifying each record depending if it's new or not."
 msgstr ""
 
 #: ../../general/base_import/import_faq.rst:201
+msgid "This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your favorite spreadsheet application."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:206
+msgid "What happens if I do not provide a value for a specific field?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:208
+msgid "If you do not set all fields in your CSV file, Odoo will assign the default value for every non defined fields. But if you set fields with empty values in your CSV file, Odoo will set the EMPTY value in the field, instead of assigning the default value."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:213
+msgid "How to export/import different tables from an SQL application to Odoo?"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:215
+msgid "If you need to import data from different tables, you will have to recreate relations between records belonging to different tables. (e.g. if you import companies and persons, you will have to recreate the link between each person and the company they work for)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:217
+msgid "To manage relations between tables, you can use the \"External ID\" facilities of Odoo. The \"External ID\" of a record is the unique identifier of this record in another application. This \"External ID\" must be unique accoss all the records of all objects, so it's a good practice to prefix this \"External ID\" with the name of the application or table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:219
+msgid "As an example, suppose you have a SQL database with two tables you want to import: companies and persons. Each person belong to one company, so you will have to recreate the link between a person and the company he work for. (If you want to test this example, here is a <a href=\"/base_import/static/csv/database_import_test.sql\">dump of such a PostgreSQL database</a>)"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:221
+msgid "We will first export all companies and their \"External ID\". In PSQL, write the following command:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:227
+msgid "This SQL command will create the following CSV file::"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:234
+msgid "To create the CSV file for persons, linked to companies, we will use the following SQL command in PSQL:"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:240
+msgid "It will produce the following CSV file::"
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:248
+msgid "As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and Eric is working for the Organi company. The relation between persons and companies is done using the External ID of the companies. We had to prefix the \"External ID\" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the orignial database)."
+msgstr ""
+
+#: ../../general/base_import/import_faq.rst:250
 msgid "The two files produced are ready to be imported in Odoo without any modifications. After having imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are linked to the first company). You must first import the companies and then the persons."
 msgstr ""
 

locale/sources/getting_started.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -313,114 +313,130 @@ msgid "**Data Import**: we can do it or assist you on how to do it with a templa
 msgstr ""
 
 #: ../../getting_started/documentation.rst:283
-msgid "If you have subscribed to a **Custom App**, you benefit from following extra services:"
+msgid "If you have subscribed to **Studio**, you benefit from following extra services:"
 msgstr ""
 
 #: ../../getting_started/documentation.rst:286
-msgid "**Customization of screens**"
+msgid "**Customization of screens:** Studio takes the Drag and Drop approach to customize most screens in any way you see fit."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:288
-msgid "**Customization of reports (PDF):** our project managers have access to developers for advanced customizations."
+#: ../../getting_started/documentation.rst:289
+msgid "**Customization of reports (PDF):** Studio itself will not allow you to customize the reports yourself, however our project managers have access to developers for advanced customizations."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:291
+#: ../../getting_started/documentation.rst:293
 msgid "**Website Design:** standard themes are provided to get started at no extra cost. However, our project manager can coach you on how to utilize the building blocks of the website designer. The time spent will consume hours of your success pack."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:296
+#: ../../getting_started/documentation.rst:298
 msgid "**Workflow automations:** e.g. setting values in fields based on triggers, sending reminders by emails, automating actions, etc. For very advanced automations, our project managers have access to Odoo developers."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:302
-msgid "Implementation Methodology"
-msgstr ""
-
-#: ../../getting_started/documentation.rst:304
-msgid "We follow a **lean and hands-on methodology**, that is used to put customers in production in a short period of time and at a low cost."
+#: ../../getting_started/documentation.rst:303
+msgid "If any customization is needed, Odoo Studio App will be required. Customizations made through Odoo Studio App will be maintained and upgraded at each Odoo upgrade, at no extra cost."
 msgstr ""
 
 #: ../../getting_started/documentation.rst:307
-msgid "After the kick-off meeting, we define a phasing plan to deploy Odoo progressively, by groups of apps."
+msgid "All time spent to perform these customizations by our Business Analysts will be deducted from your Success Pack."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:313
-msgid "The goal of the **Kick-off call** is for our project manager to come to an understanding of your business in order to propose an implementation plan (phasing). Each phase is the deployment of a set applications that you will fully use in production at the end of the phase."
+#: ../../getting_started/documentation.rst:310
+msgid "In case of customizations that would require a developer’s intervention, a recurring maintenance fee will be charged on the customer subscription, to cover maintenance and upgrade services. This cost will be based on hours spent by the developer: 4€ or $5/month, per hour of development will be added to the subscription fee."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:319
-msgid "For every phase, the steps are the following:"
+#: ../../getting_started/documentation.rst:316
+msgid "**Example:** a customization that took 2 hours of development will cost: 2 hours deducted from the Success Pack for the customization development 2 * $5 = $10/month as recurring fee for the maintenance of this customization"
 msgstr ""
 
 #: ../../getting_started/documentation.rst:321
-msgid "**On Boarding:** Odoo's project manager will review Odoo's business flows with you, according to your business. The goal is to train you, validate the business process and configure according to your specific needs."
+msgid "Implementation Methodology"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:323
+msgid "We follow a **lean and hands-on methodology**, that is used to put customers in production in a short period of time and at a low cost."
 msgstr ""
 
 #: ../../getting_started/documentation.rst:326
-msgid "**Data:** created manually or imported from your existing system. You are responsible to export the data from your existing system and Odoo's project manager will import them in Odoo."
+msgid "After the kick-off meeting, we define a phasing plan to deploy Odoo progressively, by groups of apps."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:330
-msgid "**Training:** once your applications are set up, your data imported, and the system is working smoothly, you will train your users. There will be some back and forth with your Odoo project manager to answer questions and process your feedback."
-msgstr ""
-
-#: ../../getting_started/documentation.rst:335
-msgid "**Production**: Once everyone is trained, your users start using Odoo."
+#: ../../getting_started/documentation.rst:332
+msgid "The goal of the **Kick-off call** is for our project manager to come to an understanding of your business in order to propose an implementation plan (phasing). Each phase is the deployment of a set applications that you will fully use in production at the end of the phase."
 msgstr ""
 
 #: ../../getting_started/documentation.rst:338
+msgid "For every phase, the steps are the following:"
+msgstr ""
+
+#: ../../getting_started/documentation.rst:340
+msgid "**On Boarding:** Odoo's project manager will review Odoo's business flows with you, according to your business. The goal is to train you, validate the business process and configure according to your specific needs."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:345
+msgid "**Data:** created manually or imported from your existing system. You are responsible to export the data from your existing system and Odoo's project manager will import them in Odoo."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:349
+msgid "**Training:** once your applications are set up, your data imported, and the system is working smoothly, you will train your users. There will be some back and forth with your Odoo project manager to answer questions and process your feedback."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:354
+msgid "**Production**: Once everyone is trained, your users start using Odoo."
+msgstr ""
+
+#: ../../getting_started/documentation.rst:357
 msgid "Once you are comfortable using Odoo, we will fine-tune the process and **automate** some tasks and do the remaining customizations (**extra screens and reports**)."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:342
+#: ../../getting_started/documentation.rst:361
 msgid "Once all applications are deployed and users are comfortable on Odoo, our project manager will not work on your project anymore (unless you have new needs) and you will use the support service if you have further questions."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:348
+#: ../../getting_started/documentation.rst:367
 msgid "Managing your databases"
 msgstr ""
 
-#: ../../getting_started/documentation.rst:350
+#: ../../getting_started/documentation.rst:369
 msgid "To access your databases, go to Odoo.com, sign in and click **My Databases** in the drop-down menu at the top right corner."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:356
+#: ../../getting_started/documentation.rst:375
 msgid "Odoo gives you the opportunity to test the system before going live or before upgrading to a newer version. Do not mess up your working environment with test data!"
 msgstr ""
 
-#: ../../getting_started/documentation.rst:360
+#: ../../getting_started/documentation.rst:379
 msgid "In that purpose, you can create as many free trials as you want (available for 15 days). Those instances can be instant copies of your working environment. To do so, go to the Odoo.com account in **My Organizations** page and click **Duplicate**."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:371
+#: ../../getting_started/documentation.rst:390
 msgid "You can find more information on how to manage your databases :ref:`here <db_management/documentation>`."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:375
+#: ../../getting_started/documentation.rst:394
 msgid "Customer Success"
 msgstr ""
 
-#: ../../getting_started/documentation.rst:377
+#: ../../getting_started/documentation.rst:396
 msgid "Odoo is passionate about delighting our customers and ensuring that they have all the resources needed to complete their project."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:380
+#: ../../getting_started/documentation.rst:399
 msgid "During the implementation phase, your point of contact is the project manager and eventually the support team."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:383
+#: ../../getting_started/documentation.rst:402
 msgid "Once you are in production, you will probably have less interaction with your project manager. At that time, we will assign a member of our Client Success Team to you. They are specialized in the long-term relationship with our customers. They will contact you to showcase new versions, improve the way you work with Odoo, assess your new needs, etc..."
 msgstr ""
 
-#: ../../getting_started/documentation.rst:390
+#: ../../getting_started/documentation.rst:409
 msgid "Our internal goal is to keep customers for at least 10 years and offer them a solution that grows with their needs!"
 msgstr ""
 
-#: ../../getting_started/documentation.rst:393
+#: ../../getting_started/documentation.rst:412
 msgid "Welcome aboard and enjoy your Odoo experience!"
 msgstr ""
 
-#: ../../getting_started/documentation.rst:396
+#: ../../getting_started/documentation.rst:415
 msgid ":doc:`../../db_management/documentation`"
 msgstr ""
 

locale/sources/index.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/sources/inventory.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 15:45+0200\n"
+"POT-Creation-Date: 2017-05-16 15:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -524,30 +524,58 @@ msgstr ""
 msgid "The Minimum Stock Rules configuration is available through the menu :menuselection:`Inventory --> Inventory Control --> Reordering Rule` in the drop down menu. There, click on **Create** to set minimum and maximum stock values for a given product."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Active"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "If the active field is set to False, it will allow you to hide the orderpoint without removing it."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Product Unit of Measure"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Procurement Group"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Moves created through this orderpoint will be put in this procurement group. If none is given, the moves generated by procurement rules will be grouped into one big picking."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Minimum Quantity"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "When the virtual stock goes below the Min Quantity specified for this field, Odoo generates a procurement to bring the forecasted quantity to the Max Quantity."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Maximum Quantity"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "When the virtual stock goes below the Min Quantity, Odoo generates a procurement to bring the forecasted quantity to the Quantity specified as Max Quantity."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Quantity Multiple"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "The procurement quantity will be rounded up to this multiple.  If it is 0, the exact quantity will be used."
 msgstr ""
 
+#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
+msgid "Lead Time"
+msgstr ""
+
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Number of days after the orderpoint is triggered to receive the products or to order to the vendor"
 msgstr ""
@@ -986,7 +1014,7 @@ msgid "Configuring lead times"
 msgstr ""
 
 #: ../../inventory/management/delivery/scheduled_dates.rst:15
-msgid "Configuring **lead times** is a first essentiel move in order to compute scheduled dates. Lead times are the delays (in term of delivery, manufacturing, ...) promised to your different partners and/or clients."
+msgid "Configuring **lead times** is a first essential move in order to compute scheduled dates. Lead times are the delays (in term of delivery, manufacturing, ...) promised to your different partners and/or clients."
 msgstr ""
 
 #: ../../inventory/management/delivery/scheduled_dates.rst:19

locale/sources/legal.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,28 +35,36 @@ msgstr ""
 msgid "Terms and Conditions"
 msgstr ""
 
-#: ../../legal.rst:38
+#: ../../legal.rst:46
 msgid ":ref:`enterprise_agreement` |nbsp| |nbsp| |download_enterprise|"
 msgstr ""
 
-#: ../../legal.rst:40
+#: ../../legal.rst:48
 msgid ":ref:`enterprise_agreement_fr` |nbsp| |nbsp| |download_enterprise_fr|"
 msgstr ""
 
-#: ../../legal.rst:47
+#: ../../legal.rst:50
+msgid ":ref:`terms_of_sale` |nbsp| |nbsp| |download_terms_of_sale|"
+msgstr ""
+
+#: ../../legal.rst:51
+msgid ":ref:`terms_of_sale_fr` |nbsp| |nbsp| |download_terms_of_sale_fr|"
+msgstr ""
+
+#: ../../legal.rst:58
 #: ../../legal/others.rst:5
 msgid "Other legal references"
 msgstr ""
 
-#: ../../legal.rst:49
+#: ../../legal.rst:60
 msgid "`Odoo Online Service Level Agreement <https://www.odoo.com/page/odoo-online-sla>`_"
 msgstr ""
 
-#: ../../legal.rst:50
+#: ../../legal.rst:61
 msgid "`Odoo Online Acceptable Use Policy <https://www.odoo.com/page/odoo-online-acceptable-use-policy>`_"
 msgstr ""
 
-#: ../../legal.rst:51
+#: ../../legal.rst:62
 msgid ":ref:`cla`"
 msgstr ""
 
@@ -78,34 +86,42 @@ msgstr ""
 
 #: ../../legal/licenses/enterprise_license.txt:1
 #: ../../legal/terms/i18n/enterprise_fr.rst:487
+#: ../../legal/licenses/enterprise_license.txt:1
 msgid "Odoo Enterprise Edition License v1.0"
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:3
 #: ../../legal/licenses/enterprise_license.txt:3
 msgid "This software and associated files (the \"Software\") can only be used (executed, modified, executed after modifications) with a valid Odoo Enterprise Subscription for the correct number of users."
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:7
 #: ../../legal/licenses/enterprise_license.txt:7
 msgid "With a valid Partnership Agreement with Odoo S.A., the above permissions are also granted, as long as the usage is limited to a testing or development environment."
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:11
 #: ../../legal/licenses/enterprise_license.txt:11
 msgid "You may develop Odoo modules based on the Software and distribute them under the license of your choice, provided that it is compatible with the terms of the Odoo Enterprise Edition License (For example: LGPL, MIT, or proprietary licenses similar to this one)."
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:16
 #: ../../legal/licenses/enterprise_license.txt:16
 msgid "You may use Odoo modules published under any license along with the Software, provided that their license is compatible with the terms of the Odoo Enterprise License (Including, but not limited to, any module published on the Odoo Apps Store on odoo.com/apps)"
 msgstr ""
 
 #: ../../legal/licenses/enterprise_license.txt:21
 #: ../../legal/licenses/licenses.rst:69
+#: ../../legal/licenses/enterprise_license.txt:21
 msgid "It is forbidden to publish, distribute, sublicense, or sell copies of the Software or modified copies of the Software."
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:24
 #: ../../legal/licenses/enterprise_license.txt:24
 msgid "The above copyright notice and this permission notice must be included in all  copies or substantial portions of the Software."
 msgstr ""
 
+#: ../../legal/licenses/enterprise_license.txt:27
 #: ../../legal/licenses/enterprise_license.txt:27
 msgid "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 msgstr ""
@@ -553,6 +569,47 @@ msgstr ""
 msgid "9 Appendix A: Odoo Enterprise Edition License"
 msgstr ""
 
+#: ../../legal/terms/enterprise.rst:431
+msgid "Odoo 9 Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, defined as follows:"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:439
+#: ../../legal/terms/partnership.rst:228
+msgid "See :ref:`odoo_enterprise_license`."
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:450
+msgid "Agreement Registration"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:453
+msgid "Customer contact information"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:455
+msgid "Company name: Company address: VAT number (if applicable): Contact name: Email: Phone:"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:463
+msgid "Technical contact information (can be an Odoo partner):"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:464
+msgid "Company name: Contact name: Email: Phone:"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:470
+msgid "By signing this Agreement I confirm I am a legal representative of Customer as stated in the resent section and approve all provisions and conditions of the present Agreement:"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:473
+msgid "For and on behalf of (company name): Last name, first name: Title: Date:"
+msgstr ""
+
+#: ../../legal/terms/enterprise.rst:478
+msgid "Signature:"
+msgstr ""
+
 #: ../../legal/terms/i18n/enterprise_fr.rst:6
 msgid "Odoo Enterprise Subscription Agreement (FR)"
 msgstr ""
@@ -690,7 +747,7 @@ msgid "Les demandes de migration doivent inclure une copie de sauvegarde complè
 msgstr ""
 
 #: ../../legal/terms/i18n/enterprise_fr.rst:160
-msgid "Ce service est fourni par le biais d'une plateforme automatisée, afin de permettre au Client d'effectuer des migration sans intervention humain, dès lors qu’une version précédente de la base de données du Client a été migrée avec succès pour une Version Couverte donnée. Le client peut soumettre des demandes de migration successives pour une base de données, et accepte de soumettre au moins 1 demande de mifration de test avant de soumettre la demande de migration finale."
+msgid "Ce service est fourni par le biais d'une plateforme automatisée, afin de permettre au Client d'effectuer des migration sans intervention humain, dès lors qu’une version précédente de la base de données du Client a été migrée avec succès pour une Version Couverte donnée. Le client peut soumettre des demandes de migration successives pour une base de données, et accepte de soumettre au moins 1 demande de migration de test avant de soumettre la demande de migration finale."
 msgstr ""
 
 #: ../../legal/terms/i18n/enterprise_fr.rst:167
@@ -973,6 +1030,62 @@ msgstr ""
 msgid "EN AUCUN CAS LES AUTEURS OU TITULAIRES DE DROITS D'AUTEUR NE POURRONT ETRE TENUS POUR RESPONSABLE A VOTRE EGARD DE RECLAMATIONS, DOMMAGES OU AUTRES RESPONSABILITES, EN VERTU D'UN CONTRAT, DÉLIT OU AUTREMENT, RELATIVEMENT AU LOGICIEL, A L'UTILISATION DU LOGICIEL, OU A TOUTE AUTRE MANIPULATION RELATIVE AU LOGICIEL."
 msgstr ""
 
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:5
+msgid "Conditions Générales de Vente"
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:7
+msgid "Dernière modification: 5 mai 2017."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:9
+msgid "Ces conditions régissent la vente de produits et services entre Odoo S.A. et ses filiales (collectivement, \"Odoo S.A.\") et le client. Des conditions supplémentaires peuvent s'appliquer pour d'autres services offerts par Odoo S.A. (par exemple, l'Odoo Enterprise Subscription Agreement). Si ces conditions supplémentaires entrent en contradiction avec les Conditions Générales de Vente, les conditions supplémentaires prévaudront."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:16
+msgid "Veuillez lire ces conditions attentivement avant de faire une commande auprès d'Odoo S.A. En commandant auprès d'Odoo S.A., le client marque son accord avec les présentes conditions."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:20
+msgid "Le client renonce explicitement à ses propres conditions générales, même dans le cas où celles-ci seraient postérieures aux présentes conditions générales. Toute dérogation doit, pour être valable, être convenue de manière expresse, préalable et par écrit. Les présentes conditions sont une prolongation du contrat signé entre parties et font en tant que telles partie intégrante de la relation contractuelle entre parties."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:27
+msgid "Toutes les offres, tarifs ou listes de prix d’Odoo S.A. s’entendent, sauf stipulation contraire, sans engagement. Sauf stipulation contraire, toutes les factures sont payables à Odoo S.A. au comptant, au moment de la livraison. L'endroit de paiement est le siège social de Odoo S.A. peut envoyer des factures pour des marchandises déjà livrées même avant la livraison complète des marchandises. Le Client ne peut en aucun cas compenser une quelconque créance sur Odoo S.A. avec son obligation de paiement, sauf stipulation contraire."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:35
+msgid "Si la facture n’est pas payée à son échéance, elle sera, à titre d’indemnité forfaitaire, majorée de 15% et majorée d'autres indemnités, éventuellement dues pour tout préjudice, à démontrer par Odoo S.A.. Le non-paiement de tout ou partie d’une facture à son échéance rend immédiatement exigibles toutes sommes ou toutes factures dues non-encore échue. En cas de non-paiement d’une facture, Odoo S.A.  a le droit de rompre toutes les conventions de vente qui restent encore à exécuter."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:43
+msgid "Si le Client est autorisé à effectuer des paiements à terme, l’absence de paiement d’un seul terme entraînera de plein droit et sans mise en demeure l’exigibilité de toute la dette, nonobstant toute indemnité supplémentaire."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:47
+msgid "Certains pays appliquent une retenue à la source sur le montant de la facture, conformément à leur législation interne. La retenue à la source sera réglée par le client, auprès de l'administration fiscale. En aucun cas, Odoo S.A. ne sera impliquée dans les coûts liés à la législation du pays. Le montant de la facture est donc dû à Odoo S.A. dans son intégralité et n’inclus pas les coûts relatifs à la législation du pays où se trouve le client."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:54
+msgid "Odoo S.A. s'engage à faire ses meilleurs efforts en vue de fournir en temps utile des services performants. Toutefois, aucune de ses obligations ne peut être considérée comme étant une obligation de résultat. Odoo S.A. ne peut, en aucun cas, être appelée en garantie par le client dans le cadre de demandes en dommages et intérêts formulée par le consommateur final à l'encontre du client."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:60
+msgid "Dans la limite autorisée par la loi, la responsabilité globale de chaque partie, ainsi que de ses filiales ne dépassera pas 50% du montant total réglé par le Client en vertu des présentes conditions au cours des 12 mois précédant la date de l'événement donnant lieu à une telle réclamation. Des réclamations multiples n'augmenteront pas cette limite."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:66
+msgid "Toute réclamation doit, pour être recevable, être notifiée à Odoo S.A., à son siège social, par courrier recommandé dans les 8 jours suivant la livraison des marchandises ou la prestation des services."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:70
+msgid "Odoo S.A. se réserve le droit de modifier ces conditions à n'importe quel moment et sans notification préalable. Le client est soumis aux conditions en application au moment de son acceptation de ces conditions."
+msgstr ""
+
+#: ../../legal/terms/i18n/terms_of_sale_fr.rst:74
+msgid "Tout litige résultant de la présente convention ressort de l’application du droit belge et est de la compétence des Tribunaux de l’arrondissement du siège social d’Odoo S.A. hormis le droit d’Odoo S.A. de porter le litige devant une autre juridiction compétente."
+msgstr ""
+
 #: ../../legal/terms/online.rst:3
 msgid "Odoo Online Terms & Conditions"
 msgstr ""
@@ -1185,3 +1298,55 @@ msgstr ""
 msgid "10 Appendix A: Odoo Enterprise Edition License"
 msgstr ""
 
+#: ../../legal/terms/terms_of_sale.rst:5
+msgid "General Terms of Sale"
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:7
+msgid "Last revision: May 5, 2017."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:9
+msgid "These General Terms of Sale govern the sale of products and services by Odoo S.A. and its affiliates (collectively, \"Odoo S.A.\") to the client. Additional terms may apply for services provided by Odoo S.A. (for example, the Enterprise Subscription Agreement). If these additional terms are inconsistent with the General Terms of Sale, the additional terms will prevail over these General Terms of Sale."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:16
+msgid "Please read these terms carefully before placing an order with Odoo S.A. By accepting an order with Odoo S.A., the client marks his acceptance with these terms."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:20
+msgid "The client explicitly waives its own standard terms and conditions, even if these were drawn up after these standard terms and conditions of sale. In order to be valid, any derogation must be expressly agreed to in advance in writing."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:25
+msgid "Our invoices are payable within 21 working days, unless another payment timeframe is indicated on either the invoice or the order. In the event of non-payment by the due date, Odoo S.A. reserves the right to request a fixed interest payment amounting to 15% of the sum remaining due. Odoo S.A. will be authorised to suspend any provision of services without prior warning in the event of late payment."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:32
+msgid "If a payment is still outstanding more than sixty (60) days after the due payment date, Odoo S.A. reserves the right to call on the services of a debt recovery company. All legal expenses will be payable by the client."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:36
+msgid "Certain countries apply withholding at source on the amount of invoices, in accordance with their internal legislation. Any withholding at source will be paid by the client to the tax authorities. Under no circumstances can Odoo S.A. become involved in costs related to a country's legislation. The amount of the invoice will therefore be due to Odoo S.A. in its entirety and does not include any costs relating to the legislation of the country in which the client is located."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:44
+msgid "Odoo S.A. undertakes to do its best to supply services in due time in accordance with the agreed timeframes. However, none of its obligations can be considered as being an obligation to achieve results. Odoo S.A. cannot, under any circumstances, be required by the client to appear as a third party in the context of any claim for damages filed against the client by an end consumer."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:50
+msgid "In order for it to be admissible, Odoo S.A. must be notified of any claim by means of a letter sent by recorded delivery to its registered office within 8 days of the delivery of the goods or the provision of the services."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:54
+msgid "To the maximum extent permitted by law, the aggregate liability of each party together with its affiliates arising will not exceed 50% of the total amount paid by the Customer under these terms during the 12 months immediately preceding the date of the event giving rise to such claim. Multiple claims shall not enlarge this limitation."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:60
+msgid "Odoo S.A. reserves the right to modify these terms at any time without prior notice. The client will be subject to the terms in force at the time of acceptation of those terms."
+msgstr ""
+
+#: ../../legal/terms/terms_of_sale.rst:64
+msgid "All our contractual relations will be governed exclusively by Belgian law. Moreover, any dispute that may arise will be subject exclusively to the jurisdiction of the courts of the Nivelles arrondissement (Belgium)."
+msgstr ""
+

locale/sources/manufacturing.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 9.0\n"
+"Project-Id-Version: Odoo Business 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 15:39+0100\n"
+"POT-Creation-Date: 2017-06-07 09:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"