From 8a160c3437db3830c03df9b36749e45ea479aa61 Mon Sep 17 00:00:00 2001
From: Odoo Translation Bot <c3p@odoo.com>
Date: Sun, 23 May 2021 02:31:26 +0200
Subject: [PATCH 1/6] [I18N] Update translation terms from Transifex

---
 locale/es/LC_MESSAGES/finance.po           | 52 ++++++++++++++++++----
 locale/es/LC_MESSAGES/general.po           |  5 ++-
 locale/es/LC_MESSAGES/index.po             |  6 ++-
 locale/es/LC_MESSAGES/inventory_and_mrp.po |  7 +--
 locale/es/LC_MESSAGES/productivity.po      | 17 ++++---
 locale/es/LC_MESSAGES/settings.po          | 14 +++++-
 locale/es/LC_MESSAGES/websites.po          | 21 ++++++---
 locale/fr/LC_MESSAGES/sales.po             | 45 +++++++++++++------
 locale/zh_CN/LC_MESSAGES/index.po          |  6 ++-
 9 files changed, 129 insertions(+), 44 deletions(-)

diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po
index 5963dc073..691dd8827 100644
--- a/locale/es/LC_MESSAGES/finance.po
+++ b/locale/es/LC_MESSAGES/finance.po
@@ -38,7 +38,6 @@
 # Sabina Batlle <sbb@odoo.com>, 2021
 # John Guardado <jgu@odoo.com>, 2021
 # Osiris Román <osiris.roman@yachaytech.edu.ec>, 2021
-# jabelchi, 2021
 # Wilson Pujols <wpujols@capw.com.do>, 2021
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2021
 # Martin Trigaux, 2021
@@ -53,6 +52,7 @@
 # Jon Perez <jop@odoo.com>, 2021
 # Althay Ramallo Fuentes <arf@odoo.com>, 2021
 # Cinthya Yepez <cye@odoo.com>, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -61,7 +61,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2021-05-14 13:19+0000\n"
-"Last-Translator: Cinthya Yepez <cye@odoo.com>, 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"
@@ -1374,6 +1374,11 @@ msgid ""
 "Once you receive your bank statements click the **new statement** button of "
 "the corresponding bank to import them."
 msgstr ""
+"Esto es porque no se importó el extracto bancario confirmando el envío y "
+"recepción del dinero.  Por tanto, es necesario importar el extracto bancario"
+" y conciliar el pago con la línea correcta del extracto. Una vez reciba sus "
+"extractos haga clic en el botón **nuevo extracto** del banco correspondiente"
+" para importarlo."
 
 #: ../../content/applications/finance/accounting/bank/misc/interbank.rst:107
 msgid ""
@@ -1398,6 +1403,9 @@ msgid ""
 "statement line corresponding to the payment and click on the **reconcile** "
 "button. Close the statement to finish the transaction"
 msgstr ""
+"Es necesario escoger contrapartidas para el pago. Seleccione la línea de "
+"extracto bancario correcta correspondiente al pago y haga click en el botón "
+"**conciliar**. Cierre el extracto para finalizar la transacción. "
 
 #: ../../content/applications/finance/accounting/bank/misc/interbank.rst:127
 msgid ""
@@ -1406,6 +1414,10 @@ msgid ""
 "both bank statements and payment transactions then the reconciliation will "
 "happen automatically."
 msgstr ""
+"Se deben hacer los mismos pasos una vez reciba el segundo extracto. Observe "
+"que si especifica el mismo importe y la misma referencia/memo tanto en el "
+"extracto como en las transacciones de pago la conciliación se realizará "
+"automáticamente."
 
 #: ../../content/applications/finance/accounting/bank/reconciliation.rst:3
 #: ../../content/applications/finance/accounting/others/reporting/main_reports.rst:153
@@ -2848,7 +2860,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:190
 msgid "Hay tres tipos de documentos"
-msgstr ""
+msgstr "Hay tres tipos de documentos"
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:193
 msgid "**Factura electrónica**. Este es el documento normal y aplica"
@@ -2912,6 +2924,12 @@ msgid ""
 "(CUFE) y generan el PDF de la Factura (el cual incluye un código QR) y el "
 "CUFE."
 msgstr ""
+"El proveedor de la Factura Electrónica recibe el archivo XML y procede a "
+"validar la información y la estructura contenida. Si todo es correcto, el "
+"estatus de la Factura cambia a “Validado”. Como parte de este proceso se "
+"generar el XML Legal, el cual incluye una firma digital y un código único "
+"(CUFE) y generan el PDF de la Factura (el cual incluye un código QR) y el "
+"CUFE."
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:237
 msgid ""
@@ -2930,7 +2948,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:245
 msgid "El estatus de la Factura Electrónica es cambiado a “Aceptado”."
-msgstr ""
+msgstr "El estatus de la Factura Electrónica es cambiado a “Aceptado”."
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:250
 msgid ""
@@ -2965,7 +2983,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:279
 msgid "Casos de Uso adicionales"
-msgstr ""
+msgstr "Casos de Uso adicionales"
 
 #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:281
 msgid ""
@@ -2973,6 +2991,9 @@ msgid ""
 "el mismo que en las Facturas. Su flujo de trabajo funcional se mantiene "
 "igual."
 msgstr ""
+"El proceso para las Notas de Crédito y Débito (Proveedores) es exactamente "
+"el mismo que en las Facturas. Su flujo de trabajo funcional se mantiene "
+"igual."
 
 #: ../../content/applications/finance/accounting/localizations/france.rst:3
 msgid "France"
@@ -4788,6 +4809,8 @@ msgid ""
 "In Odoo, there are several Spanish Chart of Accounts that are available by "
 "default:"
 msgstr ""
+"En Odoo hay varios cuadros de cuentas españoles que están disponibles por "
+"defecto:"
 
 #: ../../content/applications/finance/accounting/localizations/spain.rst:10
 msgid "PGCE PYMEs 2008"
@@ -4816,16 +4839,20 @@ msgid ""
 "When you create a new SaaS database, the PGCE PYMEs 2008 is installed by "
 "default."
 msgstr ""
+"Cuando se crea una nueva base de datos SaaS, el PGCE PYMEs 2008 se instala "
+"por defecto. "
 
 #: ../../content/applications/finance/accounting/localizations/spain.rst:23
 msgid "Spanish Accounting Reports"
-msgstr ""
+msgstr "Informes contables españoles"
 
 #: ../../content/applications/finance/accounting/localizations/spain.rst:25
 msgid ""
 "If the Spanish Accounting Localization is installed, you will have access to"
 " accounting reports specific to Spain:"
 msgstr ""
+"Si se ha instalado la localización contable española, tendrá acceso a "
+"informes contables especiíficos para España:"
 
 #: ../../content/applications/finance/accounting/localizations/spain.rst:28
 msgid "Tax Report (Modelo 111)"
@@ -9022,6 +9049,8 @@ msgid ""
 "but we want to sell it at 10€, tax included, in our shops or eCommerce "
 "website"
 msgstr ""
+"pero queremos venderlo a 10€, impuestos incluídos, en nuestras tiendas o "
+"sitio web eCommerce"
 
 #: ../../content/applications/finance/accounting/others/taxes/B2B_B2C.rst:97
 msgid "Setting your products"
@@ -9867,6 +9896,8 @@ msgstr ""
 msgid ""
 "Register your Odoo website on TaxCloud to get an *API ID* and an *API Key*."
 msgstr ""
+"Registre su sitio web Odoo en TaxCloud para obtener una *API ID* y una *API "
+"Key*."
 
 #: ../../content/applications/finance/accounting/others/taxes/taxcloud.rst:23
 msgid ""
@@ -9892,11 +9923,11 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/others/taxes/taxcloud.rst:30
 msgid "Enter your TaxCloud credentials."
-msgstr ""
+msgstr "Introduzca sus credenciales TaxCloud."
 
 #: ../../content/applications/finance/accounting/others/taxes/taxcloud.rst:31
 msgid "Click SAVE to store your credentials."
