From e528bbcfb5e25ceb5a4969ab132af0158b458079 Mon Sep 17 00:00:00 2001 From: Demesmaeker Date: Thu, 8 Jul 2021 10:37:50 +0200 Subject: [PATCH 1/8] [IMP] amazon_connector: add a note about the new amazon delivery policy task-2573260 --- .../sales/sales/amazon_connector/manage.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/content/applications/sales/sales/amazon_connector/manage.rst b/content/applications/sales/sales/amazon_connector/manage.rst index 7a7edfcb1..79f23c04c 100644 --- a/content/applications/sales/sales/amazon_connector/manage.rst +++ b/content/applications/sales/sales/amazon_connector/manage.rst @@ -39,6 +39,17 @@ at once or ship products partially by using backorders. When a picking related to the order is confirmed, a notification is sent to Amazon who will, in turn, notify the customer that the order (or a part of it) is on its way. +.. important:: + Starting from July 2021, Amazon requires that deliveries be provided with a tracking + reference. This concerns all marketplaces. + + If this is not already done, you need to :ref:`install ` the **Delivery Costs** + module in order to provide the tracking reference. There is unfortunately no workaround to comply + with this new Amazon policy. + +.. seealso:: + - :doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper` + Follow deliveries in FBA ======================== From d30cb941c523390639192f21b2d0485eefa5f82a Mon Sep 17 00:00:00 2001 From: Valentin Chevalier Date: Thu, 8 Jul 2021 15:24:04 +0200 Subject: [PATCH 2/8] [IMP] guidelines: remove a deprecated tag The 'oldname' tag has been deprecated for a few years --- content/developer/misc/other/guidelines.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/developer/misc/other/guidelines.rst b/content/developer/misc/other/guidelines.rst index 3698b9ee3..194ca627e 100644 --- a/content/developer/misc/other/guidelines.rst +++ b/content/developer/misc/other/guidelines.rst @@ -908,10 +908,10 @@ Symbols and Conventions # Fields declaration name = fields.Char(string='Name', default=_default_name) - seats_reserved = fields.Integer(oldname='register_current', string='Reserved Seats', - store=True, readonly=True, compute='_compute_seats') - seats_available = fields.Integer(oldname='register_avail', string='Available Seats', - store=True, readonly=True, compute='_compute_seats') + seats_reserved = fields.Integer(string='Reserved Seats', store=True + readonly=True, compute='_compute_seats') + seats_available = fields.Integer(string='Available Seats', store=True + readonly=True, compute='_compute_seats') price = fields.Integer(string='Price') event_type = fields.Selection(string="Type", selection='_selection_type') From 2b076ce94fcf8df7baa815d1d53654ca7bd629ba Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 11 Jul 2021 01:30:22 +0200 Subject: [PATCH 3/8] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/finance.po | 69 ++++++++++++++++++++++++-------- locale/es/LC_MESSAGES/general.po | 25 +++++++----- 2 files changed, 66 insertions(+), 28 deletions(-) diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index 396173510..21063c5bc 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -56,10 +56,10 @@ # Cinthya Yepez , 2021 # José Cabrera Lozano , 2021 # Patricia Gutiérrez Capetillo , 2021 -# jabelchi, 2021 # cristobal jose espinoza , 2021 # Francisca Gomez , 2021 # Rafnix Guzman , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -68,7 +68,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-05-14 16:39+0000\n" -"Last-Translator: Rafnix Guzman , 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2166,7 +2166,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/setup/bank_accounts.rstNone msgid "Advanced configuration of a bank account in Odoo Accounting" -msgstr "" +msgstr "Configuració avançada d'un compte bancari a Comptabilitat Odoo" #: ../../content/applications/finance/accounting/bank/setup/bank_accounts.rst:93 #: ../../content/applications/finance/accounting/getting_started/initial_configuration/setup.rst:192 @@ -2528,7 +2528,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:10 msgid "`VIDEO WEBINAR OF A COMPLETE DEMO `_." -msgstr "" +msgstr "`VIDEO WEBINAR D'UNA DEMO COMPLETA `_." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst:13 #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:6 @@ -3863,6 +3863,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:45 msgid "You can choose any Odoo journal to post the payslip entries." msgstr "" +"Per a registrar els apunts de nòmina es pot triar qualsevol diari Odoo" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/australia.rst:48 msgid "How does the API work?" @@ -3970,7 +3971,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rstNone msgid "Chilean module to install on Odoo." -msgstr "" +msgstr "Mòdul Xilè per a instal·lar a Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:35 msgid "" @@ -4111,7 +4112,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rstNone msgid "Fiscal reports parameters." -msgstr "" +msgstr "Paràmetres d'informes fiscals" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst:111 #: ../../content/applications/finance/accounting/others/multicurrencies.rst:5 @@ -5269,7 +5270,7 @@ msgstr "Colombia" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:10 msgid "`VIDEO WEBINAR OF A COMPLETE DEMO `_." -msgstr "" +msgstr "`VIDEO WEBINAR D'UNA DEMO COMPLETA `_." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:15 msgid "" @@ -5357,7 +5358,7 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:69 msgid "Configure your report data" -msgstr "" +msgstr "Configureu les dades de l'informe" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst:71 msgid "" @@ -5618,11 +5619,11 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:3 msgid "Colombia (ES)" -msgstr "" +msgstr "Colombia (ES)" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:6 msgid "Introducción" -msgstr "" +msgstr "Introducció" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:8 msgid "" @@ -5638,6 +5639,9 @@ msgid "" "contabilidad, incluyendo la configuración por defecto de los siguientes " "puntos:" msgstr "" +"**l10n_co**: Contiene los datos básicos para manejar el módulo de " +"contabilidad, incluyendo la configuración por defecto de los siguientes " +"puntos:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:15 msgid "Plan Contable" @@ -5683,6 +5687,8 @@ msgid "" "Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " "Instalar a los primeros dos módulos:" msgstr "" +"Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " +"Instalar a los primeros dos módulos:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:46 msgid "Configuración de las credenciales del Servicio Web de Carvajal T&S" @@ -6625,7 +6631,7 @@ msgstr "Utiles Escolares" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:550 msgid "Bienes o servicios para el sector agropecuario" -msgstr "" +msgstr "Bienes o servicios para el sector agropecuario" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:550 msgid "80 UVT - $2.848.560" @@ -6633,37 +6639,43 @@ msgstr "" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:554 msgid "Métodos de Pago:" -msgstr "" +msgstr "Métodos de Pago:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:556 msgid "" "El pago debe realizarse por medios electrónico por ejemplo tarjetas de " "crédito/débito o bien mecanismos de pago online." msgstr "" +"El pago debe realizarse por medios electrónico por ejemplo tarjetas de " +"crédito/débito o bien mecanismos de pago online." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:558 msgid "Limite de unidades:" -msgstr "" +msgstr "Limite de unidades:" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:560 msgid "" "Cada cliente puede adquirir únicamente 3 unidades como máximo de cada " "producto." msgstr "" +"Cada cliente puede adquirir únicamente 3 unidades como máximo de cada " +"producto." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:563 msgid "Medidas en Odoo" -msgstr "" +msgstr "Medidas en Odoo" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:565 msgid "**Preparación de datos**" -msgstr "" +msgstr "**Preparación de datos**" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:567 msgid "" "Crear el Impuesto para Bienes cubiertos de acuerdo a lo indicado en este " "punto: Datos maestros." msgstr "" +"Crear el Impuesto para Bienes cubiertos de acuerdo a lo indicado en este " +"punto: Datos maestros." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:568 msgid "" @@ -6672,6 +6684,10 @@ msgid "" "682. En caso de ser un porcentaje significativo de productos, se recomienda " "actualizar el impuesto de forma temporal en Odoo." msgstr "" +"Identificar los productos y transacciones a los cuales les aplicará la " +"Exclusión de IVA de acuerdo a las condiciones establecidas en el decreto " +"682. En caso de ser un porcentaje significativo de productos, se recomienda " +"actualizar el impuesto de forma temporal en Odoo." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:571 msgid "" @@ -6679,6 +6695,9 @@ msgid "" "campo IVA Venta el cual será sustituido temporalmente por el IVA de Bienes " "Cubiertos." msgstr "" +"Exportar un listado con los productos que serán afectados incluyendo el " +"campo IVA Venta el cual será sustituido temporalmente por el IVA de Bienes " +"Cubiertos." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:573 msgid "" @@ -6686,10 +6705,13 @@ msgid "" "día sin IVA, se debe hacer la actualización temporal a IVA de Bienes " "Cubiertos." msgstr "" +"Al finalizar las operaciones del día anterior a las fechas establecidas de " +"día sin IVA, se debe hacer la actualización temporal a IVA de Bienes " +"Cubiertos." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:579 msgid "**Durante el día SIN IVA**" -msgstr "" +msgstr "**Durante el día SIN IVA**" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:581 msgid "" @@ -6697,12 +6719,17 @@ msgid "" "cubiertos serán generados con este parámetro tanto en Órdenes de venta como " "facturas creadas durante ese mismo día." msgstr "" +"Por defecto los productos previamente considerados con IVA de Bienes " +"cubiertos serán generados con este parámetro tanto en Órdenes de venta como " +"facturas creadas durante ese mismo día." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:587 msgid "" "Las órdenes de venta generadas con este impuesto deberán ser facturas el " "mismo día." msgstr "" +"Las órdenes de venta generadas con este impuesto deberán ser facturas el " +"mismo día." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:588 msgid "" @@ -6710,16 +6737,21 @@ msgid "" " realizado en efectivo) el impuesto deberá ser actualizado manualmente al " "momento de facturar." msgstr "" +"En caso de que alguna de las condiciones no sea cumplida (ejemplo el pago es" +" realizado en efectivo) el impuesto deberá ser actualizado manualmente al " +"momento de facturar." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:591 msgid "**Posterior al día SIN IVA**" -msgstr "" +msgstr "**Posterior al día SIN IVA**" #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:593 msgid "" "Los productos que fueron actualizados deberá ser reconfigurados a su IVA " "original." msgstr "" +"Los productos que fueron actualizados deberá ser reconfigurados a su IVA " +"original." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst:594 msgid "" @@ -6727,6 +6759,9 @@ msgid "" "incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual " "correspondiente al IVA convencional." msgstr "" +"En caso de que se detecte alguna Orden de venta facturar en la cual se " +"incluya IVA de Bienes Cubiertos, se deberá realizar actualización manual " +"correspondiente al IVA convencional." #: ../../content/applications/finance/accounting/fiscal_localizations/localizations/france.rst:3 msgid "France" diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po index e4c31ce60..cce3cec81 100644 --- a/locale/es/LC_MESSAGES/general.po +++ b/locale/es/LC_MESSAGES/general.po @@ -24,7 +24,8 @@ # Jesús Alan Ramos Rodríguez , 2021 # Lina Maria Avendaño Carvajal , 2021 # Pablo Rojas , 2021 -# Josep Anton Belchi Riera, 2021 +# Xabi Spacebiker , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -33,7 +34,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2019-10-03 09:46+0000\n" -"Last-Translator: Josep Anton Belchi Riera, 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -128,7 +129,7 @@ msgstr "|ajustes|" #: ../../content/applications/general.rst:140 #: ../../content/applications/general.rst:140 msgid "settings" -msgstr "" +msgstr "configuració" #: ../../content/applications/general.rst:58 msgid "|browse_users|" @@ -203,7 +204,7 @@ msgstr "|buscar_aplicaciones|" #: ../../content/applications/general.rst:141 #: ../../content/applications/general.rst:141 msgid "browse_apps" -msgstr "" +msgstr "browse_apps" #: ../../content/applications/general.rst:98 msgid "" @@ -292,13 +293,15 @@ msgstr "" #: ../../content/applications/general.rst:147 msgid "Activate the developer mode (debug mode)" -msgstr "" +msgstr "Activar el modo de desarrollador (modo depuración)" #: ../../content/applications/general.rst:149 msgid "" "The developer mode (or debug mode) gives you access to extra and advanced " "tools." msgstr "" +"El modo de desarrollador (o de depuración) le da acceso a herramientas " +"adicionales y avanzadas." #: ../../content/applications/general.rst:152 msgid "Through the Settings application" @@ -754,11 +757,11 @@ msgstr "" #: ../../content/applications/general/export_import_data.rst:3 msgid "Export and import data" -msgstr "" +msgstr "Exportar i importar dades" #: ../../content/applications/general/export_import_data.rst:8 msgid "Export data from Odoo" -msgstr "" +msgstr "Exportar dades des de Odoo" #: ../../content/applications/general/export_import_data.rst:10 msgid "" @@ -3280,7 +3283,7 @@ msgstr "" #: ../../content/applications/general/unsplash.rst:49 msgid "You should first create and set up your Unsplash application." -msgstr "" +msgstr "Primer cal crear i configurar la vostra aplicació Unsplash." #: ../../content/applications/general/unsplash.rst:51 msgid "" @@ -3643,7 +3646,7 @@ msgstr "" #: ../../content/applications/general/users/language.rst:3 msgid "Change language" -msgstr "" +msgstr "Canviar idioma" #: ../../content/applications/general/users/language.rst:5 msgid "" @@ -4065,7 +4068,7 @@ msgstr "" #: ../../content/applications/general/voip/axivox.rst:37 msgid "Configure the VOIP user in the Odoo's user" -msgstr "" +msgstr "Configurar l'usuari VOIP a l'usuari Odoo" #: ../../content/applications/general/voip/axivox.rst:39 msgid "" @@ -4118,7 +4121,7 @@ msgstr "" #: ../../content/applications/general/voip/axivox.rstNone msgid "Incoming VoIP call in Odoo" -msgstr "" +msgstr "Trucada VoIP d'entrada a Odoo" #: ../../content/applications/general/voip/axivox.rst:72 msgid "" From bc257a8f5eaba44c06455ef5193feb0ec14cff31 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 11 Jul 2021 02:30:18 +0200 Subject: [PATCH 4/8] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/finance.po | 10 ++++++---- locale/es/LC_MESSAGES/settings.po | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index a3201d780..433286dd1 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -52,8 +52,8 @@ # Jon Perez , 2021 # Althay Ramallo Fuentes , 2021 # Cinthya Yepez , 2021 -# Josep Anton Belchi Riera, 2021 # cristobal jose espinoza , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -62,7 +62,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:19+0000\n" -"Last-Translator: cristobal jose espinoza , 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2595,7 +2595,7 @@ msgstr "" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:3 msgid "Colombia (ES)" -msgstr "" +msgstr "Colombia (ES)" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:5 msgid "**Facturación Electrónica para Colombia**" @@ -2603,7 +2603,7 @@ msgstr "" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:8 msgid "Introducción" -msgstr "" +msgstr "Introducció" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:10 msgid "" @@ -2665,6 +2665,8 @@ msgid "" "Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " "Instalar a los primeros dos módulos:" msgstr "" +"Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " +"Instalar a los primeros dos módulos:" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:39 msgid "cz" diff --git a/locale/es/LC_MESSAGES/settings.po b/locale/es/LC_MESSAGES/settings.po index b906a562c..598ce50a9 100644 --- a/locale/es/LC_MESSAGES/settings.po +++ b/locale/es/LC_MESSAGES/settings.po @@ -8,7 +8,8 @@ # Jesús Alan Ramos Rodríguez , 2021 # Lina Maria Avendaño Carvajal , 2021 # Pablo Rojas , 2021 -# Josep Anton Belchi Riera, 2021 +# Xabi Spacebiker , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:22+0000\n" -"Last-Translator: Josep Anton Belchi Riera, 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,7 +122,7 @@ msgstr "|ajustes|" #: ../../content/applications/settings/users_and_features.rst:126 #: ../../content/applications/settings/users_and_features.rst:126 msgid "settings" -msgstr "" +msgstr "configuració" #: ../../content/applications/settings/users_and_features.rst:43 msgid "|browse_users|" @@ -198,7 +199,7 @@ msgstr "|buscar_aplicaciones|" #: ../../content/applications/settings/users_and_features.rst:127 #: ../../content/applications/settings/users_and_features.rst:127 msgid "browse_apps" -msgstr "" +msgstr "browse_apps" #: ../../content/applications/settings/users_and_features.rst:84 msgid "" From 69364e7ddb00ffd210c2ee5e7de75321e1020486 Mon Sep 17 00:00:00 2001 From: "Jonathan Castillo (jcs)" Date: Fri, 16 Jul 2021 07:37:04 +0200 Subject: [PATCH 5/8] [IMP] accounting: remove deprecated tip in "reconciliation/use_cases" task-2605395 --- .../finance/accounting/bank/reconciliation/use_cases.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases.rst b/content/applications/finance/accounting/bank/reconciliation/use_cases.rst index ccb2ed57f..83ee5217b 100644 --- a/content/applications/finance/accounting/bank/reconciliation/use_cases.rst +++ b/content/applications/finance/accounting/bank/reconciliation/use_cases.rst @@ -101,8 +101,5 @@ right and validate all related payments : .. image:: media/use10.png :align: center -.. tip:: - Hit CTRL-Enter to reconcile all the balanced items in the sheet. - .. seealso:: * :doc:`../feeds/bank_synchronization` \ No newline at end of file From ec10063ab99e40b663c8d93edea65a410f44308d Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 18 Jul 2021 01:30:26 +0200 Subject: [PATCH 6/8] [I18N] Update translation terms from Transifex --- locale/nl/LC_MESSAGES/finance.po | 89 +++++++++++++++++++++--------- locale/nl/LC_MESSAGES/general.po | 32 +++++++---- locale/nl/LC_MESSAGES/index.po | 10 +++- locale/nl/LC_MESSAGES/marketing.po | 89 ++++++++++++++++++++++-------- locale/nl/LC_MESSAGES/sales.po | 2 + locale/nl/LC_MESSAGES/services.po | 4 +- locale/nl/LC_MESSAGES/sphinx.po | 5 +- locale/nl/LC_MESSAGES/websites.po | 6 +- 8 files changed, 169 insertions(+), 68 deletions(-) diff --git a/locale/nl/LC_MESSAGES/finance.po b/locale/nl/LC_MESSAGES/finance.po index 81368877a..2d0cf6762 100644 --- a/locale/nl/LC_MESSAGES/finance.po +++ b/locale/nl/LC_MESSAGES/finance.po @@ -8,7 +8,6 @@ # Cas Vissers , 2021 # Odoo Experts Consultants , 2021 # Thomas Pot , 2021 -# Gunther Clauwaert , 2021 # Maxim Vandenbroucke , 2021 # Julia van Orsouw , 2021 # Cas Vissers , 2021 @@ -16,6 +15,7 @@ # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Eric Geens , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-05-14 16:39+0000\n" -"Last-Translator: Eric Geens , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -38,7 +38,7 @@ msgstr "Boekhouding" #: ../../content/applications/finance/accounting.rst:5 msgid "Accounting and Invoicing" -msgstr "" +msgstr "Boekhouding & Facturatie" #: ../../content/applications/finance/accounting.rst:19 msgid "" @@ -64,10 +64,13 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:33 msgid "`Odoo Invoicing: product page `_" msgstr "" +"`Odoo Facturatie: product pagina `_" #: ../../content/applications/finance/accounting.rst:34 msgid "`Odoo Accounting: product page `_" msgstr "" +"`Odoo Boekhouding: product pagina " +"`_" #: ../../content/applications/finance/accounting.rst:37 msgid "Double-entry bookkeeping" @@ -118,6 +121,8 @@ msgstr "" msgid "" "Users can access several companies but always work in one company at a time." msgstr "" +"Gebruikers kunnen toegang hebben tot meerdere bedrijven, maar werken altijd " +"in één bedrijf tegelijk." #: ../../content/applications/finance/accounting.rst:68 msgid "Multi-currencies" @@ -148,6 +153,10 @@ msgid "" "modules exist per country for the specificities of the country like the " "chart of accounts, taxes, or bank interfaces." msgstr "" +"Odoo boekhouding ondersteunt meer dan 50 landen. De kernboekhouding van Odoo" +" implementeert algemene boekhoudnormen voor alle landen. Er zijn per land " +"specifieke modules met specifieke kenmerken van het land, zoals het " +"rekeningschema, belastingen of bankinterfaces." #: ../../content/applications/finance/accounting.rst:88 msgid "In particular, Odoo's core accounting engine supports:" @@ -163,14 +172,16 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:94 msgid "European accounting where expenses are accounted at the supplier bill." msgstr "" +"Europese boekhouding waarbij kosten worden geboekt op de " +"leveranciersfactuur." #: ../../content/applications/finance/accounting.rst:97 msgid "Odoo has modules to comply with IFRS rules." -msgstr "" +msgstr "Odoo heeft ook modules die voldoen aan de IFRS regels." #: ../../content/applications/finance/accounting.rst:100 msgid "Accounts Receivable and Payable" -msgstr "" +msgstr "Debiteuren en crediteuren rekeningen" #: ../../content/applications/finance/accounting.rst:102 msgid "" @@ -196,6 +207,9 @@ msgid "" "range from basic accounting reports to advanced management reports. Odoo's " "reports include:" msgstr "" +"In Odoo kunt u in realtime financiële rapporten genereren. De rapporten van " +"Odoo variëren van eenvoudige boekhoudrapporten tot geavanceerde " +"managementrapporten. De rapporten van Odoo omvatten:" #: ../../content/applications/finance/accounting.rst:118 msgid "Performance reports (such as Profit and Loss, Budget Variance)" @@ -248,7 +262,7 @@ msgstr "" #: ../../content/applications/finance/accounting.rst:145 msgid "Calculate the tax you owe your tax authority" -msgstr "" +msgstr "Bereken de belasting die u verschuldigd bent aan de belastingdienst" #: ../../content/applications/finance/accounting.rst:147 msgid "" @@ -314,12 +328,16 @@ msgid "" "We recommend you use bank synchronization for more efficiency. Please read " "the related documentation: :doc:`bank_synchronization`." msgstr "" +"Dit gaat het makkelijkst door te synchroniseren met uw bank. Meer informatie" +" in de documentatie: :doc:`bank_synchronization`:" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:12 msgid "" "However, if you don't want to use bank synchronization or if your bank is " "not a supported institution, you still have other options:" msgstr "" +"Als uw bankrekening niet gesynchroniseerd is met Odoo of uw bank is niet " +"ondersteund, heeft u nog steeds twee opties:" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:15 msgid "Import the bank statement files delivered by your bank" @@ -336,14 +354,15 @@ msgstr "Importeer bankafschrift bestanden" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:21 msgid "Odoo supports multiple file formats to import bank statements:" msgstr "" +"Ondersteunt meerdere bestandsformaten om bankafschriften te importeren:" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:23 msgid "SEPA recommended Cash Management format (CAMT.053)" -msgstr "" +msgstr "SEPA aanbevolen Cash Management formaat (CAMT.053)" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:24 msgid "Comma-separated values (.CSV)" -msgstr "" +msgstr "Comma Separated values (CSV)" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:25 msgid "Open Financial Exchange (.OFX)" @@ -355,7 +374,7 @@ msgstr "Quicken Interchange Format (.QIF)" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:27 msgid "Belgium: Coded Statement of Account (.CODA)" -msgstr "" +msgstr "België: Coded Statement of Account (.CODA)" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:29 msgid "" @@ -366,22 +385,27 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rstNone msgid "Import a bank statement file in Odoo Accounting" -msgstr "" +msgstr "Importeer uw bankafschriften in Odoo Boekhouding" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:36 msgid "Next, select the file you want to import and click on *Import*." msgstr "" +"Selecteer vervolgens het bestand dat u wilt importeren en klik op " +"*Importeren*." #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:38 msgid "" "Odoo opens an **import widget** to help you set the **Formatting Options** " "and **map** the different columns you want to import." msgstr "" +"Odoo opent een **importwidget** om u te helpen bij het instellen van de " +"**Opmaakopties** en **het koppelen** van de verschillende kolommen die u " +"wilt importeren." #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rstNone #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rstNone msgid "Register bank statements manually in Odoo Accounting" -msgstr "" +msgstr "Registreer manueel bankafschriften in Odoo Boekhouding" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:46 msgid "" @@ -395,7 +419,7 @@ msgstr "Registreer manueel bankafschriften" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:52 msgid "If needed, you can also record your bank statements manually." -msgstr "" +msgstr "U kan ook manueel bankafschriften registreren" #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:54 msgid "" @@ -407,6 +431,8 @@ msgstr "" msgid "" "Add a new line for each transaction written on the original bank statement." msgstr "" +"Voeg een nieuwe regel toe voor elke transactie op het originele " +"bankafschrift." #: ../../content/applications/finance/accounting/bank/feeds/bank_statements.rst:59 msgid "" @@ -440,7 +466,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:3 msgid "Bank Synchronization: Automatic Import" -msgstr "" +msgstr "Bank synchronisatie: Automatisch Importeren" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:5 msgid "" @@ -474,6 +500,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:21 msgid "To connect to the banks, Odoo uses multiple web-services:" msgstr "" +"Om verbinding te maken met de banken, gebruikt Odoo meerdere webservices:" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:23 msgid "**Plaid**: Mainly for the U.S" @@ -481,7 +508,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:24 msgid "**Yodlee**: Worldwide" -msgstr "" +msgstr "**Yodlee**: Wereldwijd" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:25 msgid "" @@ -642,17 +669,19 @@ msgid "" "**Enterprise Version**: Yes, if you have a valid enterprise contract linked " "to your database." msgstr "" +"Enterprise versie: Ja, als er een geldig enterprise contract is gekoppeld " +"aan uw database." #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:91 msgid "" "**Community Version**: No, this feature is not included in the Community " "Version." -msgstr "" +msgstr "Community Versie: Nee, deze functie zit niet in de Community Versie" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:92 msgid "" "**Online Version**: Yes, even if you benefit from the One App Free contract." -msgstr "" +msgstr "Online Versie: Ja, zelfs als u een One App Free contract heeft." #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:95 msgid "Some banks have a status \"Beta,\" what does this mean?" @@ -671,6 +700,8 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:103 msgid "Why do my transactions only synchronize when I refresh manually?" msgstr "" +"Waarom worden mijn transacties alleen gesynchroniseerd als ik handmatig " +"ververs?" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:105 msgid "" @@ -682,7 +713,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:110 msgid "Not all of my past transactions are in Odoo, why?" -msgstr "" +msgstr "Waarom zijn oudere transacties niet meer zichtbaar in Odoo?" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:112 msgid "Transactions can only be fetched up to 3 months in the past." @@ -708,7 +739,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:123 msgid "How can I update my bank credentials?" -msgstr "" +msgstr "Hoe kan ik mijn bankgegevens bijwerken?" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:124 msgid "" @@ -725,7 +756,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/bank_synchronization.rst:130 #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:116 msgid ":doc:`bank_statements`" -msgstr "" +msgstr ":doc:`bank_statements`" #: ../../content/applications/finance/accounting/bank/feeds/paypal.rst:3 msgid "Synchronize your PayPal account with Odoo" @@ -859,11 +890,16 @@ msgid "" "one app. It is a third-party solution that is continuously expanding the " "number of bank institutions that can be synchronized with Odoo." msgstr "" +"**Ponto** is een service waarmee bedrijven en professionals hun rekeningen " +"op één plek kunnen samenvoegen en direct al hun transacties in één app " +"kunnen zien. Het is een third-party oplossing die het aantal " +"bankinstellingen dat met Odoo kan worden gesynchroniseerd voortdurend " +"uitbreidt." #: ../../content/applications/finance/accounting/bank/feeds/ponto.rstNone #: ../../content/applications/finance/accounting/bank/feeds/ponto.rstNone msgid "Logo of the Ponto brand" -msgstr "" +msgstr "Logo van het merk Ponto" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:13 msgid "" @@ -888,11 +924,12 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:31 msgid "Link your bank accounts with Ponto" -msgstr "" +msgstr "Koppel uw bankrekeningen aan Ponto" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:33 msgid "Go to `Ponto's website (https://myponto.com) `_." msgstr "" +"Ga naar `Ponto's website (https://myponto.com) `_." #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:34 msgid "Create an account if you don’t have one yet." @@ -900,7 +937,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:35 msgid "Once you are logged in, create an *organization*." -msgstr "" +msgstr "Nadat u bent ingelogd, maakt u een *organisatie* aan." #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:0 msgid "Fill out the form to add an organization in Ponto" @@ -912,7 +949,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:0 msgid "You might have to add your **Billing Information** first." -msgstr "" +msgstr "Mogelijk moet u eerst uw **Factureringsgegevens** toevoegen." #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:42 msgid "" @@ -928,7 +965,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:50 msgid "Link your Ponto account with your Odoo database" -msgstr "" +msgstr "Link uw Ponto account aan uw Odoo databank" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:52 msgid "" @@ -981,7 +1018,7 @@ msgstr "" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:81 msgid "Update your synchronization credentials" -msgstr "" +msgstr "Werk uw synchronisatiegegevens bij" #: ../../content/applications/finance/accounting/bank/feeds/ponto.rst:83 msgid "" @@ -14083,6 +14120,8 @@ msgid "" "If you are on Odoo Online (SAAS) and have the Enterprise version, you " "benefit from free trial credits to test the feature." msgstr "" +"Als u Odoo Online (SAAS) gebruikt of de Enterprise-versie hebt, profiteert u" +" van gratis proeftegoeden om de functie te testen." #: ../../content/applications/finance/accounting/payables/supplier_bills/ocr.rst:52 #: ../../content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst:45 diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index a8ccfe6ad..4f6ae73f7 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -4,13 +4,13 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Gunther Clauwaert , 2019 # Erwin van der Ploeg , 2020 # Eric Geens , 2020 # Pol Van Dingenen , 2021 # Maxim Vandenbroucke , 2021 # Martin Trigaux, 2021 # Yenthe Van Ginneken , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2019-10-03 09:46+0000\n" -"Last-Translator: Yenthe Van Ginneken , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -241,18 +241,21 @@ msgid "" "The developer mode (or debug mode) gives you access to extra and advanced " "tools." msgstr "" +"De ontwikkelaarsmodus (of debug-modus) geeft je toegang tot extra en " +"geavanceerde tools." #: ../../content/applications/general.rst:152 msgid "Through the Settings application" -msgstr "" +msgstr "Via de applicatie Instellingen" #: ../../content/applications/general.rst:154 msgid "Go to :menuselection:`Settings --> Activate the developer mode`." msgstr "" +"Ga naar :menuselection:`Instellingen --> Activeer de ontwikkelaars mode`." #: ../../content/applications/general.rstNone msgid "Overview of the debug options under settings in Odoo" -msgstr "" +msgstr "Overzicht in Odoo van de debug opties onder instellingen" #: ../../content/applications/general.rst:161 msgid "" @@ -265,10 +268,12 @@ msgid "" "Once activated, the *Deactivate the developer mode* option becomes " "available." msgstr "" +"Eenmaal geactiveerd, wordt de optie *Deactiveer de ontwikkelaars mode* " +"beschikbaar." #: ../../content/applications/general.rst:167 msgid "Through a browser extension" -msgstr "" +msgstr "Via een browserextensie" #: ../../content/applications/general.rst:170 msgid "" @@ -286,33 +291,36 @@ msgstr "" #: ../../content/applications/general.rstNone msgid "View of odoo’s debug icon in a chrome’s toolbar" -msgstr "" +msgstr "Weergave van odoo's debug-pictogram in de werkbalk van Chrome" #: ../../content/applications/general.rst:179 msgid "Through the URL" -msgstr "" +msgstr "Via de URL" #: ../../content/applications/general.rst:181 msgid "In the URL add ``?debug=1`` or ``?debug=true`` after *web*." -msgstr "" +msgstr "Voeg In de URL ``?debug=1`` of ``?debug=true`` toe na *web*." #: ../../content/applications/general.rstNone msgid "Overview of an url with the debug mode command added in Odoo" -msgstr "" +msgstr "Overzicht van een url met het debug mode commando toegevoegd in Odoo" #: ../../content/applications/general.rst:188 msgid "Developers: type ``?debug=assets`` and activate the mode with assets." msgstr "" +"Ontwikkelaars: type ``?debug=assets`` en activeer de modus met assets." #: ../../content/applications/general.rst:191 msgid "Locate the mode tools" -msgstr "" +msgstr "Zoek de modushulpmiddelen" #: ../../content/applications/general.rst:193 msgid "" "The Developer mode tools can be accessed from the *Open Developer Tools* " "button, located on the header of your pages." msgstr "" +"De tools in de ontwikkelaarsmodus zijn toegankelijk via de knop *Open " +"Developer Tools*, die zich in de kop van uw pagina's bevindt." #: ../../content/applications/general.rstNone msgid "Overview of a console page and the debug icon being shown in Odoo" @@ -320,13 +328,15 @@ msgstr "" #: ../../content/applications/general.rst:201 msgid "Mobile Push Notifications" -msgstr "" +msgstr "Mobiele Push Notificaties" #: ../../content/applications/general.rst:203 msgid "" "As of Odoo 12.0, 13.0 or above, there is no more complex configuration to " "enable push notifications in the mobile app." msgstr "" +"Vanaf Odoo 12.0, 13.0 of hoger is er geen complexe configuratie meer om " +"pushmeldingen in de mobiele app in te schakelen." #: ../../content/applications/general.rst:206 msgid "" diff --git a/locale/nl/LC_MESSAGES/index.po b/locale/nl/LC_MESSAGES/index.po index bec17624c..0045dbefe 100644 --- a/locale/nl/LC_MESSAGES/index.po +++ b/locale/nl/LC_MESSAGES/index.po @@ -3,13 +3,17 @@ # This file is distributed under the same license as the Odoo package. # FIRST AUTHOR , YEAR. # +# Translators: +# Gunther Clauwaert , 2021 +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: Odoo 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-14 17:10+0200\n" +"POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2019-10-03 09:46+0000\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -17,6 +21,6 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../content/index.rst:3 +#: ../../content/index.rst:5 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" diff --git a/locale/nl/LC_MESSAGES/marketing.po b/locale/nl/LC_MESSAGES/marketing.po index e04d9fa65..3434eaa3a 100644 --- a/locale/nl/LC_MESSAGES/marketing.po +++ b/locale/nl/LC_MESSAGES/marketing.po @@ -8,6 +8,7 @@ # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Eric Geens , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-05-14 16:39+0000\n" -"Last-Translator: Eric Geens , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -860,7 +861,7 @@ msgstr "" #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:10 msgid "Let’s consider the example below:" -msgstr "" +msgstr "Laten we van het onderstaande voorbeeld uitgaan:" #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rstNone #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rstNone @@ -879,13 +880,15 @@ msgstr "" #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:20 msgid "A total number of 20 records match the criteria." -msgstr "" +msgstr "In totaal voldoen 20 records aan de criteria." #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:28 msgid "" "Out of those 20 records, 25 have become participants, in other words, they " "have matched the criteria." msgstr "" +"Van die 20 records zijn er 25 deelnemers geworden, met andere woorden, ze " +"voldeden aan de criteria." #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:36 msgid "" @@ -899,6 +902,8 @@ msgid "" "The filter here is applied to *all* activities. Leads that lose the tag in " "the meantime will be excluded from later activities." msgstr "" +"Het filter hier wordt toegepast op *alle* activiteiten. Leads die de tag in " +"de tussentijd verliezen, worden uitgesloten van latere activiteiten." #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:45 msgid "" @@ -936,12 +941,16 @@ msgid "" "If a participant does not match the conditions, it will be added to " "*Rejected*." msgstr "" +"Als een deelnemer niet aan de voorwaarden voldoet, wordt deze toegevoegd aan" +" *Geweigerd*." #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:71 msgid "" "Hovering over the graph, you can see the number of successful and rejected " "participants, per day, for the last 15 days." msgstr "" +"Door over de grafiek te bewegen, ziet u het aantal succesvolle en geweigerde" +" deelnemers, per dag, voor de afgelopen 15 dagen." #: ../../content/applications/marketing/marketing_automation/advanced/understanding_metrics.rst:75 msgid "" @@ -1537,45 +1546,51 @@ msgstr "" #: ../../content/applications/marketing/sms_marketing/pricing.rst:5 msgid "Pricing and FAQ" -msgstr "" +msgstr "Prijzen en FAQ" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:3 msgid "SMS Pricing and FAQ" -msgstr "" +msgstr "SMS Prijzen en FAQ" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:6 msgid "What do I need to send SMSs?" -msgstr "" +msgstr "Wat heb ik nodig om te sms'en?" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:7 msgid "" "SMS Text Messaging is an In-App Purchase (IAP) service that *requires " "prepaid credits* to work." msgstr "" +"SMS-tekstberichten zijn een in-app-aankoopservice (IAP) waarvoor *prepaid " +"tegoeden* vereist zijn om te werken." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:11 msgid "How many types of SMSs are there?" -msgstr "" +msgstr "Hoeveel soorten sms'en zijn er?" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:12 msgid "There are 2 types: GSM7 and UNICODE." -msgstr "" +msgstr "Er zijn 2 types: GSM7 en UNICODE." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:14 msgid "" "**GSM7** is the standard format, with a limit of 160 characters per message," " that includes the following characters:" msgstr "" +"**GSM7** is het standaardformaat, met een limiet van 160 tekens per bericht," +" dat de volgende tekens bevat:" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rstNone msgid "GSM7 in Odoo SMS Marketing" -msgstr "" +msgstr "GSM7 in Odoo SMS Marketing" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:23 msgid "" "**UNICODE** is the format applied if a special character, that *is not* in " "the GSM7 list, is used. Limit per SMS: 70 characters." msgstr "" +"**UNICODE** is het formaat dat wordt toegepast als een speciaal teken, dat " +"*niet* in de GSM7-lijst staat, wordt gebruikt. Limiet per sms: 70 tekens." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:27 msgid "" @@ -1585,42 +1600,53 @@ msgid "" "system will inform you in real-time about the number of SMS your message " "represents." msgstr "" +"Voor GSM7-sms is de maximale grootte 160 tekens en voor Unicode 70. *Boven " +"deze limieten is de inhoud verdeeld in een uit meerdere delen bestaand " +"bericht* en wordt de limiet van tekens verlaagd tot 153 voor GSM7 en tot 67 " +"voor Unicode. Het systeem informeert u in realtime over het aantal sms'jes " +"dat uw bericht vertegenwoordigt." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:34 msgid "How much does it cost to send an SMS?" -msgstr "" +msgstr "Hoeveel kost het om een ​​sms te versturen?" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:35 msgid "" "The price of an SMS depends on the destination and the length (number of " "characters) of the message." msgstr "" +"De prijs van een sms is afhankelijk van de bestemming en de lengte (aantal " +"tekens) van het bericht." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:37 msgid "" "To see the **price per country, please consult**: `Odoo SMS - FAQ `_." msgstr "" +"Om de **prijs per land te zien, raadpleeg**: `Odoo SMS - FAQ `_." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:39 msgid "" "The number of SMSs a message represents will be always available to you in " "your database." msgstr "" +"Het aantal sms'jes dat een bericht vertegenwoordigt is beschikbaar in uw " +"database." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rstNone #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rstNone #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rstNone msgid "SMS pricing and FAQ Odoo SMS Marketing" -msgstr "" +msgstr "SMS prijzen en FAQ Odoo SMS Marketing" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:49 msgid "How do I buy credits?" -msgstr "" +msgstr "Hoe koop ik tegoeden?" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:50 msgid "Go to :menuselection:`Settings --> Buy Credits`." -msgstr "" +msgstr "Ga naar :menuselection:`Instellingen --> Koop Krediet`." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:57 msgid "Or go to :menuselection:`Settings --> View my Services`." @@ -1631,32 +1657,36 @@ msgid "" "If you are on Odoo Online (SAAS) and have the Enterprise version, you " "benefit from free trial credits to test the feature." msgstr "" +"Als u Odoo Online (SAAS) gebruikt of de Enterprise-versie hebt, profiteert u" +" van gratis proeftegoeden om de functie te testen." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:70 msgid "More common questions" -msgstr "" +msgstr "Meer veelgestelde vragen" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:72 msgid "**Is there an expiration time for my credits?**" -msgstr "" +msgstr "**Kunnen mijn tegoeden vervallen?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:74 msgid "No, credits do not expire." -msgstr "" +msgstr "Nee, tegoeden verlopen niet." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:77 msgid "" "**Can I send an SMS to a phone number (which is not a mobile phone) because " "I see the icon in front of the field “phone”?**" msgstr "" +"**Kan ik een sms sturen naar een telefoonnummer (dat geen mobiele telefoon " +"is) omdat ik het pictogram voor het veld \"telefoon\" zie?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:80 msgid "Only if that phone number supports SMS (e.g. SIP phones)." -msgstr "" +msgstr "Alleen als dat telefoonnummer sms ondersteunt (bijv. SIP-telefoons)." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:83 msgid "**Do I receive an invoice to buy my credits?**" -msgstr "" +msgstr "**Ontvang ik een factuur om mijn credits te kopen?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:85 msgid "Yes." @@ -1664,27 +1694,31 @@ msgstr "Ja." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:88 msgid "**Can the recipient answer to me?**" -msgstr "" +msgstr "**Kan de ontvanger mij antwoorden?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:90 msgid "No, it is not possible to reply to the SMS." -msgstr "" +msgstr "Nee, het is niet mogelijk om de sms te beantwoorden." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:93 msgid "" "**What happens if I send multiple SMS but I do not have enough credits to " "send them all?**" msgstr "" +"**Wat gebeurt er als ik meerdere sms'jes stuur maar niet genoeg tegoed heb " +"om ze allemaal te verzenden?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:95 msgid "" "The whole transaction is counted as a single one, so no SMS will be sent " "until you have enough credits to send them all." msgstr "" +"De hele transactie wordt als één transactie geteld, dus er wordt geen sms " +"verzonden totdat je genoeg tegoed hebt om ze allemaal te verzenden." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:99 msgid "**Do I have a history of the sent SMSs?**" -msgstr "" +msgstr "**Heb ik een overzicht van de verzonden sms'jes?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:101 msgid "" @@ -1693,20 +1727,26 @@ msgid "" ":ref:`developer mode ` under :menuselection:`Technical --> " "SMS`." msgstr "" +"Ja, de SMS wordt gelogd als een notitie onder de chatter van het " +"corresponderende record, en een volledige geschiedenis van de verzonden " +"SMS'en is beschikbaar in :ref:`ontwikkelaar mode ` ` onder " +":menuselection:`Technisch --> SMS`." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:106 msgid "**Can I send as many SMSs I want at once?**" -msgstr "" +msgstr "**Kan ik zoveel sms'jes tegelijk verzenden als ik wil?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:108 msgid "Yes, if you have enough credits." -msgstr "" +msgstr "Ja, indien voldoende krediet." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:111 msgid "" "**If I have a number that does not exist in the list of recipients, will I " "lose credits?**" msgstr "" +"**Als ik een nummer heb dat niet in de lijst met ontvangers voorkomt, " +"verlies ik dan tegoeden?**" #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:113 msgid "" @@ -1714,6 +1754,9 @@ msgid "" "Otherwise, if the SMS is sent to the wrong person or to a fake number, the " "credit will be lost." msgstr "" +"Niet als het telefoonnummer een verkeerd formaat heeft (bijvoorbeeld te veel" +" cijfers). Anders, als de sms naar de verkeerde persoon of naar een " +"nepnummer wordt verzonden, gaat het tegoed verloren." #: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:117 msgid "" diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index e1cc005f6..174035499 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -396,6 +396,8 @@ msgid "" "If you are on Odoo Online (SAAS) and have the Enterprise version, you " "benefit from free trial credits to test the feature." msgstr "" +"Als u Odoo Online (SAAS) gebruikt of de Enterprise-versie hebt, profiteert u" +" van gratis proeftegoeden om de functie te testen." #: ../../content/applications/sales/crm/acquire_leads/lead_mining.rst:71 msgid ":doc:`In-App Purchases (IAP) `" diff --git a/locale/nl/LC_MESSAGES/services.po b/locale/nl/LC_MESSAGES/services.po index 714e8695e..afc63372b 100644 --- a/locale/nl/LC_MESSAGES/services.po +++ b/locale/nl/LC_MESSAGES/services.po @@ -9,6 +9,7 @@ # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Yip132 , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-05-14 16:40+0000\n" -"Last-Translator: Yip132 , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -3000,6 +3001,7 @@ msgstr "" #: ../../content/applications/services/project/tasks/sub_tasks.rst:58 msgid "Go to :menuselection:`Settings --> Activate the developer mode`." msgstr "" +"Ga naar :menuselection:`Instellingen --> Activeer de ontwikkelaars mode`." #: ../../content/applications/services/project/tasks/sub_tasks.rst:49 msgid "Now access your task, *Edit*, and add a *Parent Task*." diff --git a/locale/nl/LC_MESSAGES/sphinx.po b/locale/nl/LC_MESSAGES/sphinx.po index 7579b3a9a..800cc6cff 100644 --- a/locale/nl/LC_MESSAGES/sphinx.po +++ b/locale/nl/LC_MESSAGES/sphinx.po @@ -9,6 +9,7 @@ # Yenthe Van Ginneken , 2021 # Nils van Odoo , 2021 # Martien van Geene , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-06-14 14:06+0000\n" -"Last-Translator: Martien van Geene , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -44,7 +45,7 @@ msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:4 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" #: ../../extensions/odoo_theme/layout_templates/homepage.html:5 msgid "" diff --git a/locale/nl/LC_MESSAGES/websites.po b/locale/nl/LC_MESSAGES/websites.po index f785bf6cc..eca546d24 100644 --- a/locale/nl/LC_MESSAGES/websites.po +++ b/locale/nl/LC_MESSAGES/websites.po @@ -9,8 +9,8 @@ # Yenthe Van Ginneken , 2021 # Eric Geens , 2021 # Cas Vissers , 2021 -# Gunther Clauwaert , 2021 # Pol Van Dingenen , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 16:05+0200\n" "PO-Revision-Date: 2021-05-14 16:40+0000\n" -"Last-Translator: Pol Van Dingenen , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -135,7 +135,7 @@ msgstr ":doc:`../managing_products/variants`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 msgid ":doc:`/applications/sales/sales/products_prices/taxes`" -msgstr "" +msgstr ":doc:`/applications/sales/sales/products_prices/taxes`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 msgid ":doc:`../managing_products/stock`" From afdd4388189f03a1d2405021861b069e3b390be7 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 18 Jul 2021 02:30:17 +0200 Subject: [PATCH 7/8] [I18N] Update translation terms from Transifex --- locale/nl/LC_MESSAGES/finance.po | 15 +++++++++++++-- locale/nl/LC_MESSAGES/index.po | 6 +++++- locale/nl/LC_MESSAGES/sphinx.po | 5 +++-- locale/nl/LC_MESSAGES/websites.po | 6 +++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/locale/nl/LC_MESSAGES/finance.po b/locale/nl/LC_MESSAGES/finance.po index 7b4768514..1057b3331 100644 --- a/locale/nl/LC_MESSAGES/finance.po +++ b/locale/nl/LC_MESSAGES/finance.po @@ -8707,6 +8707,8 @@ msgstr "" msgid "" "Users can access several companies but always work in one company at a time." msgstr "" +"Gebruikers kunnen toegang hebben tot meerdere bedrijven, maar werken altijd " +"in één bedrijf tegelijk." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:40 msgid "Multi-currencies" @@ -8737,6 +8739,10 @@ msgid "" "modules exist per country for the specificities of the country like the " "chart of accounts, taxes, or bank interfaces." msgstr "" +"Odoo boekhouding ondersteunt meer dan 50 landen. De kernboekhouding van Odoo" +" implementeert algemene boekhoudnormen voor alle landen. Er zijn per land " +"specifieke modules met specifieke kenmerken van het land, zoals het " +"rekeningschema, belastingen of bankinterfaces." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:60 msgid "In particular, Odoo's core accounting engine supports:" @@ -8752,10 +8758,12 @@ msgstr "" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:66 msgid "European accounting where expenses are accounted at the supplier bill." msgstr "" +"Europese boekhouding waarbij kosten worden geboekt op de " +"leveranciersfactuur." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:69 msgid "Odoo has modules to comply with IFRS rules." -msgstr "" +msgstr "Odoo heeft ook modules die voldoen aan de IFRS regels." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:72 msgid "Accounts Receivable & Payable" @@ -8785,6 +8793,9 @@ msgid "" "range from basic accounting reports to advanced management reports. Odoo's " "reports include:" msgstr "" +"In Odoo kunt u in realtime financiële rapporten genereren. De rapporten van " +"Odoo variëren van eenvoudige boekhoudrapporten tot geavanceerde " +"managementrapporten. De rapporten van Odoo omvatten:" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:90 msgid "Performance reports (such as Profit and Loss, Budget Variance)" @@ -8837,7 +8848,7 @@ msgstr "" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:117 msgid "Calculate the tax you owe your tax authority" -msgstr "" +msgstr "Bereken de belasting die u verschuldigd bent aan de belastingdienst" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:119 msgid "" diff --git a/locale/nl/LC_MESSAGES/index.po b/locale/nl/LC_MESSAGES/index.po index c4aba766d..7d297086f 100644 --- a/locale/nl/LC_MESSAGES/index.po +++ b/locale/nl/LC_MESSAGES/index.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the Odoo package. # FIRST AUTHOR , YEAR. # +# Translators: +# Gunther Clauwaert , 2021 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-14 15:27+0200\n" "PO-Revision-Date: 2018-10-19 08:15+0000\n" +"Last-Translator: Gunther Clauwaert , 2021\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,4 +23,4 @@ msgstr "" #: ../../content/index.rst:3 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" diff --git a/locale/nl/LC_MESSAGES/sphinx.po b/locale/nl/LC_MESSAGES/sphinx.po index 657ed2e32..e1b1a2c2c 100644 --- a/locale/nl/LC_MESSAGES/sphinx.po +++ b/locale/nl/LC_MESSAGES/sphinx.po @@ -9,6 +9,7 @@ # Yenthe Van Ginneken , 2021 # Nils van Odoo , 2021 # Martien van Geene , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-06-14 12:40+0000\n" -"Last-Translator: Martien van Geene , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -44,7 +45,7 @@ msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:4 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" #: ../../extensions/odoo_theme/layout_templates/homepage.html:5 msgid "" diff --git a/locale/nl/LC_MESSAGES/websites.po b/locale/nl/LC_MESSAGES/websites.po index c0da119ee..a88b11d7e 100644 --- a/locale/nl/LC_MESSAGES/websites.po +++ b/locale/nl/LC_MESSAGES/websites.po @@ -6,11 +6,11 @@ # Translators: # Cas Vissers , 2021 # Eric Geens , 2021 -# Gunther Clauwaert , 2021 # Martin Trigaux, 2021 # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Pol Van Dingenen , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:23+0000\n" -"Last-Translator: Pol Van Dingenen , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\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" @@ -135,7 +135,7 @@ msgstr ":doc:`../managing_products/variants`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 msgid ":doc:`/applications/sales/sales/products_prices/taxes`" -msgstr "" +msgstr ":doc:`/applications/sales/sales/products_prices/taxes`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 msgid ":doc:`../managing_products/stock`" From 9a31ed8f67e5d174a2f7113b1d72c92bb7725f89 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Mon, 19 Jul 2021 16:02:37 +0200 Subject: [PATCH 8/8] [IMP] allow to define BUILD_DIR and better odoo detection Building documentation implies some constraints: the source folder is readonly, mainly because the sources are shared accros builds. This implies that nor a symlink and a _build dir cannot be added in the source directory. The symlink will work in most cases localy for user with strange multiverse structure, but if not found, the fallback will check in parent directory. Most users and runbot will have all sources in the same directory (both in universe and basic multiverse cases) -(version?) -odoo -enterprise -upgrade -documentation The second change will check if BUILD_DIR is defined before setting it, allowing to use 'make BUILD_DIR=../build' to output the documentation somewhere else. --- Makefile | 20 ++++++++++++-------- conf.py | 5 +++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7b7a6ea87..7f7f2feb5 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,10 @@ ifndef WORKERS WORKERS = auto endif +ifndef BUILD_DIR + BUILD_DIR = _build +endif + SPHINX_BUILD = sphinx-build CONFIG_DIR = . SPHINXOPTS = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \ @@ -13,7 +17,7 @@ SPHINXOPTS = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \ -j $(WORKERS) SOURCE_DIR = content -BUILD_DIR = _build + HTML_BUILD_DIR = $(BUILD_DIR)/html ifdef VERSIONS @@ -37,10 +41,9 @@ help: clean: @echo "Cleaning build files..." rm -rf $(BUILD_DIR)/* - rm extensions/odoo_theme/static/style.css @echo "Cleaning finished." -html: extensions/odoo_theme/static/style.css +html: $(BUILD_DIR)/html/_static/style.css @echo "Starting build..." $(SPHINX_BUILD) -c $(CONFIG_DIR) -b html $(SPHINXOPTS) $(SOURCE_DIR) $(HTML_BUILD_DIR) @echo "Build finished." @@ -60,9 +63,10 @@ gettext: $(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) locale/sources @echo "Generation finished." -extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss +$(BUILD_DIR)/html/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss @echo "Compiling stylesheets..." - pysassc $(subst .css,.scss,$@) $@ + mkdir -p $(BUILD_DIR)/html/_static + pysassc extensions/odoo_theme/static/style.scss $(BUILD_DIR)/html/_static/style.css @echo "Compilation finished." #=== Development and debugging rules ===# @@ -70,6 +74,6 @@ extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss fast: SPHINXOPTS += -A collapse_menu=True fast: html -static: extensions/odoo_theme/static/style.css - cp -r extensions/odoo_theme/static/* _build/html/_static/ - cp -r static/* _build/html/_static/ +static: $(BUILD_DIR)/static/style.css + cp -r extensions/odoo_theme/static/* $(BUILD_DIR)/html/_static/ + cp -r static/* $(BUILD_DIR)/html/_static/ diff --git a/conf.py b/conf.py index 07452c3c5..e7e18cd05 100644 --- a/conf.py +++ b/conf.py @@ -60,6 +60,11 @@ sys.path.insert(0, str(extension_dir.absolute())) # Search for the directory of odoo sources to know whether autodoc should be used on the dev doc odoo_dir = Path('odoo') odoo_dir_in_path = False +if not odoo_dir.is_dir(): + parent_odoo_dir = Path('../odoo') + if parent_odoo_dir.is_dir(): + _logger.info('Using parent dir to find odoo sources') + odoo_dir = parent_odoo_dir if not odoo_dir.is_dir(): _logger.warning( f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"