From 54efadd1c78614208d9f0ce3d782f84ca535a168 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 11 Jun 2017 09:31:02 +0200 Subject: [PATCH] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 115 ++++++++++++++++- locale/es/LC_MESSAGES/applications.po | 4 +- locale/es/LC_MESSAGES/crm.po | 121 +++++++++++------- locale/es/LC_MESSAGES/db_management.po | 11 +- locale/es/LC_MESSAGES/ecommerce.po | 56 +++++---- locale/es/LC_MESSAGES/getting_started.po | 102 ++++++++++------ locale/es/LC_MESSAGES/index.po | 4 +- locale/es/LC_MESSAGES/inventory.po | 8 +- locale/es/LC_MESSAGES/manufacturing.po | 4 +- locale/es/LC_MESSAGES/practical.po | 4 +- locale/es/LC_MESSAGES/project.po | 4 +- locale/es/LC_MESSAGES/website.po | 42 ++++--- locale/fr/LC_MESSAGES/accounting.po | 115 ++++++++++++++++- locale/fr/LC_MESSAGES/applications.po | 4 +- locale/fr/LC_MESSAGES/crm.po | 121 +++++++++++------- locale/fr/LC_MESSAGES/db_management.po | 11 +- locale/fr/LC_MESSAGES/ecommerce.po | 56 +++++---- locale/fr/LC_MESSAGES/getting_started.po | 102 ++++++++++------ locale/fr/LC_MESSAGES/index.po | 4 +- locale/fr/LC_MESSAGES/inventory.po | 8 +- locale/fr/LC_MESSAGES/manufacturing.po | 4 +- locale/fr/LC_MESSAGES/practical.po | 4 +- locale/fr/LC_MESSAGES/project.po | 4 +- locale/fr/LC_MESSAGES/website.po | 42 ++++--- locale/nl/LC_MESSAGES/accounting.po | 113 ++++++++++++++++- locale/nl/LC_MESSAGES/applications.po | 4 +- locale/nl/LC_MESSAGES/crm.po | 129 +++++++++++++------- locale/nl/LC_MESSAGES/db_management.po | 12 +- locale/nl/LC_MESSAGES/discuss.po | 12 +- locale/nl/LC_MESSAGES/ecommerce.po | 87 ++++++------- locale/nl/LC_MESSAGES/general.po | 6 +- locale/nl/LC_MESSAGES/getting_started.po | 102 ++++++++++------ locale/nl/LC_MESSAGES/index.po | 4 +- locale/nl/LC_MESSAGES/inventory.po | 4 +- locale/nl/LC_MESSAGES/manufacturing.po | 6 +- locale/nl/LC_MESSAGES/point_of_sale.po | 4 +- locale/nl/LC_MESSAGES/practical.po | 4 +- locale/nl/LC_MESSAGES/project.po | 4 +- locale/nl/LC_MESSAGES/purchase.po | 2 +- locale/nl/LC_MESSAGES/website.po | 89 ++++++++------ locale/ru/LC_MESSAGES/accounting.po | 115 ++++++++++++++++- locale/ru/LC_MESSAGES/applications.po | 4 +- locale/ru/LC_MESSAGES/crm.po | 115 +++++++++++------ locale/ru/LC_MESSAGES/db_management.po | 8 +- locale/ru/LC_MESSAGES/ecommerce.po | 56 +++++---- locale/ru/LC_MESSAGES/getting_started.po | 94 +++++++++----- locale/ru/LC_MESSAGES/index.po | 4 +- locale/ru/LC_MESSAGES/inventory.po | 4 +- locale/ru/LC_MESSAGES/manufacturing.po | 4 +- locale/ru/LC_MESSAGES/practical.po | 4 +- locale/ru/LC_MESSAGES/project.po | 4 +- locale/ru/LC_MESSAGES/website.po | 42 ++++--- locale/tr/LC_MESSAGES/accounting.po | 115 ++++++++++++++++- locale/tr/LC_MESSAGES/applications.po | 4 +- locale/tr/LC_MESSAGES/crm.po | 115 +++++++++++------ locale/tr/LC_MESSAGES/db_management.po | 8 +- locale/tr/LC_MESSAGES/ecommerce.po | 56 +++++---- locale/tr/LC_MESSAGES/getting_started.po | 94 +++++++++----- locale/tr/LC_MESSAGES/index.po | 4 +- locale/tr/LC_MESSAGES/inventory.po | 4 +- locale/tr/LC_MESSAGES/manufacturing.po | 4 +- locale/tr/LC_MESSAGES/practical.po | 4 +- locale/tr/LC_MESSAGES/project.po | 4 +- locale/tr/LC_MESSAGES/website.po | 42 ++++--- locale/zh_CN/LC_MESSAGES/accounting.po | 115 ++++++++++++++++- locale/zh_CN/LC_MESSAGES/applications.po | 4 +- locale/zh_CN/LC_MESSAGES/crm.po | 117 ++++++++++++------ locale/zh_CN/LC_MESSAGES/db_management.po | 9 +- locale/zh_CN/LC_MESSAGES/ecommerce.po | 56 +++++---- locale/zh_CN/LC_MESSAGES/general.po | 12 +- locale/zh_CN/LC_MESSAGES/getting_started.po | 104 ++++++++++------ locale/zh_CN/LC_MESSAGES/index.po | 4 +- locale/zh_CN/LC_MESSAGES/inventory.po | 5 +- locale/zh_CN/LC_MESSAGES/manufacturing.po | 4 +- locale/zh_CN/LC_MESSAGES/practical.po | 4 +- locale/zh_CN/LC_MESSAGES/project.po | 4 +- locale/zh_CN/LC_MESSAGES/website.po | 42 ++++--- 77 files changed, 2002 insertions(+), 918 deletions(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index 119089f51..4c67057cd 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cristóbal Martí Oliver , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -3849,6 +3849,9 @@ msgstr "**Cuenta**" #: ../../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**" @@ -3856,6 +3859,9 @@ msgstr "**Débito**" #: ../../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**" @@ -6532,6 +6538,107 @@ 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 "Diario del banco" + +#: ../../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 "Impuestos Diario de base de efectivo" + +#: ../../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 "" @@ -12352,11 +12459,9 @@ msgstr "**Cuenta crédito por defecto**: Tarjetas de crédito" #: ../../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\"." +"The account type should be \"Credit Card\". Once it's done, don't forget to " +"set the \"Credit cards\" account as \"Allow Reconciliation\"." msgstr "" -"Una vez esta terminado, no olvide configurar la cuenta \"Tarjetas de " -"crédito\" como \"Admite Conciliación\"." #: ../../accounting/receivables/customer_payments/credit_cards.rst:57 #: ../../accounting/receivables/customer_payments/credit_cards.rst:119 diff --git a/locale/es/LC_MESSAGES/applications.po b/locale/es/LC_MESSAGES/applications.po index fddc981f9..88aab0651 100644 --- a/locale/es/LC_MESSAGES/applications.po +++ b/locale/es/LC_MESSAGES/applications.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" diff --git a/locale/es/LC_MESSAGES/crm.po b/locale/es/LC_MESSAGES/crm.po index 23296e418..ae038fbf1 100644 --- a/locale/es/LC_MESSAGES/crm.po +++ b/locale/es/LC_MESSAGES/crm.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: eduardo mendoza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -27,56 +27,97 @@ msgid "Calendar" msgstr "Calendario" #: ../../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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -434,18 +475,10 @@ msgstr "" 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 ." +" the **Internal notes** field." msgstr "" -"Desde el formato de contacto, se proporcionan todos los detalles que se " -"poseen (nombre de contacto, correo electrónico, teléfono, dirección, etc.), " -"así como alguna información adicional en el campo de **Notas Internas**. " -"También se puede vincular la iniciativa con el link a una empresa ya " -"existente editando el campo **Cliente**. Haga clic en Guardar y el contacto " -"será visible como una iniciativa en su flujo de ventas." -#: ../../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 " @@ -455,11 +488,11 @@ msgstr "" " a un vendedor, haga clic en el botón **Convertir a Oportunidad** en la " "esquina superior izquierda de la pantalla." -#: ../../crm/leads/generate/manual.rst:45 +#: ../../crm/leads/generate/manual.rst:43 msgid "Create a new opportunity" msgstr "Crear una nueva oportunidad" -#: ../../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 " @@ -479,7 +512,7 @@ msgstr "" "arriba. Por defecto, la oportunidad recién creada aparecerá en la primera " "etapa de su proceso de ventas." -#: ../../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 " diff --git a/locale/es/LC_MESSAGES/db_management.po b/locale/es/LC_MESSAGES/db_management.po index 000d46850..4c223dd8c 100644 --- a/locale/es/LC_MESSAGES/db_management.po +++ b/locale/es/LC_MESSAGES/db_management.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -507,12 +507,9 @@ msgstr "Desinstalar Aplicaciones" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" -"Asegúrese que primero prueba lo que esta a punto de hacer en un " -":ref:`duplicado ` de su base de datos antes de hacer algún cambio" -" (*especialmente* instalando/desinstalando aplicaciones). " #: ../../db_management/documentation.rst:77 msgid "" diff --git a/locale/es/LC_MESSAGES/ecommerce.po b/locale/es/LC_MESSAGES/ecommerce.po index 3800421d9..a0caae326 100644 --- a/locale/es/LC_MESSAGES/ecommerce.po +++ b/locale/es/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Antonio Trueba , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -199,113 +199,115 @@ msgstr "" 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" +"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." @@ -953,7 +955,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" diff --git a/locale/es/LC_MESSAGES/getting_started.po b/locale/es/LC_MESSAGES/getting_started.po index fef7c7250..034ab1cd5 100644 --- a/locale/es/LC_MESSAGES/getting_started.po +++ b/locale/es/LC_MESSAGES/getting_started.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: eduardo mendoza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -577,25 +577,24 @@ msgstr "" #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" +"If you have subscribed to **Studio**, you benefit from following extra " +"services:" msgstr "" -"Si ha subscribido a la opción **Applicación personalizada**, se beneficiará " -"de los siguientes servicios addicionales:" #: ../../getting_started/documentation.rst:286 -msgid "**Customization of screens**" -msgstr "**Personalización de pantallas**" - -#: ../../getting_started/documentation.rst:288 msgid "" -"**Customization of reports (PDF):** our project managers have access to " +"**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: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 "" -"**Personalización de reportes (PDF):** nuestros gerentes de proyectos tienen" -" acceso a desarolladores para personalisaciónes avanzadas." -#: ../../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 " @@ -607,7 +606,7 @@ msgstr "" "utilizar los bloques basicos del módulo diseñador de páginas. El tiempo con " "el cliente se descontará de las horas del paquete Success Pack." -#: ../../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 " @@ -618,11 +617,40 @@ msgstr "" "automatizar acciónes, etcétera. Para automatizaciónes muy avanzadas, " "nuestros gerentes de proyectos tienen acceso a desarolladores Odoo." -#: ../../getting_started/documentation.rst:302 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "Metodología de implantación" -#: ../../getting_started/documentation.rst:304 +#: ../../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." @@ -630,7 +658,7 @@ msgstr "" "Seguimos una metodología **esbelta y practica**, que empleamos para salir " "juntos con nuestros clientes a producción en un tiempo corto y a costo bajo." -#: ../../getting_started/documentation.rst:307 +#: ../../getting_started/documentation.rst:326 msgid "" "After the kick-off meeting, we define a phasing plan to deploy Odoo " "progressively, by groups of apps." @@ -638,7 +666,7 @@ msgstr "" "Tras la reunión de lanzamiento, definimos un plan para desplegar Odoo " "progresivamente, por grupos de aplicaciones." -#: ../../getting_started/documentation.rst:313 +#: ../../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 " @@ -650,11 +678,11 @@ msgstr "" "(planeación). Cada fase consiste en el despliegue de un conjunto de " "applicaciónes que utilizará plenamente al final de la fase." -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "Para cada fase se dan los siguientes pasos:" -#: ../../getting_started/documentation.rst:321 +#: ../../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" @@ -665,7 +693,7 @@ msgstr "" "procesos internos y configurar la instancia segun sus necesidades " "específicos." -#: ../../getting_started/documentation.rst:326 +#: ../../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 " @@ -675,7 +703,7 @@ msgstr "" "Usted estará responsable de exportar los datos de su sistema existente y el " "gerente de proyectos de Odoo los importará en Odoo." -#: ../../getting_started/documentation.rst:330 +#: ../../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 " @@ -687,13 +715,13 @@ msgstr "" "capacitara a sus usuarios. Habrá algunos ajustes con su gerente de proyecto " "Odoo para responder a las preguntas y procesar sus comentarios." -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr "" "**Producción**: En cuanto todo el mundo está entrenado, sus usuarios " "comienzan a usar Odoo." -#: ../../getting_started/documentation.rst:338 +#: ../../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" @@ -703,7 +731,7 @@ msgstr "" "finiquitar los procesos y **automatizar** algunas tareas y hacer las " "restantes personalizaciónes (**vpantallas extras y reportes**)." -#: ../../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 " @@ -714,11 +742,11 @@ msgstr "" "en su proyectos (salvo que tenga nuevos requerimientos) y usted utilizará el" " servicio de soporte si tiene mas preguntas." -#: ../../getting_started/documentation.rst:348 +#: ../../getting_started/documentation.rst:367 msgid "Managing your databases" msgstr "Gestionando sus bases de datos" -#: ../../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." @@ -727,7 +755,7 @@ msgstr "" "clic en **Mis bases de datos** en el menú desplegable que aparece en la " "esquina superior derecha." -#: ../../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" @@ -737,7 +765,7 @@ msgstr "" "de actualizar a una versión más reciente. No ensucie el entorno de trabajo " "con los datos de prueba!" -#: ../../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 " @@ -749,7 +777,7 @@ msgstr "" "instancia de producción. Para este efecto, vaya a su cuenta en Odoo.com y en" " la página **Mis organizaciónes** haga click en **Duplicar**." -#: ../../getting_started/documentation.rst:371 +#: ../../getting_started/documentation.rst:390 msgid "" "You can find more information on how to manage your databases :ref:`here " "`." @@ -757,11 +785,11 @@ msgstr "" "Puede encontrar más información acerca de como administrar sus bases de " "datos :ref:`aquí `." -#: ../../getting_started/documentation.rst:375 +#: ../../getting_started/documentation.rst:394 msgid "Customer Success" msgstr "Éxito del cliente" -#: ../../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." @@ -769,7 +797,7 @@ msgstr "" "Odoo se passiona para deleitar a nuestros clientes y assegurar que disponen " "de todos los recursos para copmletar su proyecto." -#: ../../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." @@ -777,7 +805,7 @@ msgstr "" "Durante la fase de implementación. el punto de contacto es nuestro gerente " "de proyectos, y posiblemente el equipo de soporte." -#: ../../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 " @@ -791,7 +819,7 @@ msgstr "" "con nuestros clientes. El le contactará para demostrar nuevas versiones, " "mejorar la manera de como utiliza Odoo y evaluar sus necesidades, etcétera." -#: ../../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!" @@ -799,10 +827,10 @@ msgstr "" "¡Nuestro objetivo interno es mantener a un cliente po, al menos, 10 años, y " "ofrecerles una solución que crece con sus necesidades!" -#: ../../getting_started/documentation.rst:393 +#: ../../getting_started/documentation.rst:412 msgid "Welcome aboard and enjoy your Odoo experience!" msgstr "¡Bienvenido a bordo, y disfrute su experiencia con Odoo!" -#: ../../getting_started/documentation.rst:396 +#: ../../getting_started/documentation.rst:415 msgid ":doc:`../../db_management/documentation`" msgstr ":doc:`../../db_management/documentation`" diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index 050c5f031..924c1c109 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po index 64ababf63..1a84ba4a0 100644 --- a/locale/es/LC_MESSAGES/inventory.po +++ b/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Julián Andrés Osorio López , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -1796,14 +1796,10 @@ msgstr "Configurando tiempo de entregas" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" -"La configuración de los **tiempos de entrega** es un paso esencial para " -"calcular fechas programadas. Los plazos de entrega son los retrasos (en " -"términos de suministro, fabricación, ...) prometidos a sus diferentes socios" -" y/o clientes. " #: ../../inventory/management/delivery/scheduled_dates.rst:19 msgid "Configuration of the different lead times are made as follows:" diff --git a/locale/es/LC_MESSAGES/manufacturing.po b/locale/es/LC_MESSAGES/manufacturing.po index 241e1200e..18031a670 100644 --- a/locale/es/LC_MESSAGES/manufacturing.po +++ b/locale/es/LC_MESSAGES/manufacturing.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ana Juaristi , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" diff --git a/locale/es/LC_MESSAGES/practical.po b/locale/es/LC_MESSAGES/practical.po index 1b66292d2..6800ce142 100644 --- a/locale/es/LC_MESSAGES/practical.po +++ b/locale/es/LC_MESSAGES/practical.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" diff --git a/locale/es/LC_MESSAGES/project.po b/locale/es/LC_MESSAGES/project.po index 4611938f0..5062480ef 100644 --- a/locale/es/LC_MESSAGES/project.po +++ b/locale/es/LC_MESSAGES/project.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ruben Dario Machado , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" diff --git a/locale/es/LC_MESSAGES/website.po b/locale/es/LC_MESSAGES/website.po index 6d711b443..d532dc464 100644 --- a/locale/es/LC_MESSAGES/website.po +++ b/locale/es/LC_MESSAGES/website.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Luis M. Ontalba , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -68,12 +68,12 @@ msgid ":doc:`google_analytics_dashboard`" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -95,28 +95,34 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 -msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Then 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." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:41 +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 "" + +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -124,18 +130,18 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr "" diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index 4b9b3dc78..2bd9c7695 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: leemannd , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -3853,6 +3853,9 @@ msgstr "**Compte**" #: ../../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**" @@ -3860,6 +3863,9 @@ msgstr "**Débit**" #: ../../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**" @@ -6549,6 +6555,107 @@ 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 "Journal de banque" + +#: ../../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 "Journal pour taxes sur base des paiements" + +#: ../../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 "" @@ -12428,11 +12535,9 @@ msgstr "**Compte de crédit par défaut** : CB à encaisser" #: ../../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\"." +"The account type should be \"Credit Card\". Once it's done, don't forget to " +"set the \"Credit cards\" account as \"Allow Reconciliation\"." msgstr "" -"Une fois ceci fait, n'oubliez pas de cocher « Autoriser le lettrage » pour " -"le compte « CB à encaisser »." #: ../../accounting/receivables/customer_payments/credit_cards.rst:57 #: ../../accounting/receivables/customer_payments/credit_cards.rst:119 diff --git a/locale/fr/LC_MESSAGES/applications.po b/locale/fr/LC_MESSAGES/applications.po index 273cf4eaf..5492a3f09 100644 --- a/locale/fr/LC_MESSAGES/applications.po +++ b/locale/fr/LC_MESSAGES/applications.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" diff --git a/locale/fr/LC_MESSAGES/crm.po b/locale/fr/LC_MESSAGES/crm.po index ab742d16e..c1623142b 100644 --- a/locale/fr/LC_MESSAGES/crm.po +++ b/locale/fr/LC_MESSAGES/crm.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Belmere , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -27,56 +27,97 @@ msgid "Calendar" msgstr "Calendrier" #: ../../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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -427,18 +468,10 @@ msgstr "" 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 ." +" the **Internal notes** field." msgstr "" -"Dans le formulaire de contact, fournissez tous les détails en votre " -"possession (nom de contact, email, téléphone, adresse, etc.), ainsi que des " -"informations supplémentaires dans les champs **notes internes**. Vous pouvez" -" également lier la piste à une société existante en modifiant le champ " -"**Client**. Cliquez sur Enregistrer et le contact sera visible en tant que " -"piste dans votre pipeline." -#: ../../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 " @@ -448,11 +481,11 @@ msgstr "" " spécifiques en cliquant sur **Convertir en opportunité** dans le coin " "supérieur gauche de l'écran." -#: ../../crm/leads/generate/manual.rst:45 +#: ../../crm/leads/generate/manual.rst:43 msgid "Create a new opportunity" msgstr "Créez une nouvelle opportunité" -#: ../../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 " @@ -472,7 +505,7 @@ msgstr "" "l'opportunité nouvellement créée apparaîtra sur la première étape de votre " "pipeline de vente." -#: ../../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 " diff --git a/locale/fr/LC_MESSAGES/db_management.po b/locale/fr/LC_MESSAGES/db_management.po index d53514e32..6ec10d994 100644 --- a/locale/fr/LC_MESSAGES/db_management.po +++ b/locale/fr/LC_MESSAGES/db_management.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Rémi FRANÇOIS , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -514,12 +514,9 @@ msgstr "Désinstallation d'Applications" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" -"Testez d'abord ce que vous êtes sur le point de faire sur une :ref:`copie " -"` de votre base de données avant d'effectuer des changements (*en" -" particulier* l'installation/la désinstallation d'applications)." #: ../../db_management/documentation.rst:77 msgid "" diff --git a/locale/fr/LC_MESSAGES/ecommerce.po b/locale/fr/LC_MESSAGES/ecommerce.po index d7455d0b0..c4e3b93c3 100644 --- a/locale/fr/LC_MESSAGES/ecommerce.po +++ b/locale/fr/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Melanie Bernard , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -199,113 +199,115 @@ msgstr "" 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" +"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." @@ -953,7 +955,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" diff --git a/locale/fr/LC_MESSAGES/getting_started.po b/locale/fr/LC_MESSAGES/getting_started.po index 3f26d5d29..c5c89aecc 100644 --- a/locale/fr/LC_MESSAGES/getting_started.po +++ b/locale/fr/LC_MESSAGES/getting_started.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Belmere , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -587,25 +587,24 @@ msgstr "" #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" +"If you have subscribed to **Studio**, you benefit from following extra " +"services:" msgstr "" -"Si vous avez souscrit à une **Application personnalisée**, vous bénéficiez " -"de services suivants supplémentaires :" #: ../../getting_started/documentation.rst:286 -msgid "**Customization of screens**" -msgstr "**Personnalisation d'écrans**" - -#: ../../getting_started/documentation.rst:288 msgid "" -"**Customization of reports (PDF):** our project managers have access to " +"**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: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 "" -"**Personnalisation des rapports (PDF) :** nos chefs de projet ont accès à " -"des développeurs pour les personnalisations avancées." -#: ../../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 " @@ -617,7 +616,7 @@ msgstr "" "vous coacher sur la façon d'utiliser les blocs de construction du concepteur" " de site Web. Le temps passé va consommer des heures de votre succes pack." -#: ../../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 " @@ -628,11 +627,40 @@ msgstr "" "automatisation d'actions, etc. Pour des automatisations très avancées, nos " "chefs de projet ont accès aux développeurs d'Odoo." -#: ../../getting_started/documentation.rst:302 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "Méthodologie d'implémentation" -#: ../../getting_started/documentation.rst:304 +#: ../../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." @@ -641,7 +669,7 @@ msgstr "" "mettre les clients en production dans un court laps de temps et à un faible " "coût." -#: ../../getting_started/documentation.rst:307 +#: ../../getting_started/documentation.rst:326 msgid "" "After the kick-off meeting, we define a phasing plan to deploy Odoo " "progressively, by groups of apps." @@ -649,7 +677,7 @@ msgstr "" "Après la réunion de lancement, nous définissons un planning en plusieurs " "phases pour déployer Odoo progressivement, par groupes d'apps." -#: ../../getting_started/documentation.rst:313 +#: ../../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 " @@ -661,11 +689,11 @@ msgstr "" "phasé. Chaque phase est le déploiement d'un ensemble d'applications que vous" " utiliserez pleinement en production à la fin de la phase." -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "Pour chaque phase, les étapes sont les suivantes :" -#: ../../getting_started/documentation.rst:321 +#: ../../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" @@ -675,7 +703,7 @@ msgstr "" " de Odoo avec vous, selon vos activités. Le but est de vous former, valider " "le processus d'affaires et de configurer selon vos besoins spécifiques." -#: ../../getting_started/documentation.rst:326 +#: ../../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 " @@ -685,7 +713,7 @@ msgstr "" "Vous êtes responsable de l'export des données de votre système existant et " "le chef de projet Odoo va les importer dans Odoo." -#: ../../getting_started/documentation.rst:330 +#: ../../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 " @@ -698,13 +726,13 @@ msgstr "" "projet Odoo pour répondre aux questions et traiter vos retour d'information." " " -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr "" "**Production :** une fois que tout le monde est formé, les utilisateurs " "commencent à utiliser Odoo." -#: ../../getting_started/documentation.rst:338 +#: ../../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" @@ -714,7 +742,7 @@ msgstr "" "processus, **automatiser** certaines tâches et faire les personnalisations " "restantes (**écrans supplémentaires et rapports**)." -#: ../../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 " @@ -725,11 +753,11 @@ msgstr "" "projet (sauf si vous avez de nouveaux besoins) et vous utiliserez le service" " d'assistance si vous avez d'autres questions." -#: ../../getting_started/documentation.rst:348 +#: ../../getting_started/documentation.rst:367 msgid "Managing your databases" msgstr "Gestion de vos bases de données" -#: ../../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." @@ -738,7 +766,7 @@ msgstr "" "cliquez sur **My Databases** dans le menu déroulant situé dans le coin " "supérieur droit." -#: ../../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" @@ -748,7 +776,7 @@ msgstr "" "direct ou avant de passer à une version plus récente. Ne gâchez pas votre " "environnement de travail avec des données de test !" -#: ../../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 " @@ -761,7 +789,7 @@ msgstr "" "sur le compte Odoo.com sur la page **My Databases** et cliquez sur " "**Dupliquer**." -#: ../../getting_started/documentation.rst:371 +#: ../../getting_started/documentation.rst:390 msgid "" "You can find more information on how to manage your databases :ref:`here " "`." @@ -769,11 +797,11 @@ msgstr "" "Vous pourrez trouver plus d'informations sur la façon de gérer vos bases de " "données :ref:`ici `." -#: ../../getting_started/documentation.rst:375 +#: ../../getting_started/documentation.rst:394 msgid "Customer Success" msgstr "Succès Client" -#: ../../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." @@ -781,7 +809,7 @@ msgstr "" "Odoo se passionne pour ravir nos clients, et de veiller à ce qu'ils " "disposent de toutes les ressources nécessaires pour réaliser leur projet." -#: ../../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." @@ -789,7 +817,7 @@ msgstr "" "Pendant la phase de mise en œuvre, votre contact est le chef de projet, et " "éventuellement l'équipe d'assistance." -#: ../../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 " @@ -804,7 +832,7 @@ msgstr "" "nouvelles versions, améliorer la façon dont vous travaillez avec Odoo, " "évaluer vos nouveaux besoins, etc." -#: ../../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!" @@ -812,10 +840,10 @@ msgstr "" "Notre objectif interne est de garder les clients au moins pendant 10 ans, et" " de leur offrir une solution qui grandit avec leurs besoins!" -#: ../../getting_started/documentation.rst:393 +#: ../../getting_started/documentation.rst:412 msgid "Welcome aboard and enjoy your Odoo experience!" msgstr "Bienvenue à bord et profiter de votre expérience Odoo !" -#: ../../getting_started/documentation.rst:396 +#: ../../getting_started/documentation.rst:415 msgid ":doc:`../../db_management/documentation`" msgstr ":doc:`../../db_management/documentation`" diff --git a/locale/fr/LC_MESSAGES/index.po b/locale/fr/LC_MESSAGES/index.po index fd90cc465..c494ecc61 100644 --- a/locale/fr/LC_MESSAGES/index.po +++ b/locale/fr/LC_MESSAGES/index.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" diff --git a/locale/fr/LC_MESSAGES/inventory.po b/locale/fr/LC_MESSAGES/inventory.po index f5f47b3ee..9ad306973 100644 --- a/locale/fr/LC_MESSAGES/inventory.po +++ b/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Belmere , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -1679,14 +1679,10 @@ msgstr "Configuration des délais de mise en œuvre" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" -"La configuration des **délais d'exécution** est une première étape " -"essentielle pour pouvoir calculer les dates prévues. Les délais d'exécution " -"sont les délais (en terme de livraison, la fabrication, ...) promis à vos " -"différents partenaires et/ou clients." #: ../../inventory/management/delivery/scheduled_dates.rst:19 msgid "Configuration of the different lead times are made as follows:" diff --git a/locale/fr/LC_MESSAGES/manufacturing.po b/locale/fr/LC_MESSAGES/manufacturing.po index b20fa2786..02a87d207 100644 --- a/locale/fr/LC_MESSAGES/manufacturing.po +++ b/locale/fr/LC_MESSAGES/manufacturing.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ShevAbam , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" diff --git a/locale/fr/LC_MESSAGES/practical.po b/locale/fr/LC_MESSAGES/practical.po index 8cc9cf1f1..93dfd504c 100644 --- a/locale/fr/LC_MESSAGES/practical.po +++ b/locale/fr/LC_MESSAGES/practical.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" diff --git a/locale/fr/LC_MESSAGES/project.po b/locale/fr/LC_MESSAGES/project.po index cf239e49c..c37b57a65 100644 --- a/locale/fr/LC_MESSAGES/project.po +++ b/locale/fr/LC_MESSAGES/project.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Frédéric LIETART , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" diff --git a/locale/fr/LC_MESSAGES/website.po b/locale/fr/LC_MESSAGES/website.po index 2e63e3f89..388af8d22 100644 --- a/locale/fr/LC_MESSAGES/website.po +++ b/locale/fr/LC_MESSAGES/website.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Maxime Chambreuil , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -68,12 +68,12 @@ msgid ":doc:`google_analytics_dashboard`" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -95,28 +95,34 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 -msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Then 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." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:41 +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 "" + +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -124,18 +130,18 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr "" diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po index 0490a95b1..5e316956c 100644 --- a/locale/nl/LC_MESSAGES/accounting.po +++ b/locale/nl/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gunther Clauwaert , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -3085,6 +3085,9 @@ msgstr "**Rekening**" #: ../../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**" @@ -3092,6 +3095,9 @@ msgstr "**Debet**" #: ../../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**" @@ -5397,6 +5403,107 @@ 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 "Bankdagboek" + +#: ../../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 "BTW kasbasis dagboek" + +#: ../../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 "" @@ -10060,8 +10167,8 @@ 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\"." +"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 diff --git a/locale/nl/LC_MESSAGES/applications.po b/locale/nl/LC_MESSAGES/applications.po index 8ed977641..c40eea22c 100644 --- a/locale/nl/LC_MESSAGES/applications.po +++ b/locale/nl/LC_MESSAGES/applications.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" diff --git a/locale/nl/LC_MESSAGES/crm.po b/locale/nl/LC_MESSAGES/crm.po index 8b41baa28..436be6047 100644 --- a/locale/nl/LC_MESSAGES/crm.po +++ b/locale/nl/LC_MESSAGES/crm.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cas Vissers , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -27,56 +27,97 @@ msgid "Calendar" msgstr "Agenda" #: ../../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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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 "Schakel de API in." + +#: ../../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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -423,17 +464,10 @@ msgstr "" 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 ." +" the **Internal notes** field." msgstr "" -"Vanuit het contact formulier vult u alle gegevens in die u beschikbaar heeft" -" (naam, e-mail, telefoon, adres, enz.) en extra informatie in het **Interne " -"notities** veld. U kan de lead ook koppelen aan een bestaand bedrijf door " -"het **Klant** veld te wijzigen. Klik op opslaan en het contact zal zichtbaar" -" worden als lead in uw pijplijn." -#: ../../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 " @@ -443,11 +477,11 @@ msgstr "" "verkopen door te klikken op **Converteren naar opportuniteit** in de rechtse" " bovenhoek van het scherm." -#: ../../crm/leads/generate/manual.rst:45 +#: ../../crm/leads/generate/manual.rst:43 msgid "Create a new opportunity" msgstr "Maak een nieuwe opportuniteit aan" -#: ../../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 " @@ -465,7 +499,7 @@ msgstr "" " het contactformulier in zoals hierboven getoond. Standaard zal de nieuwe " "aangemaakte opportuniteit tonen als de eerste fase van uw verkoop pijplijn." -#: ../../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 " @@ -1254,7 +1288,7 @@ msgstr "gcc" #: ../../crm/leads/voip/setup.rst:15 msgid "g++" -msgstr "" +msgstr "g++" #: ../../crm/leads/voip/setup.rst:16 msgid "ncurses-devel" @@ -1282,7 +1316,7 @@ msgstr "openssl-devel" #: ../../crm/leads/voip/setup.rst:22 msgid "pkg-config" -msgstr "" +msgstr "pkg-config" #: ../../crm/leads/voip/setup.rst:24 msgid "In order to install libsrtp, follow the instructions below:" @@ -1301,7 +1335,7 @@ msgstr "**Wijzig naar de pjproject map:**" #: ../../crm/leads/voip/setup.rst:43 msgid "**run:**" -msgstr "" +msgstr "**run:**" #: ../../crm/leads/voip/setup.rst:49 msgid "**Build and install pjproject:**" @@ -1329,6 +1363,9 @@ msgid "" "`there `_." msgstr "" +"Om Asterisk 13.7.0 te installeren kan u de broncode direct downloaden van " +"`_." #: ../../crm/leads/voip/setup.rst:90 msgid "Extract Asterisk:" diff --git a/locale/nl/LC_MESSAGES/db_management.po b/locale/nl/LC_MESSAGES/db_management.po index f709254e5..00bf6b85e 100644 --- a/locale/nl/LC_MESSAGES/db_management.po +++ b/locale/nl/LC_MESSAGES/db_management.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Cas Vissers , 2017\n" +"Last-Translator: Dennis Sluijk , 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" @@ -106,7 +106,7 @@ msgstr "" #: ../../db_management/db_premise.rst:20 msgid "Registration Error Message" -msgstr "" +msgstr "Registratie Foutmelding" #: ../../db_management/db_premise.rst:22 msgid "" @@ -459,8 +459,8 @@ msgstr "Apps deïnstalleren" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" #: ../../db_management/documentation.rst:77 diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po index fb4612f4b..57a1a89d9 100644 --- a/locale/nl/LC_MESSAGES/discuss.po +++ b/locale/nl/LC_MESSAGES/discuss.po @@ -25,6 +25,8 @@ msgstr "Discussieer" #: ../../discuss/email_servers.rst:3 msgid "How to use my own email servers to send and receive email in Odoo" msgstr "" +"Hoe mijn eigen mailservers gebruiken om e-mail te ontvangen en verzenden in " +"Odoo" #: ../../discuss/email_servers.rst:6 msgid "When is it needed" @@ -150,7 +152,7 @@ msgstr "" #: ../../discuss/email_servers.rst:94 msgid "There are 2 methods:" -msgstr "" +msgstr "Er zijn 2 methodes:" #: ../../discuss/email_servers.rst:96 msgid "" @@ -192,7 +194,7 @@ msgstr "" #: ../../discuss/email_servers.rst:121 msgid "Sign in to your domain’s account at your domain host." -msgstr "" +msgstr "Meld u aan met uw domeinaccount op uw domein provider." #: ../../discuss/email_servers.rst:122 msgid "Locate the page for updating your domain’s DNS records." @@ -210,7 +212,7 @@ msgstr "" #: ../../discuss/email_servers.rst:127 msgid "e.g. for a Gmail server it should be:" -msgstr "" +msgstr "b.v voor een Gmail server moet dit zijn:" #: ../../discuss/email_servers.rst:129 msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" @@ -237,7 +239,7 @@ msgstr "" #: ../../discuss/email_servers.rst:142 msgid "How to choose between Odoo and my traditional email box" -msgstr "" +msgstr "Hoe te kiezen tussen Odoo en mijn traditionele e-mail box" #: ../../discuss/email_servers.rst:143 msgid "" @@ -338,7 +340,7 @@ msgstr "" #: ../../discuss/mentions.rst:15 msgid "Direct messaging a user" -msgstr "" +msgstr "Een gebruiker direct een bericht sturen" #: ../../discuss/mentions.rst:17 msgid "" diff --git a/locale/nl/LC_MESSAGES/ecommerce.po b/locale/nl/LC_MESSAGES/ecommerce.po index f41c2f39f..371b625fb 100644 --- a/locale/nl/LC_MESSAGES/ecommerce.po +++ b/locale/nl/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gunther Clauwaert , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -28,7 +28,7 @@ msgstr "Beginnen" #: ../../ecommerce/getting_started/catalog.rst:3 msgid "How to customize my catalog page" -msgstr "" +msgstr "Hoe mijn catalogus pagina te personaliseren" #: ../../ecommerce/getting_started/catalog.rst:6 msgid "Product Catalog" @@ -81,15 +81,15 @@ msgstr "Hoe een productpagina bouwen" #: ../../ecommerce/getting_started/product_page.rst:5 msgid "On the website click *New Page* in the top-right corner." -msgstr "" +msgstr "Klik op de website op **Nieuwe pagina** in de rechterbovenhoek." #: ../../ecommerce/getting_started/product_page.rst:7 msgid "Then click *New Product* and follow the blinking tips." -msgstr "" +msgstr "Klik vervolgens op **Nieuw product** en volg de knipperende tips." #: ../../ecommerce/getting_started/product_page.rst:12 msgid "Here are the main elements of the Product page:" -msgstr "" +msgstr "Hier zijn de belangrijkste elementen van de product pagina:" #: ../../ecommerce/getting_started/product_page.rst:17 msgid "Many elements can be made visible from the *Customize* menu." @@ -97,7 +97,7 @@ msgstr "" #: ../../ecommerce/getting_started/product_page.rst:22 msgid "See how to configure your products from links here below." -msgstr "" +msgstr "Zie hoe u uw producten configureert vanuit onderstaande links." #: ../../ecommerce/getting_started/product_page.rst:26 msgid ":doc:`../managing_products/variants`" @@ -157,6 +157,8 @@ msgstr "" #: ../../ecommerce/managing_products/multi_images.rst:19 msgid "Such extra image are common to all the product variants (if any)." msgstr "" +"Zo een extra afbeeldingen zijn vaak voorkomend bij alle product varianten " +"(als er zijn)." #: ../../ecommerce/managing_products/stock.rst:3 msgid "How to show product availability" @@ -199,113 +201,115 @@ msgstr "Hoe productvarianten beheren" 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." +"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:13 +#: ../../ecommerce/managing_products/variants.rst:15 msgid "How to create attributes & variants" msgstr "Hoe attributen & varianten aanmaken" -#: ../../ecommerce/managing_products/variants.rst:15 +#: ../../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 "Barcode," -#: ../../ecommerce/managing_products/variants.rst:42 +#: ../../ecommerce/managing_products/variants.rst:44 msgid "Internal Reference (SKU #)," msgstr "Interne referentie (SKU #)," -#: ../../ecommerce/managing_products/variants.rst:43 +#: ../../ecommerce/managing_products/variants.rst:45 msgid "Volume," msgstr "Volume," -#: ../../ecommerce/managing_products/variants.rst:44 +#: ../../ecommerce/managing_products/variants.rst:46 msgid "Weight," msgstr "Gewicht," -#: ../../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." @@ -313,7 +317,7 @@ msgstr "" #: ../../ecommerce/maximizing_revenue.rst:3 msgid "Maximize my revenue" -msgstr "" +msgstr "Maximaliseer mijn omzet" #: ../../ecommerce/maximizing_revenue/cross_selling.rst:3 msgid "How to sell accessories and optional products (cross-selling)" @@ -359,7 +363,7 @@ msgstr "" #: ../../ecommerce/maximizing_revenue/cross_selling.rst:31 msgid "Optional products when adding to cart" -msgstr "" +msgstr "Optionele producten wanneer u product toevoegt aan winkelmandje" #: ../../ecommerce/maximizing_revenue/cross_selling.rst:33 msgid "" @@ -495,7 +499,7 @@ msgstr "" #: ../../ecommerce/maximizing_revenue/promo_code.rst:39 msgid "Show sales per pricelists..." -msgstr "" +msgstr "Toon verkopen per prijslijst..." #: ../../ecommerce/maximizing_revenue/promo_code.rst:43 msgid ":doc:`pricing`" @@ -585,7 +589,7 @@ msgstr "" #: ../../ecommerce/maximizing_revenue/upselling.rst:12 msgid "To do so:" -msgstr "" +msgstr "Om dit te doen:" #: ../../ecommerce/maximizing_revenue/upselling.rst:14 msgid "" @@ -606,7 +610,7 @@ msgstr "Overzicht" #: ../../ecommerce/overview/introduction.rst:3 msgid "Introduction to Odoo eCommerce" -msgstr "" +msgstr "Introductie tot Odoo eCommerce" #: ../../ecommerce/overview/introduction.rst:10 msgid "" @@ -660,7 +664,7 @@ msgstr "Wordt betaald" #: ../../ecommerce/shopper_experience/payment.rst:3 msgid "How to get paid with payment acquirers" -msgstr "" +msgstr "Hoe betaald worden met betalingsverwerkers" #: ../../ecommerce/shopper_experience/payment.rst:5 msgid "" @@ -670,7 +674,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:10 msgid "What are the payment methods available" -msgstr "" +msgstr "Wat zijn de beschikbare betaalmethoden" #: ../../ecommerce/shopper_experience/payment.rst:13 msgid "Wire transfer" @@ -686,7 +690,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:21 msgid "Payment acquirers" -msgstr "" +msgstr "Betaling verwervers" #: ../../ecommerce/shopper_experience/payment.rst:23 msgid "" @@ -850,7 +854,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment_acquirer.rst:12 msgid "What are the payment status" -msgstr "" +msgstr "Wat is de betalingsstatus" #: ../../ecommerce/shopper_experience/payment_acquirer.rst:13 msgid "" @@ -953,7 +957,7 @@ msgstr "Hoe betaald worden met Paypal" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" @@ -1003,6 +1007,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:46 msgid "Enter the **Notification URL**: /payment/paypal/ipn" msgstr "" +"Geef de **Notificatie URL** in: /payment/paypal/ipn" #: ../../ecommerce/shopper_experience/paypal.rst:51 msgid "" @@ -1054,7 +1059,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:94 msgid "Key: payment_paypal.pdt_token" -msgstr "" +msgstr "Sleutel: payment_paypal.pdt_token" #: ../../ecommerce/shopper_experience/paypal.rst:95 msgid "Value: your Paypal *Identity Token*" @@ -1141,7 +1146,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:154 msgid ":doc:`payment`" -msgstr "" +msgstr ":doc:`payment`" #: ../../ecommerce/shopper_experience/portal.rst:3 msgid "How customers can access their customer account" diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index 8cddb5253..54287dad8 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -319,7 +319,7 @@ msgstr "" #: ../../general/base_import/import_faq.rst:95 msgid "" "Examples of supported numbers (using thirty-two thousands as an example):" -msgstr "" +msgstr "Voorbeelden van ondersteunde cijfers (gebruikt 32000 als voorbeeld):" #: ../../general/base_import/import_faq.rst:97 msgid "32.000,00" @@ -796,7 +796,7 @@ msgstr "" #: ../../general/odoo_basics/choose_language.rst:27 msgid "Change your language" -msgstr "" +msgstr "Wijzig uw taal" #: ../../general/odoo_basics/choose_language.rst:29 msgid "" @@ -812,7 +812,7 @@ msgstr "" #: ../../general/odoo_basics/choose_language.rst:42 msgid "Open a new menu to view the changes." -msgstr "" +msgstr "Open een nieuw menu om de wijzigingen te bekijken." #: ../../general/odoo_basics/choose_language.rst:45 msgid "Change another user's language" diff --git a/locale/nl/LC_MESSAGES/getting_started.po b/locale/nl/LC_MESSAGES/getting_started.po index 713604601..13b03b78f 100644 --- a/locale/nl/LC_MESSAGES/getting_started.po +++ b/locale/nl/LC_MESSAGES/getting_started.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -561,25 +561,24 @@ msgstr "" #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" +"If you have subscribed to **Studio**, you benefit from following extra " +"services:" msgstr "" -"Indien u zich geabonneerd heeft op een **Maatwerk App**, profiteert u van de" -" volgende extra diensten:" #: ../../getting_started/documentation.rst:286 -msgid "**Customization of screens**" -msgstr "**Personalisering van schermen**" - -#: ../../getting_started/documentation.rst:288 msgid "" -"**Customization of reports (PDF):** our project managers have access to " +"**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: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 "" -"**Aanpassingen van rapporten (PDF):** onze projectleiders hebben toegang tot" -" ontwikkelaars voor geavanceerde aanpassingen." -#: ../../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 " @@ -591,7 +590,7 @@ msgstr "" "bouwblokken kan gebruiken met de website designer. Deze gespendeerde tijd " "gaat van uw succes pakket." -#: ../../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 " @@ -602,11 +601,40 @@ msgstr "" "enz. Voor elke geavanceerde automatisering heeft onze projectleider toegang " "tot Odoo ontwikkelaars." -#: ../../getting_started/documentation.rst:302 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "Implementatie methodologie" -#: ../../getting_started/documentation.rst:304 +#: ../../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." @@ -615,7 +643,7 @@ msgstr "" "klanten op een korte periode in productie te brengen en dat aan een lage " "kostprijs." -#: ../../getting_started/documentation.rst:307 +#: ../../getting_started/documentation.rst:326 msgid "" "After the kick-off meeting, we define a phasing plan to deploy Odoo " "progressively, by groups of apps." @@ -623,7 +651,7 @@ msgstr "" "Na de kick-off meeting definiëren we een plan om Odoo progressief uit te " "rollen, per groep of app." -#: ../../getting_started/documentation.rst:313 +#: ../../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 " @@ -635,11 +663,11 @@ msgstr "" "(fasering). Elke fase is de implementatie van een set applicaties die u " "volledig in productie gebruikt aan het einde van de fase." -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "Voor elke fase zijn de stappen de volgende:" -#: ../../getting_started/documentation.rst:321 +#: ../../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" @@ -649,7 +677,7 @@ msgstr "" "naar gelang uw zaak. Het doel is om u te trainen, de bedrijfsprocessen te " "valideren en configureren naar uw specifieke noden." -#: ../../getting_started/documentation.rst:326 +#: ../../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 " @@ -659,7 +687,7 @@ msgstr "" " bent verantwoordelijk om de data van uw huidige systeem te exporteren en de" " Odoo projectleider zal deze data importeren in Odoo." -#: ../../getting_started/documentation.rst:330 +#: ../../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 " @@ -667,13 +695,13 @@ msgid "" "process your feedback." msgstr "" -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr "" "**Productie**: Eenmaal iedereen getraind is starten uw gebruikers met het " "gebruiken van Odoo." -#: ../../getting_started/documentation.rst:338 +#: ../../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" @@ -683,7 +711,7 @@ msgstr "" "proces, **automatiseren** we sommige taken en doen we de overgebleven " "aanpassingen (**extra schermen en rapporten**)." -#: ../../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 " @@ -694,11 +722,11 @@ msgstr "" "nieuwe noden heeft) en gebruikt u de ondersteuningsdienst als u verder " "vragen heeft." -#: ../../getting_started/documentation.rst:348 +#: ../../getting_started/documentation.rst:367 msgid "Managing your databases" msgstr "Uw databases beheren" -#: ../../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." @@ -706,7 +734,7 @@ msgstr "" "Om toegang te krijgen tot uw database gaat u naar Odoo.com, meld u aan en " "klikt u op **Mijn databases** in de dropdown in de rechterbovenhoek." -#: ../../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" @@ -716,7 +744,7 @@ msgstr "" " voor u upgrade naar een nieuwe versie. Vervuil uw werkomgeving niet met " "test data!" -#: ../../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 " @@ -728,7 +756,7 @@ msgstr "" "omgevingen. Om dit te doen gaat u naar het Odoo.com account op de **Mijn " "Organisaties** pagina en klikt u op **Dupliceren**." -#: ../../getting_started/documentation.rst:371 +#: ../../getting_started/documentation.rst:390 msgid "" "You can find more information on how to manage your databases :ref:`here " "`." @@ -736,11 +764,11 @@ msgstr "" "U kan :ref:`here ` meer informatie vinden over " "hoe uw database te beheren." -#: ../../getting_started/documentation.rst:375 +#: ../../getting_started/documentation.rst:394 msgid "Customer Success" msgstr "Klanten succes" -#: ../../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." @@ -748,7 +776,7 @@ msgstr "" "Odoo is gepassioneerd in het blij maken van onze klanten en ons er van " "verzekeren dat ze alle bronnen nodig hebben om hun project te voltooien." -#: ../../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." @@ -756,7 +784,7 @@ msgstr "" "Tijdens de implementatie fase is uw contactpersoon de projectleider en " "eventueel het ondersteuningsteam." -#: ../../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 " @@ -770,7 +798,7 @@ msgstr "" "klanten. Hij contacteert u om nieuwe versies te tonen, de manier waarop u " "werkt te verbeteren, uw nieuwe noden te beoordelen, enz." -#: ../../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!" @@ -778,10 +806,10 @@ msgstr "" "Ons interne doel is om een klant minstens 10 jaar te behouden en om hen een " "aanbieding aan te bieden die meegroeit met hun noden!" -#: ../../getting_started/documentation.rst:393 +#: ../../getting_started/documentation.rst:412 msgid "Welcome aboard and enjoy your Odoo experience!" msgstr "Welkom aan boord en geniet van uw Odoo ervaring!" -#: ../../getting_started/documentation.rst:396 +#: ../../getting_started/documentation.rst:415 msgid ":doc:`../../db_management/documentation`" msgstr ":doc:`../../db_management/documentation`" diff --git a/locale/nl/LC_MESSAGES/index.po b/locale/nl/LC_MESSAGES/index.po index a4d757461..3871a2951 100644 --- a/locale/nl/LC_MESSAGES/index.po +++ b/locale/nl/LC_MESSAGES/index.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yenthe Van Ginneken , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index f11741710..c02f807e4 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Symons , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -1461,7 +1461,7 @@ msgstr "" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" diff --git a/locale/nl/LC_MESSAGES/manufacturing.po b/locale/nl/LC_MESSAGES/manufacturing.po index fa0fc0cbb..0d2bb0863 100644 --- a/locale/nl/LC_MESSAGES/manufacturing.po +++ b/locale/nl/LC_MESSAGES/manufacturing.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gunther Clauwaert , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -557,7 +557,7 @@ msgstr "Transcriptie" #: ../../manufacturing/overview/main_concepts/intro.rst:13 msgid "Work in progress." -msgstr "Werk in uitvoering (WIP)" +msgstr "Werk in uitvoering." #: ../../manufacturing/overview/main_concepts/terminologies.rst:3 msgid "Manufacturing Terminologies" diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po index 01db94233..5743013f5 100644 --- a/locale/nl/LC_MESSAGES/point_of_sale.po +++ b/locale/nl/LC_MESSAGES/point_of_sale.po @@ -828,7 +828,7 @@ msgstr "Hoe kassabonnen opnieuw te printen?" #: ../../point_of_sale/advanced/reprint.rst:8 msgid "This feature requires a POSBox and a receipt printer." -msgstr "" +msgstr "Deze optie heeft een POSBox en een ticketprinter nodig." #: ../../point_of_sale/advanced/reprint.rst:10 msgid "" @@ -857,7 +857,7 @@ msgstr "Hoe een kassabon opnieuw te printen?" #: ../../point_of_sale/advanced/reprint.rst:27 msgid "" "In the Point of Sale interface click on the **Reprint Receipt** button." -msgstr "" +msgstr "Klik op de **Kassabon opnieuw afdrukken** knop in de Kassa interface." #: ../../point_of_sale/advanced/reprint.rst:32 msgid "The last printed receipt will be printed again." diff --git a/locale/nl/LC_MESSAGES/practical.po b/locale/nl/LC_MESSAGES/practical.po index 39c03e98b..e7b33446c 100644 --- a/locale/nl/LC_MESSAGES/practical.po +++ b/locale/nl/LC_MESSAGES/practical.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yenthe Van Ginneken , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" diff --git a/locale/nl/LC_MESSAGES/project.po b/locale/nl/LC_MESSAGES/project.po index 36504c3cd..eb8f491b5 100644 --- a/locale/nl/LC_MESSAGES/project.po +++ b/locale/nl/LC_MESSAGES/project.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eric Geens , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" diff --git a/locale/nl/LC_MESSAGES/purchase.po b/locale/nl/LC_MESSAGES/purchase.po index f5e19efa4..b2307a60f 100644 --- a/locale/nl/LC_MESSAGES/purchase.po +++ b/locale/nl/LC_MESSAGES/purchase.po @@ -616,7 +616,7 @@ msgstr "569874" #: ../../purchase/purchases/master/import.rst:72 msgid "price" -msgstr "price" +msgstr "prijs" #: ../../purchase/purchases/master/import.rst:72 msgid "Vendor Price -> free text" diff --git a/locale/nl/LC_MESSAGES/website.po b/locale/nl/LC_MESSAGES/website.po index cff9d6541..27ee35036 100644 --- a/locale/nl/LC_MESSAGES/website.po +++ b/locale/nl/LC_MESSAGES/website.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gunther Clauwaert , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -32,7 +32,7 @@ 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:" -msgstr "" +msgstr "Om uw website trafiek te volgen met Google Analytics:" #: ../../website/optimize/google_analytics.rst:7 msgid "" @@ -66,18 +66,21 @@ msgid "" "Documentation. " "`__" msgstr "" +"Om uw eerste stappen te maken in Google Analytics kijkt u best naar de " +"`Google documentatie. " +"`__" #: ../../website/optimize/google_analytics.rst:31 msgid ":doc:`google_analytics_dashboard`" -msgstr "" +msgstr ":doc:`google_analytics_dashboard`" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -95,32 +98,38 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:14 msgid "Select Analytics API." -msgstr "" +msgstr "Selecteer Analytics API." #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." +msgstr "Schakel de API in." + +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:41 msgid "" -"Then 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." +"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 "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -128,20 +137,21 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." -msgstr "" +msgstr "Uiteindelijk krijgt u uw client ID. Kopieer en plak deze in Odoo." -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr "" +"Autoriseer Odoo om toegang te krijgen tot de Google API als laatste stap." #: ../../website/optimize/seo.rst:3 msgid "How to do Search Engine Optimisation in Odoo" @@ -1467,7 +1477,7 @@ msgstr "Publiceer" #: ../../website/publish/domain_name.rst:3 msgid "How to use my own domain name" -msgstr "" +msgstr "Hoe mijn eigen domeinnaam gebruiken" #: ../../website/publish/domain_name.rst:5 msgid "" @@ -1478,7 +1488,7 @@ msgstr "" #: ../../website/publish/domain_name.rst:10 msgid "What is a good domain name" -msgstr "" +msgstr "Wat is een goede domeinnaam" #: ../../website/publish/domain_name.rst:11 msgid "" @@ -1516,23 +1526,23 @@ msgstr "" #: ../../website/publish/domain_name.rst:24 msgid "How to buy a domain name" -msgstr "" +msgstr "Hoe een domeinnaam kopen" #: ../../website/publish/domain_name.rst:25 msgid "Buy your domain name at a popular registrar:" -msgstr "" +msgstr "Koop uw domein bij een populaire registrator:" #: ../../website/publish/domain_name.rst:27 msgid "`GoDaddy `__" -msgstr "" +msgstr "`GoDaddy `__" #: ../../website/publish/domain_name.rst:28 msgid "`Namecheap `__" -msgstr "" +msgstr "`Namecheap `__" #: ../../website/publish/domain_name.rst:29 msgid "`OVH `__" -msgstr "" +msgstr "`OVH `__" #: ../../website/publish/domain_name.rst:31 msgid "" @@ -1542,12 +1552,13 @@ msgstr "" #: ../../website/publish/domain_name.rst:34 msgid "`GoDaddy `__" -msgstr "" +msgstr "`GoDaddy `__" #: ../../website/publish/domain_name.rst:35 msgid "" "`Namecheap `__" msgstr "" +"`Namecheap `__" #: ../../website/publish/domain_name.rst:37 msgid "" @@ -1558,7 +1569,7 @@ msgstr "" #: ../../website/publish/domain_name.rst:42 msgid "How to apply my domain name to my Odoo instance" -msgstr "" +msgstr "Hoe mijn domeinnaam koppelen aan mijn Odoo instantie" #: ../../website/publish/domain_name.rst:43 msgid "" @@ -1568,11 +1579,11 @@ msgstr "" #: ../../website/publish/domain_name.rst:45 msgid "Open your Odoo.com account from your homepage." -msgstr "" +msgstr "Open uw Odoo.com account vanuit uw homepage." #: ../../website/publish/domain_name.rst:50 msgid "Go to the *Manage Databases* page." -msgstr "" +msgstr "Ga naar de *Beheer databases** pagina." #: ../../website/publish/domain_name.rst:55 msgid "" @@ -1604,10 +1615,11 @@ msgstr "" #: ../../website/publish/domain_name.rst:75 msgid "Here are some specific guidelines to create a CNAME record:" msgstr "" +"Hier zijn een paar specifieke richtlijnen om een CNAME record aan te maken:" #: ../../website/publish/domain_name.rst:77 msgid "`GoDaddy `__" -msgstr "" +msgstr "`GoDaddy `__" #: ../../website/publish/domain_name.rst:78 msgid "" @@ -1615,16 +1627,21 @@ msgid "" "`__" msgstr "" +"`Namecheap " +"`__" #: ../../website/publish/domain_name.rst:79 msgid "" "`OVH " "`__" msgstr "" +"`OVH " +"`__" #: ../../website/publish/domain_name.rst:82 msgid "How to enable SSL (HTTPS) for my Odoo instance" -msgstr "" +msgstr "Hoe SSL inschakelen (HTTPS) voor mijn Odoo instantie" #: ../../website/publish/domain_name.rst:84 msgid "" @@ -1634,11 +1651,11 @@ msgstr "" #: ../../website/publish/domain_name.rst:90 msgid ":doc:`../../discuss/email_servers`" -msgstr "" +msgstr ":doc:`../../discuss/email_servers`" #: ../../website/publish/translate.rst:3 msgid "How to translate my website" -msgstr "" +msgstr "Hoe mijn website vertalen" #: ../../website/publish/translate.rst:6 msgid "Overview" diff --git a/locale/ru/LC_MESSAGES/accounting.po b/locale/ru/LC_MESSAGES/accounting.po index 99c4c4b0e..bf2a1fc9b 100644 --- a/locale/ru/LC_MESSAGES/accounting.po +++ b/locale/ru/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Denis Baranov , 2017\n" +"Last-Translator: Sergey Vilizhanin , 2017\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" @@ -2949,6 +2949,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**" @@ -2956,6 +2959,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**" @@ -5146,6 +5152,107 @@ 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 "" @@ -9716,8 +9823,8 @@ 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\"." +"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 diff --git a/locale/ru/LC_MESSAGES/applications.po b/locale/ru/LC_MESSAGES/applications.po index 67f8d7004..6fee96b0b 100644 --- a/locale/ru/LC_MESSAGES/applications.po +++ b/locale/ru/LC_MESSAGES/applications.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-06-07 09:30+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" diff --git a/locale/ru/LC_MESSAGES/crm.po b/locale/ru/LC_MESSAGES/crm.po index 4500495b6..a813000bc 100644 --- a/locale/ru/LC_MESSAGES/crm.po +++ b/locale/ru/LC_MESSAGES/crm.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-06-07 09:30+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" @@ -26,56 +26,97 @@ 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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -337,23 +378,21 @@ msgstr "" 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 ." +" 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 " @@ -364,7 +403,7 @@ msgid "" "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 " diff --git a/locale/ru/LC_MESSAGES/db_management.po b/locale/ru/LC_MESSAGES/db_management.po index 680b84ce9..c6688356e 100644 --- a/locale/ru/LC_MESSAGES/db_management.po +++ b/locale/ru/LC_MESSAGES/db_management.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-06-07 09:30+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" @@ -448,8 +448,8 @@ msgstr "" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" #: ../../db_management/documentation.rst:77 diff --git a/locale/ru/LC_MESSAGES/ecommerce.po b/locale/ru/LC_MESSAGES/ecommerce.po index 472bc9ec3..9ed3968f2 100644 --- a/locale/ru/LC_MESSAGES/ecommerce.po +++ b/locale/ru/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+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" @@ -198,113 +198,115 @@ msgstr "" 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" +"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." @@ -952,7 +954,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" diff --git a/locale/ru/LC_MESSAGES/getting_started.po b/locale/ru/LC_MESSAGES/getting_started.po index 39c75eafc..e5dbfc765 100644 --- a/locale/ru/LC_MESSAGES/getting_started.po +++ b/locale/ru/LC_MESSAGES/getting_started.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-06-07 09:30+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" @@ -467,21 +467,24 @@ msgstr "" #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" +"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 +#: ../../getting_started/documentation.rst:289 msgid "" -"**Customization of reports (PDF):** our project managers have access to " +"**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 " @@ -489,30 +492,59 @@ msgid "" "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 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "" -#: ../../getting_started/documentation.rst:304 +#: ../../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:307 +#: ../../getting_started/documentation.rst:326 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 +#: ../../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 " @@ -520,25 +552,25 @@ msgid "" "fully use in production at the end of the phase." msgstr "" -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "" -#: ../../getting_started/documentation.rst:321 +#: ../../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:326 +#: ../../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:330 +#: ../../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 " @@ -546,42 +578,42 @@ msgid "" "process your feedback." msgstr "" -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr "" -#: ../../getting_started/documentation.rst:338 +#: ../../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 " @@ -589,29 +621,29 @@ msgid "" "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 " "`." 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 " @@ -620,16 +652,16 @@ msgid "" "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 "" diff --git a/locale/ru/LC_MESSAGES/index.po b/locale/ru/LC_MESSAGES/index.po index 67da72a33..24de57a83 100644 --- a/locale/ru/LC_MESSAGES/index.po +++ b/locale/ru/LC_MESSAGES/index.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-06-07 09:30+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" diff --git a/locale/ru/LC_MESSAGES/inventory.po b/locale/ru/LC_MESSAGES/inventory.po index 347e04917..54c1d435a 100644 --- a/locale/ru/LC_MESSAGES/inventory.po +++ b/locale/ru/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+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" @@ -1378,7 +1378,7 @@ msgstr "" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" diff --git a/locale/ru/LC_MESSAGES/manufacturing.po b/locale/ru/LC_MESSAGES/manufacturing.po index 726b2831f..7aa53a793 100644 --- a/locale/ru/LC_MESSAGES/manufacturing.po +++ b/locale/ru/LC_MESSAGES/manufacturing.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-06-07 09:30+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" diff --git a/locale/ru/LC_MESSAGES/practical.po b/locale/ru/LC_MESSAGES/practical.po index 2a9edcd16..b7f4c744b 100644 --- a/locale/ru/LC_MESSAGES/practical.po +++ b/locale/ru/LC_MESSAGES/practical.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-06-07 09:30+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" diff --git a/locale/ru/LC_MESSAGES/project.po b/locale/ru/LC_MESSAGES/project.po index 0300f4e53..f31ddddcf 100644 --- a/locale/ru/LC_MESSAGES/project.po +++ b/locale/ru/LC_MESSAGES/project.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-06-07 09:30+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" diff --git a/locale/ru/LC_MESSAGES/website.po b/locale/ru/LC_MESSAGES/website.po index 7cae8abfa..2cce4b6e8 100644 --- a/locale/ru/LC_MESSAGES/website.po +++ b/locale/ru/LC_MESSAGES/website.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-06-07 09:30+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" @@ -67,12 +67,12 @@ msgid ":doc:`google_analytics_dashboard`" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -94,28 +94,34 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 -msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Then 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." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:41 +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 "" + +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -123,18 +129,18 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr "" diff --git a/locale/tr/LC_MESSAGES/accounting.po b/locale/tr/LC_MESSAGES/accounting.po index ea950525d..7a5f65385 100644 --- a/locale/tr/LC_MESSAGES/accounting.po +++ b/locale/tr/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Güven YILMAZ , 2017\n" +"Last-Translator: Ali Zeynel AĞCA , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2949,6 +2949,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**" @@ -2956,6 +2959,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**" @@ -5146,6 +5152,107 @@ 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 "Banka Fişi" + +#: ../../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 "" @@ -9716,8 +9823,8 @@ 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\"." +"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 diff --git a/locale/tr/LC_MESSAGES/applications.po b/locale/tr/LC_MESSAGES/applications.po index 2b91ef614..858314b0e 100644 --- a/locale/tr/LC_MESSAGES/applications.po +++ b/locale/tr/LC_MESSAGES/applications.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" diff --git a/locale/tr/LC_MESSAGES/crm.po b/locale/tr/LC_MESSAGES/crm.po index 8d8e13e04..3ce2a4468 100644 --- a/locale/tr/LC_MESSAGES/crm.po +++ b/locale/tr/LC_MESSAGES/crm.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Murat Kaplan , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" @@ -27,56 +27,97 @@ 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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -338,23 +379,21 @@ msgstr "" 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 ." +" 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 " @@ -365,7 +404,7 @@ msgid "" "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 " diff --git a/locale/tr/LC_MESSAGES/db_management.po b/locale/tr/LC_MESSAGES/db_management.po index 6133aaa34..f7c545974 100644 --- a/locale/tr/LC_MESSAGES/db_management.po +++ b/locale/tr/LC_MESSAGES/db_management.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" @@ -448,8 +448,8 @@ msgstr "" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" #: ../../db_management/documentation.rst:77 diff --git a/locale/tr/LC_MESSAGES/ecommerce.po b/locale/tr/LC_MESSAGES/ecommerce.po index 0d6ca9578..20cdf2ae0 100644 --- a/locale/tr/LC_MESSAGES/ecommerce.po +++ b/locale/tr/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" @@ -198,113 +198,115 @@ msgstr "" 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" +"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." @@ -952,7 +954,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" diff --git a/locale/tr/LC_MESSAGES/getting_started.po b/locale/tr/LC_MESSAGES/getting_started.po index 2814b333b..2c3fda514 100644 --- a/locale/tr/LC_MESSAGES/getting_started.po +++ b/locale/tr/LC_MESSAGES/getting_started.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" @@ -467,21 +467,24 @@ msgstr "" #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" +"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 +#: ../../getting_started/documentation.rst:289 msgid "" -"**Customization of reports (PDF):** our project managers have access to " +"**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 " @@ -489,30 +492,59 @@ msgid "" "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 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "" -#: ../../getting_started/documentation.rst:304 +#: ../../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:307 +#: ../../getting_started/documentation.rst:326 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 +#: ../../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 " @@ -520,25 +552,25 @@ msgid "" "fully use in production at the end of the phase." msgstr "" -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "" -#: ../../getting_started/documentation.rst:321 +#: ../../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:326 +#: ../../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:330 +#: ../../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 " @@ -546,42 +578,42 @@ msgid "" "process your feedback." msgstr "" -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr "" -#: ../../getting_started/documentation.rst:338 +#: ../../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 " @@ -589,29 +621,29 @@ msgid "" "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 " "`." 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 " @@ -620,16 +652,16 @@ msgid "" "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 "" diff --git a/locale/tr/LC_MESSAGES/index.po b/locale/tr/LC_MESSAGES/index.po index 0c0419743..494448a92 100644 --- a/locale/tr/LC_MESSAGES/index.po +++ b/locale/tr/LC_MESSAGES/index.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" diff --git a/locale/tr/LC_MESSAGES/inventory.po b/locale/tr/LC_MESSAGES/inventory.po index a115e209a..e05ab8b5e 100644 --- a/locale/tr/LC_MESSAGES/inventory.po +++ b/locale/tr/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Güven YILMAZ , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" @@ -1379,7 +1379,7 @@ msgstr "" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" diff --git a/locale/tr/LC_MESSAGES/manufacturing.po b/locale/tr/LC_MESSAGES/manufacturing.po index 4940e7340..581c3a209 100644 --- a/locale/tr/LC_MESSAGES/manufacturing.po +++ b/locale/tr/LC_MESSAGES/manufacturing.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Murat Kaplan , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" diff --git a/locale/tr/LC_MESSAGES/practical.po b/locale/tr/LC_MESSAGES/practical.po index 90aa14706..50128044f 100644 --- a/locale/tr/LC_MESSAGES/practical.po +++ b/locale/tr/LC_MESSAGES/practical.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" diff --git a/locale/tr/LC_MESSAGES/project.po b/locale/tr/LC_MESSAGES/project.po index 596a011ec..e186f18a9 100644 --- a/locale/tr/LC_MESSAGES/project.po +++ b/locale/tr/LC_MESSAGES/project.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Murat Kaplan , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" diff --git a/locale/tr/LC_MESSAGES/website.po b/locale/tr/LC_MESSAGES/website.po index cd6813831..08aada4a4 100644 --- a/locale/tr/LC_MESSAGES/website.po +++ b/locale/tr/LC_MESSAGES/website.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" @@ -67,12 +67,12 @@ msgid ":doc:`google_analytics_dashboard`" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -94,28 +94,34 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 -msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Then 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." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:41 +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 "" + +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -123,18 +129,18 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index 31977eaaa..e585216f4 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yaorong Li <55yaorong.li@gmail.com>, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -3142,6 +3142,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**" @@ -3149,6 +3152,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**" @@ -5431,6 +5437,107 @@ 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 "" @@ -10153,9 +10260,9 @@ 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\"." -msgstr "完成后, 请别忘了将\"信用卡\"科目设为\"允许调节\"。" +"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 #: ../../accounting/receivables/customer_payments/credit_cards.rst:119 diff --git a/locale/zh_CN/LC_MESSAGES/applications.po b/locale/zh_CN/LC_MESSAGES/applications.po index 6ef282735..385f4fd65 100644 --- a/locale/zh_CN/LC_MESSAGES/applications.po +++ b/locale/zh_CN/LC_MESSAGES/applications.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: liAnGjiA , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" diff --git a/locale/zh_CN/LC_MESSAGES/crm.po b/locale/zh_CN/LC_MESSAGES/crm.po index 8d64af24d..8b81cd489 100644 --- a/locale/zh_CN/LC_MESSAGES/crm.po +++ b/locale/zh_CN/LC_MESSAGES/crm.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: zhangpeiqing , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -27,56 +27,97 @@ 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/ " -"`_." +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:11 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" +"Go to `Google APIs platform `__ 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 +#: ../../crm/calendar/google_calendar_credentials.rst:19 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." +"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'" +"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 +#: ../../crm/calendar/google_calendar_credentials.rst:50 msgid "" -"Once done, you will have the both informations (Client ID and Client Secret)" -" that you need to insert in the 2 fields below!" +"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 @@ -371,25 +412,21 @@ msgstr "进入菜单 :menuselection:`销售(Sales) --> 线索(Leads)` , 并点 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 ." +" 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 " @@ -403,7 +440,7 @@ msgstr "" "按钮。如果你没有任何的销售团队呢, :DOC:'你需要先创建一个<../../销售组/设置/ 创建_队伍> `。然后, 点击 **创建** " "并如上图所示的方法填写联系情况。默认情况下, 新创建的机会将出现在您的销售管道的第一个阶段。" -#: ../../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 " diff --git a/locale/zh_CN/LC_MESSAGES/db_management.po b/locale/zh_CN/LC_MESSAGES/db_management.po index dfe5476c9..4e75d15e6 100644 --- a/locale/zh_CN/LC_MESSAGES/db_management.po +++ b/locale/zh_CN/LC_MESSAGES/db_management.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: liAnGjiA , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -464,10 +464,9 @@ msgstr "卸载应用App" #: ../../db_management/documentation.rst:73 msgid "" "Make sure you first test what you are about to do on a :ref:`duplicate " -"` of your database before making any changes (*especially* " -"installing/uninstalling apps)." +"` of your database before making any changes (*especially*" +" installing/uninstalling apps)." msgstr "" -"必须确保在做测试之前创建了正式库的数据库副本:ref:`duplicate ` (*特别是* 添加/删除应用apps)." #: ../../db_management/documentation.rst:77 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/ecommerce.po b/locale/zh_CN/LC_MESSAGES/ecommerce.po index a2b0d79e0..241f2c569 100644 --- a/locale/zh_CN/LC_MESSAGES/ecommerce.po +++ b/locale/zh_CN/LC_MESSAGES/ecommerce.po @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eddie Lim , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -199,113 +199,115 @@ msgstr "" 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" +"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." @@ -953,7 +955,7 @@ msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" "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 " +"only one without any subscription fee. We definitely advise it to any " "starter." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/general.po b/locale/zh_CN/LC_MESSAGES/general.po index 6cca95dbc..ac8f8876b 100644 --- a/locale/zh_CN/LC_MESSAGES/general.po +++ b/locale/zh_CN/LC_MESSAGES/general.po @@ -10,7 +10,7 @@ msgstr "" "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" -"Last-Translator: Jeffery CHEN , 2017\n" +"Last-Translator: Ryan Zhang , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +28,7 @@ msgstr "身份验证" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" -msgstr "" +msgstr "如何允许用户通过他们的Google账号登录" #: ../../general/auth/google.rst:5 msgid "" @@ -44,7 +44,7 @@ msgstr "" #: ../../general/auth/google.rst:15 msgid "Click on **Use Google APIs**" -msgstr "" +msgstr "点击使用 Google APIs" #: ../../general/auth/google.rst:20 msgid "" @@ -766,7 +766,7 @@ msgstr "" #: ../../general/odoo_basics/choose_language.rst:9 msgid "Load your desired language" -msgstr "" +msgstr "加载你想要的语言" #: ../../general/odoo_basics/choose_language.rst:11 msgid "" @@ -789,7 +789,7 @@ msgstr "" #: ../../general/odoo_basics/choose_language.rst:27 msgid "Change your language" -msgstr "" +msgstr "更换你的语言" #: ../../general/odoo_basics/choose_language.rst:29 msgid "" @@ -809,7 +809,7 @@ msgstr "" #: ../../general/odoo_basics/choose_language.rst:45 msgid "Change another user's language" -msgstr "" +msgstr "更换其他用户的语言" #: ../../general/odoo_basics/choose_language.rst:47 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/getting_started.po b/locale/zh_CN/LC_MESSAGES/getting_started.po index ec262aa06..fa8f3cf8a 100644 --- a/locale/zh_CN/LC_MESSAGES/getting_started.po +++ b/locale/zh_CN/LC_MESSAGES/getting_started.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: liAnGjiA , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -496,21 +496,24 @@ msgstr "* *数据导入* *:我们可以做, 或是由项目经理提供模板指 #: ../../getting_started/documentation.rst:283 msgid "" -"If you have subscribed to a **Custom App**, you benefit from following extra" -" services:" -msgstr "如果你有订阅* * 定制应用程序* *, 可得到以下额外服务:" +"If you have subscribed to **Studio**, 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 "* *定制的报告(PDF):* * 项目经理通知开发人员进行高级定制。" +"**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:291 +#: ../../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: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 " @@ -518,30 +521,59 @@ msgid "" "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 +#: ../../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 "" +"All time spent to perform these customizations by our Business Analysts will" +" be deducted from your Success Pack." +msgstr "" + +#: ../../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: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 "Implementation Methodology" msgstr "实施方法论" -#: ../../getting_started/documentation.rst:304 +#: ../../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:307 +#: ../../getting_started/documentation.rst:326 msgid "" "After the kick-off meeting, we define a phasing plan to deploy Odoo " "progressively, by groups of apps." msgstr "启动会议后,我们通过一系列的应用程序定义Odoo的部署阶段计划. " -#: ../../getting_started/documentation.rst:313 +#: ../../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 " @@ -550,11 +582,11 @@ msgid "" msgstr "" "* *启动电话* *的目的是为了让项目经理了解客户的业务, 以便提出(阶段性的)实施计划。每个阶段都会部署一组应用程序, 在上线时都将被用到。" -#: ../../getting_started/documentation.rst:319 +#: ../../getting_started/documentation.rst:338 msgid "For every phase, the steps are the following:" msgstr "对于每个阶段,步骤如下:" -#: ../../getting_started/documentation.rst:321 +#: ../../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" @@ -562,14 +594,14 @@ msgid "" msgstr "" "* *登机:* * Odoo项目经理将根据具体的业务, 与客户一起检查业务流程。这么做的目的是为了培训客户, 确认业务流程, 按照客户的需求进行配置。" -#: ../../getting_started/documentation.rst:326 +#: ../../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 "* *数据:* *手动创建或从现有系统导入。客户负责从现有的系统导出, Odoo的项目经理将数据导入Odoo。" -#: ../../getting_started/documentation.rst:330 +#: ../../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 " @@ -579,18 +611,18 @@ msgstr "" "**培训:** " "若您Odoo实施完成，且已成功导入数据，哈~系统运行顺利啦，您将需要给您的用户们一次培训了啦。培训时会有Odoo项目经理来解答和处理您反馈的问题。" -#: ../../getting_started/documentation.rst:335 +#: ../../getting_started/documentation.rst:354 msgid "**Production**: Once everyone is trained, your users start using Odoo." msgstr " * *生产:* * 一旦培训好, 用户可开始使用Odoo。" -#: ../../getting_started/documentation.rst:338 +#: ../../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 "一旦适应Odoo, 我们将调整过程并做些* *自动化 * *的任务, 剩下的定制也将开发( * *额外的开发和报告* *)。" -#: ../../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 " @@ -598,24 +630,24 @@ msgid "" msgstr "" "一旦所有应用程序都已部署并且用户已适应了Odoo, 项目经理不再为这个项目工作 (除非你有新的需求),如果您有进一步的问题, 可使用售后支持服务。" -#: ../../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 "要访问数据库, 点击Odoo.com, 登录并在右上角的下拉菜单单击* *我的数据库* *。" -#: ../../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 "在系统上线或升级之前, Odoo会让你测试。不会让测试数据扰乱正式环境!" -#: ../../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 " @@ -625,29 +657,29 @@ msgstr "" "你可以创建你想要的免费试用(15天)。这些实例可以即时复制到你的工作环境。如需复制, 在Odoo.com帐户, * *我组织* *页面, 点击* " "*复制* *。" -#: ../../getting_started/documentation.rst:371 +#: ../../getting_started/documentation.rst:390 msgid "" "You can find more information on how to manage your databases :ref:`here " "`." msgstr "关于如何管理你的数据库, 你可以找到更多的信息 :ref:`here `." -#: ../../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 "Odoo在于满足客户所有需求, 使客户满意。" -#: ../../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 " @@ -658,16 +690,16 @@ msgstr "" "一旦系统上线, 你与Odoo项目经理的互动将减少。在那个时候,我们的成功客户团队将与你联系。他们是专业的团队, " "与我们的客户保持长期联系。他们将向你展示新版本,提高你的工作方式 或是 评估你的新需求,等等……" -#: ../../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 "我们的内部目标是与客户保持联系至少10年, 随着客户不同的需求为他们提供解决方案!" -#: ../../getting_started/documentation.rst:393 +#: ../../getting_started/documentation.rst:412 msgid "Welcome aboard and enjoy your Odoo experience!" msgstr "欢迎加入,享受你的Odoo!" -#: ../../getting_started/documentation.rst:396 +#: ../../getting_started/documentation.rst:415 msgid ":doc:`../../db_management/documentation`" msgstr ":doc:`../../db_管理/文档`" diff --git a/locale/zh_CN/LC_MESSAGES/index.po b/locale/zh_CN/LC_MESSAGES/index.po index 869d3a707..1cba1abb6 100644 --- a/locale/zh_CN/LC_MESSAGES/index.po +++ b/locale/zh_CN/LC_MESSAGES/index.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: liAnGjiA , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po index f1edcccf5..3d74530c6 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory.po +++ b/locale/zh_CN/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-05-09 14:24+0200\n" +"POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: 苏州远鼎 , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -1449,11 +1449,10 @@ msgstr "配置提前期" #: ../../inventory/management/delivery/scheduled_dates.rst:15 msgid "" -"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." msgstr "" -"配置 **提前期** 是首要的必要活动, 这样可以计算出来计划日期。提前期是承诺给你的不同的业务伙伴和／或客户的延期(适用于交货, 生产, ……)。" #: ../../inventory/management/delivery/scheduled_dates.rst:19 msgid "Configuration of the different lead times are made as follows:" diff --git a/locale/zh_CN/LC_MESSAGES/manufacturing.po b/locale/zh_CN/LC_MESSAGES/manufacturing.po index 443ea43f1..b1b5982cf 100644 --- a/locale/zh_CN/LC_MESSAGES/manufacturing.po +++ b/locale/zh_CN/LC_MESSAGES/manufacturing.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: fausthuang , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" diff --git a/locale/zh_CN/LC_MESSAGES/practical.po b/locale/zh_CN/LC_MESSAGES/practical.po index ca2c47afa..8f2456e6b 100644 --- a/locale/zh_CN/LC_MESSAGES/practical.po +++ b/locale/zh_CN/LC_MESSAGES/practical.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/project.po b/locale/zh_CN/LC_MESSAGES/project.po index 61c0a4fc2..d8396e594 100644 --- a/locale/zh_CN/LC_MESSAGES/project.po +++ b/locale/zh_CN/LC_MESSAGES/project.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Melody , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" diff --git a/locale/zh_CN/LC_MESSAGES/website.po b/locale/zh_CN/LC_MESSAGES/website.po index cca252ff4..d97339908 100644 --- a/locale/zh_CN/LC_MESSAGES/website.po +++ b/locale/zh_CN/LC_MESSAGES/website.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-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: xiaobin wu , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -68,12 +68,12 @@ msgid ":doc:`google_analytics_dashboard`" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:3 -msgid "How to track your website's traffic from your Odoo Dashboard" +msgid "How to track your website traffic from your Odoo Dashboard" msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" -"You can follow your traffic's statistics straight from your Odoo Website " +"You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" @@ -95,28 +95,34 @@ msgstr "" #: ../../website/optimize/google_analytics_dashboard.rst:19 msgid "" -"Create a new project and give it a name (e.g. Google Analytics in Odoo)." +"Create a new project and give it a name (e.g. Odoo). This project is needed " +"to store your API credentials." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:24 +#: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:29 -msgid "" -"Create credentials to use in Odoo. Select *Web browser (Javascript)* as " -"calling source and *User data* as kind of data." +#: ../../website/optimize/google_analytics_dashboard.rst:30 +msgid "Create credentials to use in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:38 +#: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" -"Then 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." +"Select *Web browser (Javascript)* as calling source and *User data* as kind " +"of data." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:47 +#: ../../website/optimize/google_analytics_dashboard.rst:41 +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 "" + +#: ../../website/optimize/google_analytics_dashboard.rst:51 msgid "" "Go through the Consent Screen step by entering a product name (e.g. Google " "Analytics in Odoo). Feel free to check the customizations options but this " @@ -124,18 +130,18 @@ msgid "" "Client ID in Odoo for the first time." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:52 +#: ../../website/optimize/google_analytics_dashboard.rst:56 msgid "" "Finally you are provided with your Client ID. Copy and paste it in Odoo." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:57 +#: ../../website/optimize/google_analytics_dashboard.rst:61 msgid "" "Open your Website Dashboard in Odoo and link your Analytics account. to past" " your Client ID." msgstr "" -#: ../../website/optimize/google_analytics_dashboard.rst:63 +#: ../../website/optimize/google_analytics_dashboard.rst:67 msgid "As a last step, authorize Odoo to access Google API." msgstr ""