-msgstr ""
+msgstr "Haga clic en GUARDAR para almacenar sus credenciales."
 
 #: ../../content/applications/finance/accounting/others/taxes/taxcloud.rst:36
 msgid ""
@@ -15035,7 +15066,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:10
 msgid "Manage your follow-ups"
-msgstr ""
+msgstr "Gestionar seguimientos de pago"
 
 #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:13
 msgid ""
@@ -15043,6 +15074,9 @@ msgid ""
 "follow-up process. It will avoid you the trouble of sending a statement to a"
 " customer that has already paid you."
 msgstr ""
+"Recomandamos conciliar sus extractos bancarios antes de lanzar su proceso de"
+" seguimiento de cobros. Esto le evitará el problema de enviar una "
+"reclamación a un cliente que ya le ha pagado."
 
 #: ../../content/applications/finance/accounting/receivables/customer_payments/followup.rst:17
 msgid ""
diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po
index 4cf65a899..97ef23afb 100644
--- a/locale/es/LC_MESSAGES/general.po
+++ b/locale/es/LC_MESSAGES/general.po
@@ -11,6 +11,7 @@
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2020
 # Martin Trigaux, 2021
 # Victoria Quesada <victoria.quesada@nybblegroup.com>, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -19,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2018-10-19 08:15+0000\n"
-"Last-Translator: Victoria Quesada <victoria.quesada@nybblegroup.com>, 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"
@@ -1281,6 +1282,8 @@ msgid ""
 "You should first create and set up your Unsplash application with this "
 "tutorial: :doc:`unsplash_access_key`."
 msgstr ""
+"Primero debería crear y configurar su aplicación Unsplash con este tutorial:"
+" :doc:`unsplash_access_key`."
 
 #: ../../content/applications/general/unsplash/unsplash_application_id.rst:8
 msgid ""
diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po
index b4df12672..837c43605 100644
--- a/locale/es/LC_MESSAGES/index.po
+++ b/locale/es/LC_MESSAGES/index.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# jabelchi, 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: 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"
@@ -19,4 +23,4 @@ msgstr ""
 
 #: ../../content/index.rst:3
 msgid "Odoo Documentation"
-msgstr ""
+msgstr "Documentación Odoo"
diff --git a/locale/es/LC_MESSAGES/inventory_and_mrp.po b/locale/es/LC_MESSAGES/inventory_and_mrp.po
index b7b532188..b1581c45d 100644
--- a/locale/es/LC_MESSAGES/inventory_and_mrp.po
+++ b/locale/es/LC_MESSAGES/inventory_and_mrp.po
@@ -31,6 +31,7 @@
 # eduardo mendoza <emendozajz@gmail.com>, 2021
 # Jon Perez <jop@odoo.com>, 2021
 # Susanna Pujol, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -39,7 +40,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2021-05-14 13:19+0000\n"
-"Last-Translator: Susanna Pujol, 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"
@@ -9257,7 +9258,7 @@ msgstr ""
 
 #: ../../content/applications/inventory_and_mrp/inventory/shipping/setup/dhl_credentials.rst:9
 msgid "A DHL Password"
-msgstr ""
+msgstr "Una contraseña DHL"
 
 #: ../../content/applications/inventory_and_mrp/inventory/shipping/setup/dhl_credentials.rst:11
 msgid "A DHL Account Number"
@@ -10553,7 +10554,7 @@ msgstr ""
 
 #: ../../content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst:27
 msgid "Should I pay the vendor bill?"
-msgstr ""
+msgstr "Debo pagar la factura de proveedor?"
 
 #: ../../content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst:29
 msgid ""
diff --git a/locale/es/LC_MESSAGES/productivity.po b/locale/es/LC_MESSAGES/productivity.po
index f081ea675..4c3c7ee71 100644
--- a/locale/es/LC_MESSAGES/productivity.po
+++ b/locale/es/LC_MESSAGES/productivity.po
@@ -14,6 +14,7 @@
 # Vivian Montana <vmo@odoo.com>, 2021
 # Alonso Muñoz <Alonso.munoz.91@outlook.com>, 2021
 # Althay Ramallo Fuentes <arf@odoo.com>, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -22,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2021-05-14 13:19+0000\n"
-"Last-Translator: Althay Ramallo Fuentes <arf@odoo.com>, 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"
@@ -849,7 +850,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot.rst:4
 msgid "Internet of Things (IoT)"
-msgstr ""
+msgstr "Internet de las cosas (IoT)"
 
 #: ../../content/applications/productivity/iot/config.rst:3
 msgid "Configuration"
@@ -873,7 +874,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot/config/connect.rst:21
 msgid "Ethernet Connection"
-msgstr ""
+msgstr "Conexión ethernet"
 
 #: ../../content/applications/productivity/iot/config/connect.rst:23
 msgid ""
@@ -944,7 +945,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot/config/connect.rst:72
 msgid "You should now see the IoT Box."
-msgstr ""
+msgstr "Ahora debería ver la IoT Box."
 
 #: ../../content/applications/productivity/iot/config/connect.rst:78
 msgid "IoT Box Schema"
@@ -1156,7 +1157,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot/config/pos.rst:77
 msgid "Set up is done, you can launch a new PoS Session."
-msgstr ""
+msgstr "Configuración realizada. Puede lanzar una nueva sesión TPV."
 
 #: ../../content/applications/productivity/iot/config/pos.rst:80
 msgid "Troubleshoot"
@@ -1466,7 +1467,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot/devices/measurement_tool.rst:10
 msgid "Connect in USB"
-msgstr ""
+msgstr "Conectar mediante USB"
 
 #: ../../content/applications/productivity/iot/devices/measurement_tool.rst:12
 msgid ""
@@ -1483,7 +1484,7 @@ msgstr ""
 
 #: ../../content/applications/productivity/iot/devices/measurement_tool.rst:27
 msgid "Connect in Bluetooth"
-msgstr ""
+msgstr "Conectar por bluetooth"
 
 #: ../../content/applications/productivity/iot/devices/measurement_tool.rst:29
 msgid ""
@@ -1512,6 +1513,8 @@ msgid ""
 "Now, you can edit the control point and choose the device from the dropdown "
 "list. Then, hit save."
 msgstr ""
+"Ahora, puede editar el punto de control y elegir el dispositivo desde la "
+"lista desplegable. Entonces, haga clic en Guardar."
 
 #: ../../content/applications/productivity/iot/devices/measurement_tool.rst:55
 msgid ""
diff --git a/locale/es/LC_MESSAGES/settings.po b/locale/es/LC_MESSAGES/settings.po
index 5f40f6349..94889b3a8 100644
--- a/locale/es/LC_MESSAGES/settings.po
+++ b/locale/es/LC_MESSAGES/settings.po
@@ -8,6 +8,7 @@
 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2021
 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2021
 # Pablo Rojas <rojaspablo88@gmail.com>, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -16,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2021-05-14 13:22+0000\n"
-"Last-Translator: Pablo Rojas <rojaspablo88@gmail.com>, 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"
@@ -63,6 +64,11 @@ msgid ""
 "to test them on a duplicate of your database first. That way, if something "
 "goes wrong, your day-to-day business is not impacted."
 msgstr ""
+"Esta página contiene alguna información sobre como gestionar sus instancias "
+"Odoo. Antes de llevar a cabo alguno de estos procedimientos recomendamos "
+"**firmemente** probarlos primero en un duplicado de su base de datos. De "
+"esta forma, si algo va mal, no tendrá impacto en el día a día de su negocio."
+" "
 
 #: ../../content/applications/settings/users_and_features.rst:23
 msgid ""
@@ -70,6 +76,9 @@ msgid ""
 " <duplicate_online>` and :ref:`on premise <duplicate_premise>` "
 "installations."
 msgstr ""
+"Puede encontrar guias sobre como duplicar sus bases de datos tanto para "
+"instalaciones :ref:`online <duplicate_online>` y :ref:`on premise "
+"<duplicate_premise>`."
 
 #: ../../content/applications/settings/users_and_features.rst:27
 msgid ""
@@ -157,6 +166,9 @@ msgid ""
 "<duplicate_online>` of your database before making any changes (*especially*"
 " installing/uninstalling apps)."
 msgstr ""
+"Asegúrese de que primero prueba lo que va a hacer en un :ref:`duplicado "
+"<duplicate_online>` de su base de datos antes de hacer ningñun cambio "
+"(*especialmente* instalar/desinstalar aplicaciones)."
 
 #: ../../content/applications/settings/users_and_features.rst:76
 msgid ""
diff --git a/locale/es/LC_MESSAGES/websites.po b/locale/es/LC_MESSAGES/websites.po
index df0542a2b..7dd911d67 100644
--- a/locale/es/LC_MESSAGES/websites.po
+++ b/locale/es/LC_MESSAGES/websites.po
@@ -32,6 +32,7 @@
 # Kelly Quintero <kiutba@gmail.com>, 2021
 # Jon Perez <jop@odoo.com>, 2021
 # José Cabrera Lozano <jose.cabrera@edukative.es>, 2021
+# jabelchi, 2021
 # 
 #, fuzzy
 msgid ""
@@ -40,7 +41,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2021-05-14 13:23+0000\n"
-"Last-Translator: José Cabrera Lozano <jose.cabrera@edukative.es>, 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"
@@ -1290,7 +1291,7 @@ msgstr ""
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:3
 msgid "Configure your Paypal account"
-msgstr ""
+msgstr "Configure su cuenta Paypal"
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:5
 msgid ""
@@ -1302,7 +1303,7 @@ msgstr ""
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:12
 msgid "Paypal account"
-msgstr ""
+msgstr "Cuenta Paypal"
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:14
 msgid ""
@@ -1476,11 +1477,11 @@ msgstr "Credenciales"
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:128
 msgid "Odoo requires three Paypal credentials:"
-msgstr ""
+msgstr "Odoo requiere tres credenciales Paypal:"
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:130
 msgid "*Email ID* is your login email address in Paypal."
-msgstr ""
+msgstr "*Email ID* es su dirección email de login en Paypal."
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:132
 msgid ""
@@ -1546,7 +1547,7 @@ msgstr ""
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:178
 msgid "Test environment"
-msgstr ""
+msgstr "Entorno de pruebas"
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:180
 msgid ""
@@ -1585,6 +1586,12 @@ msgid ""
 "automatic invoicing is not activated in your eCommerce settings, to not "
 "generate invoices when a fictitious transaction is completed."
 msgstr ""
+"Entre en la Paypal Sandbox con la cuenta de comerciante y siga las mismas "
+"instrucciones de configuración. Entre sus credenciales sandbox en Odoo y "
+"asegúrese de que Paypal todavía tiene está establecido como *Entorno de "
+"Test*. Además, asegúrese de que no está activada la facturación automática "
+"en los ajustes de su eCommerce, para no generar facturas cuando se completa "
+"una transacción ficticia."
 
 #: ../../content/applications/websites/ecommerce/shopper_experience/paypal.rst:196
 msgid "Run a test transaction from Odoo using the sandbox personal account."
@@ -3903,7 +3910,7 @@ msgstr ""
 
 #: ../../content/applications/websites/website/publish/multi_website.rst:226
 msgid "Products only available on one website"
-msgstr ""
+msgstr "Productos únicamente disponibles en un sitio web"
 
 #: ../../content/applications/websites/website/publish/multi_website.rst:228
 msgid ""
diff --git a/locale/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po
index f027af110..f8318635e 100644
--- a/locale/fr/LC_MESSAGES/sales.po
+++ b/locale/fr/LC_MESSAGES/sales.po
@@ -17,13 +17,13 @@
 # Martin Trigaux, 2021
 # Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2021
 # Laura Piraux <lap@odoo.com>, 2021
-# Cécile Collart <cco@odoo.com>, 2021
 # Julien Bertrand <jub@odoo.com>, 2021
 # Sébastien BÜHL <buhlsebastien@gmail.com>, 2021
 # Michell Portrait <mportrait@happylibre.fr>, 2021
 # Renaud de Colombel <rdecolombel@sgen.cfdt.fr>, 2021
 # Fernanda Marques <fem@odoo.com>, 2021
 # David David <f322p3ph@yahoo.fr>, 2021
+# Cécile Collart <cco@odoo.com>, 2021
 # 
 #, fuzzy
 msgid ""
@@ -32,7 +32,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-14 14:53+0200\n"
 "PO-Revision-Date: 2018-10-19 08:15+0000\n"
-"Last-Translator: David David <f322p3ph@yahoo.fr>, 2021\n"
+"Last-Translator: Cécile Collart <cco@odoo.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3907,6 +3907,8 @@ msgid ""
 "You can then enter a relevant description and select an existing product or "
 "create a new one from right there."
 msgstr ""
+"Vous pouvez ensuite saisir une description pertinente et sélectionner un "
+"produit existant ou en créer un nouveau à partir de là."
 
 #: ../../content/applications/sales/sales/invoicing/expense.rst:33
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:85
@@ -4080,7 +4082,7 @@ msgstr ""
 #: ../../content/applications/sales/sales/invoicing/proforma.rst:13
 #: ../../content/applications/sales/sales/send_quotations/different_addresses.rst:10
 msgid "Activate the feature"
-msgstr ""
+msgstr "Activer la fonctionnalité"
 
 #: ../../content/applications/sales/sales/invoicing/proforma.rst:15
 msgid ""
@@ -4099,16 +4101,20 @@ msgid ""
 "When you click on send, Odoo will send an email with the pro-forma invoice "
 "in attachment."
 msgstr ""
+"Lorsque vous cliquez sur envoyer, Odoo vous enverra un e-mail avec la "
+"facture pro-forma en pièce jointe."
 
 #: ../../content/applications/sales/sales/invoicing/subscriptions.rst:3
 msgid "Sell subscriptions"
-msgstr ""
+msgstr "Vendre des abonnements"
 
 #: ../../content/applications/sales/sales/invoicing/subscriptions.rst:5
 msgid ""
 "Selling subscription products will give you predictable revenue, making "
 "planning ahead much easier."
 msgstr ""
+"La vente de produits d'abonnement vous procurera des revenus prévisibles, ce"
+" qui facilitera grandement la planification."
 
 #: ../../content/applications/sales/sales/invoicing/subscriptions.rst:9
 msgid "Make a subscription from a sales order"
@@ -4161,12 +4167,17 @@ msgid ""
 "To keep track of progress in the project, you will need the *Project* app. "
 "Go to :menuselection:`Apps --> Project` to install it."
 msgstr ""
+"Pour suivre l'avancement du projet, vous aurez besoin de l'application "
+"*Projet*. Allez dans :menuselection: `Apps  --> Projet` pour l'installer."
 
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:24
 msgid ""
 "In *Project* you will use timesheets, to do so go to :menuselection:`Project"
 " --> Configuration --> Settings` and activate the *Timesheets* feature."
 msgstr ""
+"Dans * Projet *, vous utiliserez des feuilles de temps, pour ce faire, allez"
+" dans :menuselection:`Projet --> Configuration --> Paramètres` et activez la"
+" fonction *Feuilles de temps*."
 
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:32
 msgid "Invoice your time spent"
@@ -4181,7 +4192,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:41
 msgid "You could also add the task to an existing project."
-msgstr ""
+msgstr "Vous pouvez également ajouter la tâche à un projet existant."
 
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:43
 msgid ""
@@ -4194,6 +4205,8 @@ msgid ""
 "You will directly be in the task if you click on it, you can also access it "
 "from the *Project* app."
 msgstr ""
+"Vous serez directement dans la tâche si vous cliquez dessus, vous pouvez "
+"également y accéder depuis l'application *Projet*."
 
 #: ../../content/applications/sales/sales/invoicing/time_materials.rst:52
 msgid ""
@@ -4281,11 +4294,11 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/products_prices/prices/currencies.rst:17
 msgid "Prices in foreign currencies can be defined in two fashions."
-msgstr ""
+msgstr "Les prix en devises étrangères peuvent être définis de deux manières."
 
 #: ../../content/applications/sales/sales/products_prices/prices/currencies.rst:20
 msgid "Automatic conversion from public price"
-msgstr ""
+msgstr "Conversion automatique à partir du prix public"
 
 #: ../../content/applications/sales/sales/products_prices/prices/currencies.rst:22
 msgid ""
@@ -4408,7 +4421,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:67
 msgid "Discounts, margins, roundings"
-msgstr ""
+msgstr "Réductions, marges, arrondis"
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:69
 msgid ""
@@ -4439,6 +4452,9 @@ msgid ""
 "Once again the system is smart. If a rule is set for a particular item and "
 "another one for its category, Odoo will take the rule of the item."
 msgstr ""
+"Une fois de plus, le système est intelligent. Si une règle est définie pour "
+"un élément particulier et une autre pour sa catégorie, Odoo prendra la règle"
+" de l'élément."
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:93
 msgid "Make sure at least one pricelist item covers all your products."
@@ -4446,15 +4462,16 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:95
 msgid "There are 3 modes of computation: fix price, discount & formula."
-msgstr ""
+msgstr "Il existe 3 modes de calcul : prix fixe, remise et formule."
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:100
 msgid "Here are different price settings made possible thanks to formulas."
 msgstr ""
+"Voici différents réglages de prix rendus possibles grâce aux formules."
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:103
 msgid "Discounts with roundings"
-msgstr ""
+msgstr "Réductions avec arrondis"
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:105
 msgid "e.g. 20% discounts with prices rounded up to 9.99."
@@ -4470,7 +4487,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:119
 msgid "Prices per country"
-msgstr ""
+msgstr "Prix par pays"
 
 #: ../../content/applications/sales/sales/products_prices/prices/pricing.rst:120
 msgid ""
@@ -4634,7 +4651,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/send_quotations/deadline.rst:11
 msgid "Set a deadline"
-msgstr ""
+msgstr "Fixez une date limite"
 
 #: ../../content/applications/sales/sales/send_quotations/deadline.rst:13
 msgid "On every quotation or sales order you can add an *Expiration Date*."
@@ -4715,7 +4732,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/send_quotations/get_paid_to_validate.rst:3
 msgid "Get paid to confirm an order"
-msgstr ""
+msgstr "Soyez payé pour confirmer une commande"
 
 #: ../../content/applications/sales/sales/send_quotations/get_paid_to_validate.rst:5
 msgid ""
@@ -4767,7 +4784,7 @@ msgstr ""
 
 #: ../../content/applications/sales/sales/send_quotations/get_signature_to_validate.rst:3
 msgid "Get a signature to confirm an order"
-msgstr ""
+msgstr "Obtenez une signature pour confirmer une commande"
 
 #: ../../content/applications/sales/sales/send_quotations/get_signature_to_validate.rst:5
 msgid ""
diff --git a/locale/zh_CN/LC_MESSAGES/index.po b/locale/zh_CN/LC_MESSAGES/index.po
index 0431c2cd7..68eff44b3 100644
--- a/locale/zh_CN/LC_MESSAGES/index.po
+++ b/locale/zh_CN/LC_MESSAGES/index.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Mandy Choy <mnc@odoo.com>, 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: Mandy Choy <mnc@odoo.com>, 2021\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"
@@ -19,4 +23,4 @@ msgstr ""
 
 #: ../../content/index.rst:3
 msgid "Odoo Documentation"
-msgstr ""
+msgstr "Odoo 用戶文档"

From 10612f0ba7409f98b9462a6a9a36277dba75a86b Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Fri, 21 May 2021 18:22:38 +0200
Subject: [PATCH 2/6] [FIX] odoo_theme: unclickable :show-content: pages in
 global toctree

When navigating the themes tutorial (developer/howto/themes), the
rdtraining page wasn't clickable in the global toc, even though it was
specified as :show-content: (note that the rdtraining is only in 14.0+).

The heuristic extracting the pagename from a toctree node wasn't
considering the current depth if the page referenced by the toctree
node was in the same folder than the current page.

Explanation:

We are computing the toctree for the page developer/howtos/themes. One
of the toctree nodes references the rdtraining page, with a relative
link, i.e. `rdtraining.html`.

We were wrongfully looking for `show_content` in the metadata of the
`rdtraining` page, instead of `developer/howtos/rdtraining`, since we
didn't consider the current document depth when the reference didn't
contain any `/`.

This commit ensures that if the current document has a depth > 1, this
depth is currently considered, even for links referencing documents in
the same folder.

task-2538297
---
 extensions/odoo_theme/__init__.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/extensions/odoo_theme/__init__.py b/extensions/odoo_theme/__init__.py
index 4e61aaefb..5ae55222c 100644
--- a/extensions/odoo_theme/__init__.py
+++ b/extensions/odoo_theme/__init__.py
@@ -59,16 +59,23 @@ def resolve(old_resolve, tree, docname, *args, **kwargs):
                 _update_toctree_nodes(_subnode)
 
     def _get_docname(_node):
-        """
-        docname = a/b/c/the_page_being_rendered
+        """ Return the docname of the targeted document.
+
+        docname = some_common_root/foo/bar/the_page_being_rendered
         _ref = ../../contributing/documentation
         _path_parts = ['..', '..', 'contributing', 'documentation']
-        _res = ['a', 'contributing', 'documentation']
-        _docname = a/contributing/documentation
+        _res = ['some_common_root', 'contributing', 'documentation']
+        _docname = some_common_root/contributing/documentation
+
+        :return: The docname of the document targeted by `_node`, i.e. the relative path from the
+                 documentation source directory (the `content/` directory)
+        :rtype: str
         """
         _ref = _node['refuri'].replace('.html', '')
         _parent_directory_occurrences = _ref.count('..')
-        if not _parent_directory_occurrences:  # The ref is already the docname
+        if not _parent_directory_occurrences and '/' not in docname:
+            # The current document is at the root of the documentation source directory
+            # (e.g. docname == 'index'|'applications'|...). i.e., the ref is already the docname.
             _docname = _ref
         else:
             _path_parts = _ref.split('/')

From 88f00fe611a869131729c1ddb623a7bb76f84025 Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Wed, 26 May 2021 11:40:14 +0200
Subject: [PATCH 3/6] [FIX] odoo_theme: remove images from homepage

task-2534617
---
 .../odoo_theme/layout_templates/homepage.html | 71 +++++++------------
 extensions/odoo_theme/static/style.scss       | 27 +------
 2 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/extensions/odoo_theme/layout_templates/homepage.html b/extensions/odoo_theme/layout_templates/homepage.html
index 0292b63d2..55e676906 100644
--- a/extensions/odoo_theme/layout_templates/homepage.html
+++ b/extensions/odoo_theme/layout_templates/homepage.html
@@ -1,7 +1,7 @@
 <div id="o_content">
     <section class="o_content_fw_banner row">
         <div class="col-lg-6">
-            <h2 class="text-white">Odoo Documentation</h2>
+            <h1 class="text-white">Odoo Documentation</h1>
             <p class="text-white">The comprehensive guide for Odoo users. Easily find the tutorial and helpful tips that suit your needs.</p>
             <div class="mt-3">
                 <a href="https://odoo.com/trial" class="btn btn-primary mb-2">Try Odoo for FREE</a>
@@ -9,16 +9,11 @@
         </div>
     </section>
     <section>
-        <div class="row gx-lg-5 border-bottom">
-            <div class="col-lg-6 order-lg-2">
-                <div class="o_cat_banner mb-5">
-                    <img src="{{ pathto('_static/img/banner-applications.png', 1) }}" alt="">
-                </div>
-            </div>
-            <div class="col-lg-6 order-lg-1">
-                <h3>Applications</h3>
-                <p>Master any app thanks to their end-user guides. Our wide array of functional workflows and processes are designed to help you unleash Odoo's potential.</p>
-                <h5 class="pt-3 text-uppercase fw_semibold">Top Links</h5>
+        <div class="row gx-lg-5">
+            <div class="col-lg-6">
+                <h2>Applications</h2>
+                <p class="text-muted">Master any app thanks to their end-user guides. Our wide array of functional workflows and processes are designed to help you unleash Odoo's potential.</p>
+                <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
                     <li>
                         <a href="{{ pathto('applications/finance/accounting/overview/main_concepts/intro') }}" class="stretched-link">
@@ -41,15 +36,10 @@
                     </li>
                 </ul>
             </div>
-        </div>
-        <div class="row gx-lg-5">
-            <div class="col-lg-6 py-5 border-bottom">
-                <div class="o_cat_banner mb-4 p-lg-4">
-                    <i class="i-doc-admin"></i>
-                </div>
-                <h3>Administration</h3>
-                <p>Easily setup your first Odoo installation. From downloads to day-to-day database administration, the dedicated tutorials have got you covered.</p>
-                <h5 class="pt-3 text-uppercase fw_semibold">Top Links</h5>
+            <div class="col-lg-6">
+                <h2>Administration</h2>
+                <p class="text-muted">Easily setup your first Odoo installation. From downloads to day-to-day database administration, the dedicated tutorials have got you covered.</p>
+                <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
                     <li>
                         <a href=" {{ pathto('administration/install') }} " class="stretched-link">
@@ -73,13 +63,12 @@
                     </li>
                 </ul>
             </div>
-            <div class="col-lg-6 py-5 border-bottom">
-                <div class="o_cat_banner mb-4 p-lg-4 o-bg-violet-light">
-                    <i class="i-doc-dev"></i>
-                </div>
-                <h3>Developer</h3>
-                <p>Learn to develop in Odoo by reading the framework references and programmer tutorials.</p>
-                <h5 class="pt-3 text-uppercase fw_semibold">Top Links</h5>
+        </div>
+        <div class="row gx-lg-5">
+            <div class="col-lg-6">
+                <h2 class="border-top pt-4">Developer</h2>
+                <p class="text-muted">Learn to develop in Odoo by reading the framework references and programmer tutorials.</p>
+                <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
                     <li>
                         <a href="{{ pathto('developer/reference/orm') }}" class="stretched-link">
@@ -103,16 +92,10 @@
                     </li>
                 </ul>
             </div>
-        </div>
-        <div class="row gx-lg-5">
-            {# If changelog exists add class border-bottom #}
-            <div class="col-lg-6 pt-5">
-                <div class="o_cat_banner mb-4 p-lg-4 o-bg-violet-light">
-                    <i class="i-doc-services"></i>
-                </div>
-                <h3>Services</h3>
-                <p>Find out how to open a support ticket should you need to contact a Customer Service Representative.</p>
-                <h5 class="pt-3 text-uppercase fw_semibold">Top Links</h5>
+            <div class="col-lg-6">
+                <h2 class="border-top pt-4">Services</h2>
+                <p class="text-muted">Find out how to open a support ticket should you need to contact a Customer Service Representative.</p>
+                <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
                     <li>
                         <a href="{{ pathto('services/support/where_can_i_get_support') }}" class="stretched-link">
@@ -131,14 +114,12 @@
                     </li>
                 </ul>
             </div>
-            {# If changelog exists add class border-bottom #}
-            <div class="col-lg-6 pt-5">
-                <div class="o_cat_banner mb-4 p-lg-4">
-                    <i class="i-doc-contribute"></i>
-                </div>
-                <h3>Contributing</h3>
-                <p>You want to contribute to Odoo but don't know where to start? The tutorials and guidelines are there to help you make Odoo even better.</p>
-                <h5 class="pt-3 text-uppercase fw_semibold">Top Links</h5>
+        </div>
+        <div class="row gx-lg-5">
+            <div class="col-lg-6">
+                <h2 class="border-top pt-4">Contributing</h2>
+                <p class="text-muted">You want to contribute to Odoo but don't know where to start? The tutorials and guidelines are there to help you make Odoo even better.</p>
+                <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
                     <li>
                         <a href="{{ pathto('contributing/documentation/introduction_guide') }}" class="stretched-link">
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 668b36c62..5587584ab 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -409,11 +409,6 @@ header.o_main_header{
                     border-color: #00A09D;
                 }
             }
-
-            p, h5 {
-                color: $gray;
-            }
-
             h5 {
                 font-size: 12px;
             }
@@ -430,27 +425,7 @@ header.o_main_header{
                     }
                 }
             }
-            .o_cat_banner {
-                background-color: $o-violet;
-                border-radius: 5px;
-                text-align: center;
-                background-repeat: no-repeat;
-                background-size: 90%;
-                background-position: center;
-                i {
-                    font-size: 100px;
-                    color: $white;
-                }
-                &.o-bg-violet-light {
-                    background-color: lighten($o-violet, 20%);
-                }
-                &:not(.shadow){
-                    background-image: url('img/bg-cat.svg');
-                }
-                &.shadow {
-                    box-shadow: 0px 2px 25px rgba(19, 28, 40, .08) !important;
-                }
-            }
+
             .o_changelog {
                 .row:last-of-type > .border-bottom {
                     border: none !important;

From e1adedc2e5edfbe865e645cf2b167be8243d0241 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <Yajo@users.noreply.github.com>
Date: Wed, 26 May 2021 10:49:36 +0100
Subject: [PATCH 4/6] [FIX] mail: how to choose allowed "From" addresses

- Document changes from https://github.com/odoo/odoo/pull/69218.
- Explain that Office365 is now usable.
---
 .../productivity/discuss/email_servers.rst    | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/content/applications/productivity/discuss/email_servers.rst b/content/applications/productivity/discuss/email_servers.rst
index 1007d5fee..27d46c15d 100644
--- a/content/applications/productivity/discuss/email_servers.rst
+++ b/content/applications/productivity/discuss/email_servers.rst
@@ -38,7 +38,8 @@ Then set your email domain name in the General Settings.
 Can I use an Office 365 server
 ------------------------------
 You can use an Office 365 server if you run Odoo on-premise.
-Office 365 SMTP relays are not compatible with Odoo Online.
+Office 365 SMTP relays are not compatible with Odoo Online unless you configure
+Odoo to force the outgoing "From" address (see below).
 
 Please refer to `Microsoft's documentation <https://support.office.com/en-us/article/How-to-set-up-a-multifunction-device-or-application-to-send-email-using-Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ 
 to configure a SMTP relay for your Odoo's IP address.
@@ -84,6 +85,48 @@ that is a CNAME with the value "odoo._domainkey.odoo.com".
 
 .. _discuss/email_servers/inbound_messages:
 
+Choose allowed "From" email addresses
+-------------------------------------
+
+Sometimes, an email's "From" (outgoing) address can belong to a different
+domain, and that can be a problem.
+
+For example, if a customer with address *mary@customer.example.com* responds to
+a message, Odoo will try to redistribute that same email to other subscribers
+in the thread. But if the domain *customer.example.com* forbids that kind of
+usage for security (kudos for that), the Odoo's redistributed email would get
+rejected by some recipients' mail servers.
+
+To avoid those kind of problems, you should make sure all emails use a "From"
+address from your authorized domain.
+
+If your MTA supports `SRS (Sender Rewriting Scheme)
+<https://en.wikipedia.org/wiki/Sender_Rewriting_Scheme>`_, you can enable it
+to handle these situations. However, that is more complex and requires more
+technical knowledge that is not meant to be covered by this documentation.
+
+Instead, you can also configure Odoo to do something similar by itself:
+
+#.  Set your domain name in the General Settings.
+
+    .. image:: media/alias_domain.png
+       :align: center
+
+#.  In developer mode, go to :menuselection:`Settings --> Technical -->
+    Parameters --> System Parameters`.
+
+#.  Add one system parameter from these:
+
+    * If you want *all* your outgoing messages to use the same "From" address,
+      use the key ``mail.force.smtp.from`` and set that address as value
+      (such as ``outgoing@mycompany.example.com``).
+
+    * If you want to keep the original "From" address for emails that use your
+      same domain, but change it for emails that use a different domain, use
+      the key ``mail.dynamic.smtp.from`` and set as value the email address
+      that should be used in those cases (such as
+      ``outgoing@mycompany.example.com``).
+
 How to manage inbound messages
 ==============================
 

From 74e7da56946c8b9d4e684a96a02bce82982a5757 Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Tue, 25 May 2021 14:36:55 +0200
Subject: [PATCH 5/6] [FIX] odoo_theme: hide searchbar on scroll in mobile

---
 extensions/odoo_theme/static/js/menu.js | 21 ++++++++++++++-------
 extensions/odoo_theme/static/style.scss | 14 +++++++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/extensions/odoo_theme/static/js/menu.js b/extensions/odoo_theme/static/js/menu.js
index 6e437dd58..2f4d3aef7 100644
--- a/extensions/odoo_theme/static/js/menu.js
+++ b/extensions/odoo_theme/static/js/menu.js
@@ -47,14 +47,21 @@
         }
     };
 
+     document.addEventListener('scroll', () => {
+         // Allow to hide the searchbar when the page is scrolled in mobile.
+         _flagHeaderWithScrollPosition();
+     });
+
     /**
-     * Mobile: Toggle open/close sidebar on click of nav button (&& on swipe left to right?).
-     *
-     *
-     * `o_active_toc_entry` class, and their related (parent) TOC entry list (<ul> elements) receive
-     * the `show` (Bootstrap) class.
-     * Also, the deepest TOC entry receives the `o_deepest_active_toc_entry` class, and its child
-     * Sidebar receives the `o-mobile-show` class.
+     * Add/Remove the class `o_header_scrolled` on the header according to the scroll position.
      */
+     const _flagHeaderWithScrollPosition = () => {
+         const header = document.querySelector('.o_main_header');
+         if (this.scrollY > 0) {
+             header.classList.add('o_header_scrolled');
+         } else {
+             header.classList.remove('o_header_scrolled');
+         }
+     };
 
 })();
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 5587584ab..12973d20e 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -73,15 +73,27 @@ header.o_main_header{
     }
     .o_search_wrapper {
         display: flex;
+        opacity: 1;
+        @include transition(opacity .3s);
+
         @include media-breakpoint-down(lg) {
             display: block;
             position: absolute;
             width: 100%;
             padding: 0 10px;
-            top: calc(100% + 30px);
+            top: calc(100% + 15px);
        }
     }
 
+    &.o_header_scrolled {
+        .o_search_wrapper {
+            @include media-breakpoint-down(lg) {
+                opacity: 0;
+            }
+        }
+    }
+
+
     .highlight-link {
         margin-bottom: 0;
         padding: 0 1rem;

From fa267e5cfcbe1375eaaa5f560d740feaa394706f Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Wed, 26 May 2021 16:48:05 +0200
Subject: [PATCH 6/6] [FIX] odoo_theme: design fixes

- change button color (in line with odoo.com)
- adapt margin above h2
- change gray variable on footer (to use the same as everywhere else)
- fix grey background in nav
- fix opacity on icon when active in nav
- add icons on mobile homepage
- fix missing homepage separator in mobile
- fix nav top padding on mobile (hidden by searchbar)
- adjust nav's active links styles
- adjust margin on version switcher
- hide toctree-wrapper when show-content is in meta
- fix highlighted-link on tablet screen
- style toctree-wrapper (a lil bit)
- hide local toc while page is loading
- SCSS linting
---
 extensions/odoo_theme/layout.html             |   7 +-
 .../odoo_theme/layout_templates/homepage.html |  10 +-
 .../layout_templates/version_switcher.html    |   2 +-
 extensions/odoo_theme/static/js/page_toc.js   |   3 +
 .../odoo_theme/static/scss/_variables.scss    |   4 +-
 extensions/odoo_theme/static/style.scss       | 165 +++++++++++-------
 6 files changed, 122 insertions(+), 69 deletions(-)

diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html
index 0c1a31f44..c0ccb1a51 100644
--- a/extensions/odoo_theme/layout.html
+++ b/extensions/odoo_theme/layout.html
@@ -79,6 +79,10 @@
             {%- set main_classes = main_classes + ['o_index'] %}
         {%- endif %}
 
+        {%- if 'show-content' in meta %}  {# The page is an accessible toctree #}
+            {%- set main_classes = main_classes + ['o_hide_toc'] %}
+        {%- endif %}
+
         {%- if 'code-column' in meta %}  {# The page contains a 'memento' (dynamic side block) #}
             {%- set main_classes = main_classes + ['o_has_code_column'] %}
         {%- endif %}
@@ -110,7 +114,8 @@
             {%- endif %}
         </main>
         {%- if 'hide-page-toc' not in meta %}
-            <aside id="o_page_toc" class="o_page_toc">
+            {# Shown when the JS has properly set all the classes on the TOC elements #}
+            <aside id="o_page_toc" class="o_page_toc" hidden>
                 {%- include "layout_templates/page_toc.html" %}
             </aside>
         {%- endif %}
diff --git a/extensions/odoo_theme/layout_templates/homepage.html b/extensions/odoo_theme/layout_templates/homepage.html
index 55e676906..3cbf4aece 100644
--- a/extensions/odoo_theme/layout_templates/homepage.html
+++ b/extensions/odoo_theme/layout_templates/homepage.html
@@ -11,7 +11,7 @@
     <section>
         <div class="row gx-lg-5">
             <div class="col-lg-6">
-                <h2>Applications</h2>
+                <h2><i class="i-doc-apps d-lg-none me-2"></i>Applications</h2>
                 <p class="text-muted">Master any app thanks to their end-user guides. Our wide array of functional workflows and processes are designed to help you unleash Odoo's potential.</p>
                 <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
@@ -37,7 +37,7 @@
                 </ul>
             </div>
             <div class="col-lg-6">
-                <h2>Administration</h2>
+                <h2 class="border-top pt-4 pt-lg-0"><i class="i-doc-admin d-lg-none me-2"></i>Administration</h2>
                 <p class="text-muted">Easily setup your first Odoo installation. From downloads to day-to-day database administration, the dedicated tutorials have got you covered.</p>
                 <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
@@ -66,7 +66,7 @@
         </div>
         <div class="row gx-lg-5">
             <div class="col-lg-6">
-                <h2 class="border-top pt-4">Developer</h2>
+                <h2 class="border-top pt-4"><i class="i-doc-dev d-lg-none me-2"></i>Developer</h2>
                 <p class="text-muted">Learn to develop in Odoo by reading the framework references and programmer tutorials.</p>
                 <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
@@ -93,7 +93,7 @@
                 </ul>
             </div>
             <div class="col-lg-6">
-                <h2 class="border-top pt-4">Services</h2>
+                <h2 class="border-top pt-4"><i class="i-doc-services d-lg-none me-2"></i>Services</h2>
                 <p class="text-muted">Find out how to open a support ticket should you need to contact a Customer Service Representative.</p>
                 <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
@@ -117,7 +117,7 @@
         </div>
         <div class="row gx-lg-5">
             <div class="col-lg-6">
-                <h2 class="border-top pt-4">Contributing</h2>
+                <h2 class="border-top pt-4"><i class="i-doc-contribute d-lg-none me-2"></i>Contributing</h2>
                 <p class="text-muted">You want to contribute to Odoo but don't know where to start? The tutorials and guidelines are there to help you make Odoo even better.</p>
                 <h5 class="text-muted pt-3 text-uppercase fw_semibold">Top Links</h5>
                 <ul class="list-unstyled">
diff --git a/extensions/odoo_theme/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html
index cd90c3a14..120cc6473 100644
--- a/extensions/odoo_theme/layout_templates/version_switcher.html
+++ b/extensions/odoo_theme/layout_templates/version_switcher.html
@@ -1,6 +1,6 @@
 <div class="o_versions row gx-2 me-3">
 	<div class="col col-form-label">
-    	<label class="fw_bold small me-2">Version</label>
+    	<label class="fw_bold small ms-2">Version</label>
     </div>
     <div class="col">
         <div class="dropdown">
diff --git a/extensions/odoo_theme/static/js/page_toc.js b/extensions/odoo_theme/static/js/page_toc.js
index 03fabf14d..6d3485ab1 100644
--- a/extensions/odoo_theme/static/js/page_toc.js
+++ b/extensions/odoo_theme/static/js/page_toc.js
@@ -22,6 +22,9 @@
 
             // Allow to hide the TOC entry referring the title (<h1> heading)
             _flagFirstHeadingRef();
+
+            // Show hidden menu when the css classes have been properly specified
+            this.pageToc.removeAttribute('hidden');
         }
     });
 
diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss
index 2f0b177eb..9be524c0c 100644
--- a/extensions/odoo_theme/static/scss/_variables.scss
+++ b/extensions/odoo_theme/static/scss/_variables.scss
@@ -173,7 +173,7 @@ $o-inverse-dark:                            #5b7687;
 $o-inverse-darker:                          #485761;
 
 $color-alpha:                               #00A19B;
-$color-alpha-dark:                          #00807D;
+$color-alpha-dark:                          #017e84;
 $color-alpha-light:                         #26d1af;
 $color-alpha-lightest:                      #2aebc4;
 
@@ -205,8 +205,6 @@ $gray-light:                                #d5d5d5;
 $gray:                                      #888888;
 $gray-dark:                                 #707070;
 $gray-darker:                               #282F33;
-$gray-darkest:                              shade-color($gray-darker, 30%);
-
 
 $primary:                                   $color-alpha-dark;
 $secondary:                                 $o-violet-dark;
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 12973d20e..944a7f28c 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -14,15 +14,18 @@ body {
     a:not(:hover), a.o_logo {
         text-decoration: none !important;
     }
+
     dd {
         margin-left: 1rem;
     }
+
     // This fixes the scroll position on all elements, including refs
     :target {
         &:before {
             @include o-scroll-padding()
         }
     }
+
     abbr[title="Pull Request"] {
         @include o-easter-egg();
     }
@@ -37,7 +40,7 @@ body {
 // Header with logo, searchbar and switchers
 //------------------------------------------------------------------------------
 
-header.o_main_header{
+header.o_main_header {
     width: 100%;
     height: $o-header-mobile-height;
     position: fixed;
@@ -50,13 +53,16 @@ header.o_main_header{
         height: $o-header-height;
         padding-right: 3rem;
     }
+
     .o_logo_wrapper {
         padding: 0 1rem;
+
         > .o_logo {
             img {
                 margin-bottom: -2px;
                 vertical-align: baseline;
             }
+
             span {
                 @include font-size($font-size-base);
                 color: $o-violet;
@@ -95,26 +101,34 @@ header.o_main_header{
 
 
     .highlight-link {
+        @media only screen and (max-width: 1242px) and (min-width: 992px){
+            position: absolute;
+            bottom: 0;
+        }
         margin-bottom: 0;
         padding: 0 1rem;
         text-align: center;
         align-self: center;
+
         a {
             @include font-size($font-size-secondary);
         }
     }
     .navbar-toggler {
         border: none;
+
         &[aria-expanded="true"] {
             .icon-bar {
                 &:nth-of-type(1) {
                     @include o-transform(rotate(45deg));;
                     @include o-transform-origin(10%, 10%)
                 }
+
                 &:nth-of-type(2) {
                     opacity: 0;
                     filter: alpha(opacity=0);
                 }
+
                 &:nth-of-type(3) {
                     @include o-transform(rotate(-45deg));
                     @include o-transform-origin(10%, 90%)
@@ -127,20 +141,25 @@ header.o_main_header{
             height: 2px;
             background-color: $gray-dark;
             @include o-transition(all, .2s);
+
             &+ .icon-bar {
                 margin-top: 4px;
             }
+
             &:nth-of-type(1) {
                 @include o-transform(rotate(0));
             }
+
             &:nth-of-type(2) {
                 opacity: 1;
                 filter: alpha(opacity=100);
             }
+
             &:nth-of-type(3) {
                 @include o-transform(rotate(0));
             }
         }
+
         &:focus {
             box-shadow: none;
             outline:none;
@@ -161,7 +180,8 @@ header.o_main_header{
         @include media-breakpoint-up(lg) {
             max-width: 500px;
         }
-        .btn{
+
+        .btn {
             @include o-position-absolute($top: 50%, $right: 1rem);
             @include o-transform (translateY(-50%)) ;
             padding: 0;
@@ -182,6 +202,7 @@ header.o_main_header{
     position: fixed;
     top: -100%;
     left:0;
+
     &.show {
         top: $o-header-mobile-height;
     }
@@ -193,7 +214,7 @@ header.o_main_header{
         padding-left: 3rem;
     }
     @include o-transition(all, .3s);
-    padding-top: 1rem;
+    padding-top: 4rem;
     padding-left: 1rem;
     background-color: lighten($o-violet-dark, 70%) ;
     z-index: 10;
@@ -205,37 +226,35 @@ header.o_main_header{
         padding-bottom: .5rem;
     }
 
-    .toctree-l1 > ul {
-        padding-left: 1.5rem;
-    }
-
     ul {
         .o_deepest_active_toc_entry {
-            background-color: $gray-lightest;
+            background-color: $gray-lighter;
+            border-left: 3px solid $gray-lighter;
+            margin-left: -3px;
         }
 
         > .toctree-l1 {
-
-            &[class*="o_menu_"] > .o_toc_entry_wrapper > i {
-                opacity: .75;
-                &:before {
-                    @include o-inline-icon($i-doc-apps, 0 1rem 0 0);
-                    color: $o-violet-dark;
-                    margin-right: 0.5rem;
-                }
+            &[class*="o_menu_"] > .o_toc_entry_wrapper > i:before {
+                @include o-inline-icon($i-doc-apps, 0 5px 0 0);
+                color: $o-violet-dark;
             }
+
             &.o_menu_applications > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-apps}';
             }
+
             &.o_menu_administration > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-admin}';
             }
+
             &.o_menu_developer > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-dev}';
             }
+
             &.o_menu_services > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-services}';
             }
+
             &.o_menu_contributing > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-contribute}';
             }
@@ -244,12 +263,15 @@ header.o_main_header{
     }
     scrollbar-width: thin;
     scrollbar-color: $o-violet-darker transparent;
+
     &::-webkit-scrollbar {
         width: 5px;
     }
+
     &::-webkit-scrollbar-track {
         background: $white;
     }
+
     &::-webkit-scrollbar-thumb {
         background-color: $o-violet-darker ;
         border-radius: 0;
@@ -262,21 +284,28 @@ header.o_main_header{
         padding-left: 1rem;
 
         li {
-            padding-left: .2rem;
+            &.toctree_l2 {
+                padding-left: .2rem;
+            }
             > a.reference {
-                padding-left: 1.2rem;
+                padding-left: .8rem;
             }
 
             a {
                 display: inline-block;
-                padding: .5rem 0;
+                padding: .4rem 0;
                 color: inherit;
                 opacity: .75;
+
                 &.current, &:hover {
                     opacity: 1;
                 }
             }
 
+            > .o_toc_entry_wrapper i {
+                opacity: .75;
+            }
+
             &:not(.toctree-l1) {
                 .o_toc_entry_wrapper {
                     &:not(.o_page_toc_title) {
@@ -288,6 +317,7 @@ header.o_main_header{
                         display: inline-block;
                         margin-right: .2rem;
                         @include o-transition(rotate, .3s);
+                        font-size: .75rem;
                         font-weight: $fw_bold;
                         color: inherit;
 
@@ -297,19 +327,21 @@ header.o_main_header{
                     }
                 }
             }
+
             &.o_active_toc_entry {
                 &:not(.toctree-l1) > .o_toc_entry_wrapper {
                     i[class^="i-"]:not(.collapsed) {
                         @include o-transform(rotate(90deg));
                     }
                 }
-                > a , > .o_toc_entry_wrapper a {
+                > a , > .o_toc_entry_wrapper a, > .o_toc_entry_wrapper i {
                     font-weight: $fw_bold;
                     opacity: 1;
                 }
             }
         }
     }
+
     > ul { //is first ul in toc
         padding-left: 0;
     }
@@ -344,11 +376,12 @@ header.o_main_header{
 
         a {
             font-weight: $fw_regular;
-            color: $gray-darkest;
+            color: $gray-darker;
         }
 
         .o_page_toc_title {
             display:none;
+
             + ul {
                 padding-left: 0;
             }
@@ -361,7 +394,6 @@ header.o_main_header{
 
 #wrap {
     margin-top: $o-header-mobile-height;
-
     @include media-breakpoint-up(lg) {
         display: flex;
         justify-content: space-between;
@@ -390,7 +422,6 @@ header.o_main_header{
             padding-top: 7rem;
         }
         padding-bottom: 3rem;
-
         @include media-breakpoint-up(lg) {
             left: $o-side-nav-width;
             max-width: calc(100vw - (#{$o-side-nav-width} + var(--bs-gutter-x, 1.5rem)) - #{$o-on-page-width});
@@ -416,11 +447,18 @@ header.o_main_header{
                     margin: -3rem -3rem 3rem;
                     padding: 2rem 3rem;
                 }
+
                 .btn-primary {
                     background-color: #00A09D;
                     border-color: #00A09D;
                 }
             }
+            .row:first-of-type h2.border-top {
+                @include media-breakpoint-up(lg) {
+                    border-top: 0 solid transparent !important;
+                }
+            }
+
             h5 {
                 font-size: 12px;
             }
@@ -431,6 +469,7 @@ header.o_main_header{
                     padding-bottom: .5rem;
                     display: flex;
                     align-items: center;
+
                     &:before {
                         @include o-inline-icon($i-article, 0 .2rem 0 0);
                         color: $gray-light;
@@ -446,7 +485,6 @@ header.o_main_header{
         }
 
         // pages with full width: Legal
-
         &.o_fullwidth_page {
             .toctree-l1 > a {
                 display: block;
@@ -459,11 +497,9 @@ header.o_main_header{
         }
 
         // pages with column for code on the right
-
         &.o_has_code_column {
-
             article.doc-body {
-                > *{
+                > * {
                   max-width: 100%;
                 }
 
@@ -494,13 +530,11 @@ header.o_main_header{
                         @include o-code-col();
                     }
 
-
-
                     .o_git_link {
                         right: calc(#{$o-codecol-width} + 2rem);
                     }
-                    section {
 
+                    section {
                         > * {
                             width: $o-halfpage-width;
                             float: left;
@@ -541,13 +575,34 @@ header.o_main_header{
             }
         }
 
-        article.doc-body {
-            position: relative;
-
-            // hide ugly toctree on "in between" pages (e.g.: /applications.html, /administration.html, ...)
+        &.o_hide_toc {
             .toctree-wrapper {
                 display: none;
             }
+        }
+
+        .toctree-wrapper {
+            > ul {
+                padding-left: 0;
+                list-style: none;
+            }
+
+            .toctree-l1 > a[href="#"] {
+                font-size: 1.2rem;
+                font-weight: 600;
+                border-bottom: 2px solid $gray-darker;
+            }
+
+            a[href="#"] {
+                pointer-events: none;
+                cursor: default;
+                color: $gray-darker;
+                font-weight: $fw_regular;
+            }
+        }
+
+        article.doc-body {
+            position: relative;
 
             .o_git_link {
                 @include font-size($font-size-secondary);
@@ -559,6 +614,7 @@ header.o_main_header{
                     margin-right: .2rem;
                 }
             }
+
             .command {
                 font-family: var(--bs-font-monospace);
             }
@@ -598,7 +654,7 @@ header.o_main_header{
                 > h2 {
                     font-family: $font-family-serif;
                     color: $gray-darker;
-                    margin-top: 3rem;
+                    margin-top: 2rem;
                     margin-bottom: 1rem;
                     padding-bottom: .3rem;
                     border-bottom: 1px solid $gray-light;
@@ -634,14 +690,17 @@ header.o_main_header{
                 }
 
                 .figure {
+
                     .caption, .caption-text {
                         font-weight: $fw_semibold;
                         color: $gray;
                     }
-                    .caption, .caption-text, .legend, .legend p{
+
+                    .caption, .caption-text, .legend, .legend p {
                         font-style: italic;
                         margin: 0 auto;
                     }
+
                     @include media-breakpoint-up(md) {
                         &:not([class^="col"]) .legend {
                             max-width: 60%;
@@ -653,9 +712,11 @@ header.o_main_header{
                     text-decoration: none;
                     font-size: 0;
                     visibility: hidden !important;
+
                     &:before {
                         content: "\a0";
                     }
+
                     &:after {
                         content: '#{$i-link}';
                         font-family: icomoon !important;
@@ -667,11 +728,13 @@ header.o_main_header{
                         @include o-transition(all, .1s)
                     }
                 }
-                *:hover > a.headerlink:after{
+
+                *:hover > a.headerlink:after {
                     // This makes permalinks only visible on hover.
                         visibility: visible;
                         opacity: 1;
                 }
+
                 table.table {
                     @include media-breakpoint-down(lg){
                     display: block;
@@ -680,10 +743,8 @@ header.o_main_header{
                             overflow-wrap: break-word;
                         }
                     }
-
                 }
             }
-
         }
 
         div[class^="highlight"] {
@@ -691,7 +752,6 @@ header.o_main_header{
             overflow-x: auto;
             border: 1px solid $gray-light;
             margin: 1px 0 24px 0;
-            /* max-width: 90vw; */
 
             div[class^="highlight"] {
                 padding: 0px;
@@ -706,7 +766,7 @@ header.o_main_header{
                 overflow: auto;
             }
         }
-        // fixes on pages
+
         .guilabel, .menuselection {
             font-weight: $fw_semibold;
         }
@@ -750,19 +810,7 @@ header.o_main_header{
             text-align: left;
         }
 
-        // restyle numbers on lists
         ol {
-            /* list-style: none;
-            counter-reset: a;
-            > li {
-                position: relative;
-                counter-increment: a;
-                &:before {
-                    content: counter(a) '.';
-                    font-weight: $fw_semibold;
-                    @include o-position-absolute(auto, auto, auto, -1.8rem);
-                }
-            } */
             ol {
                 list-style: lower-alpha;
                 > li:before {
@@ -791,7 +839,7 @@ header.o_main_header{
                 background-color: $white !important;
             }
 
-            > p , > ul{
+            > p , > ul {
                 margin-bottom: .5rem;
             }
             > *:last-child {
@@ -836,8 +884,6 @@ header.o_main_header{
                         content: '#{$i-note}';
                     }
                 }
-
-
             }
 
             &.alert-tip, &.tip {
@@ -896,7 +942,8 @@ header.o_main_header{
                 @include media-breakpoint-up(lg){
                     display: inline-block;
                     width: calc(50% - 1rem);
-                }s
+                }
+
                 a {
                     color: $o-violet-dark;
                 }
@@ -919,7 +966,7 @@ footer {
     .o_get_help {
         padding-top: 3rem;
         padding-bottom: 3rem;
-        background: $gray-100;
+        background: $gray-lighter;
         @include media-breakpoint-up(lg) {
             padding-left: calc(#{$o-side-nav-width} + 3rem)
         }
@@ -932,4 +979,4 @@ footer {
         }
 
     }
-}
\ No newline at end of file
+}