[I18N] *: export 13.0 source terms

2022-09-01 14:28:46 +02:00 · 2022-09-01 14:28:46 +02:00 · b24ce6463d
commit b24ce6463d
parent 1a10dced12
8 changed files with 993 additions and 680 deletions
--- a/locale/sources/finance.pot
+++ b/locale/sources/finance.pot
--- a/locale/sources/general.pot
+++ b/locale/sources/general.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1758,7 +1758,7 @@ msgid "Offering my own services"
 msgstr ""

 #: ../../content/applications/general/in_app_purchase.rst:68
-msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase </developer/misc/api/iap>`."
+msgid "I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole initial purchase. Please, find more information at: :doc:`In-App Purchase </developer/api/iap>`."
 msgstr ""

 #: ../../content/applications/general/users.rst:7
--- a/locale/sources/inventory_and_mrp.pot
+++ b/locale/sources/inventory_and_mrp.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 #: ../../content/applications/inventory_and_mrp.rst:5
-msgid "Inventory & Mrp"
+msgid "Inventory & MRP"
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory.rst:8
@ -3723,7 +3723,7 @@ msgid "In some cases, like for a retail shop storing vegetables and fruits, we h
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/strategies/putaway.rst:23
-msgid "Let’s suppose there are one warehouse location *WH/Stock* and two sub-locations *WH/Stock/Vegatable* and *WH/Stock/Fruits*."
+msgid "Let’s suppose there are one warehouse location *WH/Stock* and two sub-locations *WH/Stock/Vegetables* and *WH/Stock/Fruits*."
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/inventory/routes/strategies/putaway.rst:25
@ -5542,7 +5542,7 @@ msgid "See below a template of the columns used."
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/purchase/purchases/master/import.rst:33
-msgid ":download:`Click here to download the template <files/vendor_pricelists_template.csv>`"
+msgid ":download:`Click here to download the template <import/vendor_pricelists_template.csv>`"
 msgstr ""

 #: ../../content/applications/inventory_and_mrp/purchase/purchases/master/suppliers.rst:3
--- a/locale/sources/marketing.pot
+++ b/locale/sources/marketing.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1018,167 +1018,167 @@ msgstr ""
 msgid "Pricing and FAQ"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:3
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:5
 msgid "SMS Pricing and FAQ"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:6
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:8
 msgid "What do I need to send SMSs?"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:7
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:9
 msgid "SMS Text Messaging is an In-App Purchase (IAP) service that *requires prepaid credits* to work."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:11
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:13
 msgid "How many types of SMSs are there?"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:12
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:14
 msgid "There are 2 types: GSM7 and UNICODE."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:14
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:16
 msgid "**GSM7** is the standard format, with a limit of 160 characters per message, that includes the following characters:"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:23
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:25
 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 ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:27
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:29
 msgid "For GSM7 SMS the size limit is 160 characters, and for Unicode is 70. *Above these limits, the content is divided into a multi-part message* and the limit of characters is lowered to 153 for GSM7 and to 67 for Unicode. The system will inform you in real-time about the number of SMS your message represents."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:34
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:36
 msgid "How much does it cost to send an SMS?"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:35
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:37
 msgid "The price of an SMS depends on the destination and the length (number of characters) of the message."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:37
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:39
 msgid "To see the **price per country, please consult**: `Odoo SMS - FAQ <https://iap-services.odoo.com/iap/sms/pricing#sms_faq_01>`_."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:39
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:41
 msgid "The number of SMSs a message represents will be always available to you in your database."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:49
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:51
 msgid "How do I buy credits?"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:50
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:52
 msgid "Go to :menuselection:`Settings --> Buy Credits`."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:57
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:59
 msgid "Or go to :menuselection:`Settings --> View my Services`."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:65
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:67
 msgid "If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial credits to test the feature."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:70
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:72
 msgid "More common questions"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:72
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:74
 msgid "**Is there an expiration time for my credits?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:74
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:76
 msgid "No, credits do not expire."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:77
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:79
 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 ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:80
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:82
 msgid "Only if that phone number supports SMS (e.g. SIP phones)."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:83
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:85
 msgid "**Do I receive an invoice to buy my credits?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:85
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:87
 msgid "Yes."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:88
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:90
 msgid "**Can the recipient answer to me?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:90
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:92
 msgid "No, it is not possible to reply to the SMS."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:93
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:95
 msgid "**What happens if I send multiple SMS but I do not have enough credits to send them all?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:95
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:97
 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 ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:99
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:101
 msgid "**Do I have a history of the sent SMSs?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:101
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:103
 msgid "Yes, the SMS is logged as a note under the chatter of the corresponding record, and a complete history of the SMSs sent is available on :ref:`developer mode <developer-mode>` under :menuselection:`Technical --> SMS`."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:106
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:108
 msgid "**Can I send as many SMSs I want at once?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:108
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:110
 msgid "Yes, if you have enough credits."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:111
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:113
 msgid "**If I have a number that does not exist in the list of recipients, will I lose credits?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:113
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:115
 msgid "Not if the phone number is in the wrong format (e.g. too many digits). Otherwise, if the SMS is sent to the wrong person or to a fake number, the credit will be lost."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:117
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:119
 msgid "**What happens if I send my SMS to a paying number (e.g.: a contest to win a ticket for a festival)?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:119
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:121
 msgid "The SMS will not be delivered to that kind of number, so you won’t be charged."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:122
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:124
 msgid "**Can I identify the numbers that do not exist when I send several SMSs?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:124
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:126
 msgid "Only the ones that have an invalid format."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:127
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:129
 msgid "**How does the GDPR regulation affect this service?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:129
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:131
 msgid "Please find our `Privacy Policy here <https://iap.odoo.com/privacy#sms>`__."
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:131
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:133
 msgid "**Can I use my own SMS provider?**"
 msgstr ""

-#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:133
+#: ../../content/applications/marketing/sms_marketing/pricing/pricing_and_faq.rst:135
 msgid "Yes, but it is not possible out of the box. Our experts can help you customize your database to make it happen. Please, check our success packs `here <https://www.odoo.com/pricing-packs>`_."
 msgstr ""

--- a/locale/sources/productivity.pot
+++ b/locale/sources/productivity.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -863,7 +863,7 @@ msgid "In some cases, a serial to USB adapter may be needed."
 msgstr ""

 #: ../../content/applications/productivity/iot/devices/scale.rst:17
-msgid "If your scale is `compatibale with Odoo IoT Box <https://www.odoo.com/page/iot-hardware>`_, there is no need to set up anything because it will be automatically detected as soon as it is connected."
+msgid "If your scale is `compatible with Odoo IoT Box <https://www.odoo.com/page/iot-hardware>`_, there is no need to set up anything because it will be automatically detected as soon as it is connected."
 msgstr ""

 #: ../../content/applications/productivity/iot/devices/scale.rst:24
--- a/locale/sources/sales.pot
+++ b/locale/sources/sales.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -59,8 +59,9 @@ msgstr ""
 #: ../../content/applications/sales/crm/track_leads/prospect_visits.rst:12
 #: ../../content/applications/sales/point_of_sale/advanced_pricing_features/loyalty.rst:9
 #: ../../content/applications/sales/point_of_sale/overview/getting_started.rst:14
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:9
 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:12
-#: ../../content/applications/sales/point_of_sale/payment/six.rst:15
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:16
 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:13
 #: ../../content/applications/sales/point_of_sale/restaurant/restaurant.rst:14
 #: ../../content/applications/sales/point_of_sale/restaurant/split.rst:10
@ -1354,8 +1355,102 @@ msgstr ""
 msgid "Payment Terminals"
 msgstr ""

+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:3
+msgid "Adyen"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:5
+msgid "Connecting an **Adyen payment terminal** allows you to offer a fluid payment flow to your customers and ease the work of your cashiers."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:11
+msgid "Start by creating your Adyen account on `Adyen's website <https://www.adyen.com/>`_. Then, board your terminal following the steps described on your terminal's screen."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:15
+msgid "`Adyen Docs - Payment terminal quickstart guides <https://docs.adyen.com/point-of-sale/user-manuals>`_."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:19
+#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36
+msgid "Configure the payment method"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:21
+msgid "First, go to :menuselection:`Point of Sale --> Configuration --> Settings --> Payment Terminals`, and enable :guilabel:`Adyen`. Then, go to :menuselection:`Configuration --> Payment Methods` and create a new payment method. Select :guilabel:`Adyen` in the :guilabel:`Use a Payment Terminal` field."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:27
+msgid "The selected journal **must** be a bank journal for the :guilabel:`Use a payment terminal` field to appear."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:30
+msgid "Finally, fill the mandatory fields with an :guilabel:`Adyen API key`, and an :guilabel:`Adyen Terminal Identifier`."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:34
+msgid "Generate an Adyen API key"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:36
+msgid "The **Adyen API key** is a key used to authenticate your requests. To generate an API key, go to your **Adyen account**."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:39
+msgid "Then, go to :menuselection:`Developers --> API credentials`. Create a new credential or click on an existing one."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:42
+msgid "Click on :guilabel:`Generate an API key` and copy-paste that key onto the Odoo mandatory field."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:45
+msgid "`Adyen Docs - API credentials <https://docs.adyen.com/development-resources/api-credentials#generate-api-key>`_."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:49
+msgid "Locate the Adyen terminal identifier"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:51
+msgid "The **Adyen Terminal Identifier** is your terminal's serial number, which is used to identify the hardware."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:54
+msgid "To find this number, go to your **Adyen account**. Then, go to :menuselection:`Point of Sale --> Terminals`, select the terminal to link, and copy-paste its serial number onto the Odoo mandatory field."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:59
+msgid "Add a new payment method"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:61
+msgid "To add a new **payment method** to a point of sale, go to :menuselection:`Point of Sale --> Configuration --> Point of Sale`. Then, select the POS and go to :menuselection:`Payments --> Payment Methods`, and add your new method for Adyen."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:66
+#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53
+msgid "Pay with a payment terminal"
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:68
+msgid "When processing a payment, select :guilabel:`Adyen` as the payment method. Check the amount and click on :guilabel:`Send`. Once the payment is successful, the status changes to :guilabel:`Payment Successful`."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0
+msgid "In case of connexion issues between Odoo and the payment terminal, force the payment by clicking on :guilabel:`Force Done`, which allows you to validate the order."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:0
+msgid "This option is only available after receiving an error message informing you that the connection failed."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/adyen.rst:77
+msgid "To cancel the payment request, click on :guilabel:`cancel`."
+msgstr ""
+
 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:3
-msgid "Connect an Ingenico Payment Terminal to your PoS"
+msgid "Ingenico"
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:5
@ -1386,10 +1481,6 @@ msgstr ""
 msgid "Now, click on connection change and TCP/IP. Type the IP of your *IoT Box* (you can find it on the form view of your IoT Box). Then, enter 9000 as port. The terminal will restart. Once it is done, go on your *IoT Box* form in Odoo and verify that the terminal has been found."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:36
-msgid "Configure the payment method"
-msgstr ""
-
 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:38
 msgid "First, go in the general settings of the POS app, and activate the Ingenico setting."
 msgstr ""
@ -1398,10 +1489,6 @@ msgstr ""
 msgid "Go back in :menuselection:`Point of Sale --> Configuration --> Point of Sale`, go in the payments section and access your payment methods. Create a new payment method for Ingenico, select the payment terminal option Ingenico, and select your payment terminal device."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:53
-msgid "Pay with a payment terminal"
-msgstr ""
-
 #: ../../content/applications/sales/point_of_sale/payment/ingenico.rst:55
 msgid "In your *PoS interface*, when processing a payment, select a *Payment Method* using a payment terminal. Check that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. When the payment is successful, the status will change to *Payment Successful*."
 msgstr ""
@ -1423,7 +1510,7 @@ msgid "Once your payment is processed, on the payment record, you’ll find the
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/six.rst:3
-msgid "Connect a SIX Payment Terminal to your PoS"
+msgid "SIX"
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/six.rst:5
@ -1431,41 +1518,45 @@ msgid "Connecting a SIX payment terminal allows you to offer a fluid payment flo
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/six.rst:9
+msgid "Starting in July 2022, it will **not** be possible anymore to connect and use a Six payment terminal in PoS."
+msgstr ""
+
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:11
 msgid "Even though Worldline has recently acquired SIX Payment Services and both companies use Yomani payment terminals, the firmware they run is different. Terminals received from Worldline are therefore not compatible with this integration."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:18
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:19
 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:16
 msgid "Configure the Payment Method"
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:20
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:21
 msgid "First, make sure that the POS Six module is installed. For this, go to *Apps*, remove the \"Apps\" filter and search for \"POS Six\"."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:26
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:27
 msgid "Back in :menuselection:`Point of Sale --> Configuration --> Payment Methods`, Create a new payment method for SIX, select the payment terminal option \"SIX without IoT Box\", and enter your payment terminal IP address."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:34
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:35
 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:40
 msgid "Pay with a Payment Terminal"
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:36
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:37
 msgid "In your PoS interface, at the moment of the payment, select a payment method using a payment terminal. Verify that the amount in the tendered column is the one that has to be sent to the payment terminal and click on *Send*. If you want to cancel the payment request, click on cancel."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:44
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:45
 msgid "When the payment is done, the status will change to *Payment Successful*. You can always reverse the last transaction by clicking on *Reverse*."
 msgstr ""

-#: ../../content/applications/sales/point_of_sale/payment/six.rst:51
+#: ../../content/applications/sales/point_of_sale/payment/six.rst:52
 msgid "If there is any issue with the payment terminal, you can still force the payment using the *Force Done*. This will allow you to validate the order in Odoo even if the connection between the terminal and Odoo encounters issues."
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:3
-msgid "Connect a Vantiv Payment Terminal to your PoS"
+msgid "Vantiv"
 msgstr ""

 #: ../../content/applications/sales/point_of_sale/payment/vantiv.rst:5
@ -2464,14 +2555,14 @@ msgid "Amazon.nl"
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/features.rst:94
-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:111
-#: ../../content/applications/sales/sales/amazon_connector/update.rst:73
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:120
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:59
 msgid ":doc:`setup`"
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/features.rst:95
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:160
-#: ../../content/applications/sales/sales/amazon_connector/update.rst:74
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:119
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:60
 msgid ":doc:`manage`"
 msgstr ""

@ -2520,60 +2611,72 @@ msgid "If this is not already done, you need to :ref:`install <general/install>`
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/manage.rst:51
-msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`"
+msgid "If your chosen carrier isn't one supported by Odoo, you can still create a carrier bearing its name (e.g. create a carrier named `Colissimo`). This name is case insensitive, but be careful about typos, as Amazon won't recognize them."
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/manage.rst:54
-msgid "Follow deliveries in FBA"
+msgid "Create a delivery carrier named `Self Delivery` to inform Amazon that you make your own deliveries. You still have to enter a tracking reference."
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/manage.rst:56
-msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program."
+msgid "Keep in mind that the customer is notified by email about the delivery, and the carrier and tracking reference are displayed in the email to the customer."
+msgstr ""
+
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:60
+msgid ":doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`"
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/manage.rst:63
+msgid "Follow deliveries in FBA"
+msgstr ""
+
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:65
+msgid "When a **FBA** (Fulfilled by Amazon) order is synchronized in Odoo, a stock move is recorded for each sales order item so that it is saved in your system. Inventory managers can find such moves in :menuselection:`Inventory --> Reporting --> Product Moves`. They pick up products in a specific inventory location called **Amazon**. This location represents your stock in Amazon's warehouses and allows you to manage the stock of your products under the FBA program."
+msgstr ""
+
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:72
 msgid "To follow your Amazon (FBA) stock in Odoo, you can make an inventory adjustment after replenishing it. You can also trigger an automated replenishment from reordering rules on the Amazon location."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:68
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:77
 msgid "The Amazon location is configurable by Amazon account managed in Odoo. All accounts of the same company use the same location by default. It is however possible to follow the stock by marketplace. First, remove the marketplace for which you want to follow the stock separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another stock location to the second registration of your account."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:76
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:85
 msgid "Issue invoices and register payments"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:78
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:87
 msgid "You can issue invoices for Amazon orders in Odoo. Click **Create Invoice** in the sales order to do so. You can also do it in batch from the list view of orders. Then, confirm and send the invoices to your customers."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:83
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:92
 msgid "To display only Amazon-related orders on the list view, you can filter orders based on the sales team."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:86
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:95
 msgid "As the customer has paid Amazon as an intermediary, you should register invoice payments in a payment journal dedicated to Amazon (e.g. Amazon Payments, with a dedicated intermediary account). You can do the same with the vendor bill received from Amazon and dedicated to commissions. When you receive the balance on your bank account at the end of the month and record your bank statements in Odoo, you simply credit the Amazon intermediary account by the amount received."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:93
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:102
 msgid "Follow your Amazon sales in sales reporting"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:95
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:104
 msgid "As a sales team is set on your account under the tab **Order Follow-up**, this helps you give quick glances at the figures in just a few clicks in Sales reporting. By default, your account's sales team is shared between all of your company's accounts."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:99
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:108
 msgid "If you wish, you can change the sales team on your account for another to perform a separate reporting for the sales of this account."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:103
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:112
 msgid "It is also possible to perform reporting on a per-marketplace basis in a similar fashion. First, remove the marketplace you wish to track separately from the list of synchronized marketplaces. Then, create another registration for this account and remove all marketplaces, except the one to isolate from the others. Finally, assign another sales team to one of the two registrations of your account."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/manage.rst:110
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:159
-#: ../../content/applications/sales/sales/amazon_connector/update.rst:72
+#: ../../content/applications/sales/sales/amazon_connector/manage.rst:119
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:118
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:58
 msgid ":doc:`features`"
 msgstr ""

@ -2582,221 +2685,163 @@ msgid "Configure Amazon Connector in Odoo"
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/setup.rst:6
-msgid "Generate an Authorization Token in Seller Central"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10
-msgid "The Amazon Connector uses an Authorization Token that allows Odoo to fetch data from your Amazon Seller Central account. This token can be obtained directly through Seller Central in a few clicks and needs to be set up in your Odoo database configuration."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:14
-msgid "Connect to your Seller Central account for the marketplace you initially signed up (e.g. if you created your account on Amazon Germany, go to `Amazon Seller Central for Germany <https://sellercentral.amazon.de>`_) with an administrator account."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:19
-msgid "You might need to use the *main* (or first) administrator account and not one added subsequently."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:22
-msgid "In the main menu, select :menuselection:`Apps & Services --> Manage Your Apps`; in the page that displays, click on the ``Authorize new developper`` button:"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28
-msgid "Fill in the form depending on your Marketplace:"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:33
-msgid "If your seller account is registered in the **North America** region, use these values:"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:35
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40
-msgid "Developer's Name: ``Odoo S.A.``"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36
-msgid "Developer ID: ``586127723692``"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:38
-msgid "For the **Europe** region, use these values:"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:41
-msgid "Developer ID: ``579095187166``"
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:43
-msgid "Amazon will then inform you that by submitting the form, you are giving access to your Seller Central Information to Odoo S.A."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:47
-msgid "Odoo S.A. is unable to access your Amazon account's information without the Authorization Token which is stored in your Odoo database - we do not store these tokens on our platform directly and are therefore unable to access your account's information outside of the Amazon Connector normal flows."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:53
 msgid "Register your Amazon account in Odoo"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:57
-msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:10
+msgid "To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on :guilabel:`CREATE`."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:60
-msgid "The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Authorization Token** is the one you generated in the :ref:`previous step <amazon/generate_auth_token>`."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:13
+msgid "Choose a meaningful name for your account (e.g. `Europe`), and select your :guilabel:`Sign-up Marketplace`. This is the original sign-up marketplace of your seller account (e.g. if you created your account on Amazon Germany, your sign-up marketplace will be `amazon.de`)"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:64
-msgid "Upon saving, your credentials are checked. In case of issues, an error will be displayed - the information cannot be saved until your credentials are recognized by Amazon."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:17
+msgid "Upon saving, a button to :guilabel:`link with Amazon` appears. Click on it to be redirected to the Amazon login page, or directly to the consent page if you are already logged in. There, confirm that you want Amazon to give Odoo access to your account and related data."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:67
-msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:21
+msgid "Amazon redirects you to Odoo, with your account registered."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:72
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:23
+msgid "Once the account is registered, the marketplaces available to this account are synchronized and listed under the :guilabel:`Marketplaces` tab. If you wish, you can remove some items from the list of synchronized marketplaces to disable their synchronization."
+msgstr ""
+
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:28
 msgid "Match database products in Amazon"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:74
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:30
 msgid "When an Amazon order is synchronized, up to three sales order items are created in Odoo for each product sold on Amazon: one for the marketplace product, one for the shipping charges (if any) and one for the gift wrapping charges (if any)."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:80
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:36
 msgid "The selection of a database product for a sales order item is done by matching its **internal reference** with the **SKU** for marketplace items, the **shipping code** for delivery charges, and the **gift wrapping** code for gift wrapping charges."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:40
 msgid "For marketplace products, pairings are saved as **Amazon Offers** which are listed under the **Offers** stat button on the account form. Offers are automatically created when the pairing is established and are used for subsequent orders to lookup SKUs. If no offer with a matching SKU is found, :ref:`the internal reference is used instead <amazon/matching>`."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:46
 msgid "It is possible to force the pairing of a marketplace item with a specific product by changing either the product or the SKU of an offer. The offer can be manually created if it was not automatically done yet. This is useful if you do not use the internal reference as the SKU or if you sell the product under different conditions."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:95
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:51
 msgid "If no database product with a matching internal reference is found for a given SKU or gift wrapping code, a default database product **Amazon Sale** is used. The same is done with the default product **Amazon Shipping** and the shipping code."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:100
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:56
 msgid "To modify the default products, activate the :ref:`developer mode <developer-mode>` and navigate to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Default Products`."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:105
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:61
 msgid "Configure taxes of products"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:107
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:63
 msgid "To allow for tax reporting of Amazon sales with Odoo, the taxes applied to the sales order items are those set on the product or determined by the fiscal position. Make sure to have set the correct taxes on your products in Odoo or to have it done by a fiscal position, to avoid discrepancies in the subtotals between Seller Central and Odoo."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:69
 msgid "As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen that order totals differ by a few cents from that on Seller Central. Those differences can be resolved with a write-off when reconciling the payments in Odoo."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:120
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:76
 msgid "Add an unsupported marketplace"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:122
-msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here <amazon/supported-marketplaces>` for the exhaustive list of natively supported marketplaces."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:78
+msgid "Some Amazon Marketplaces, such as Amazon Brazil, are not created by default as they are not officially supported by Odoo but might be compatible with your seller account. These marketplaces can be added manually should you wish to use them. See :ref:`here <amazon/supported-marketplaces>` for the exhaustive list of natively supported marketplaces."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:128
-msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation <https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html>`_. The marketplace must belong to the same region as that of your seller account."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:84
+msgid "To find out if a marketplace is eventually compatible, check the `Amazon Documentation <https://developer-docs.amazon.com/amazon-shipping/docs/seller-central-urls>`_. The marketplace must belong to the same region as that of your seller account."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:132
-msgid "To add a new marketplace, you must first activate the :ref:`developer mode <developer-mode>`."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:88
+msgid "To add a new marketplace, activate the :ref:`developer mode <developer-mode>`."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:134
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:90
 msgid "Once that is done, go to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Marketplaces`."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:137
-msgid "From there, you can create a new marketplace record. You will need the Marketplace ID and Endpoint for your marketplace as described in the `Amazon Documentation <https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html>`_."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:93
+msgid "From there, create a new marketplace record. Enter the Marketplace ID and select the Amazon Region for your marketplace as described in the `Amazon Documentation for marketplace IDs <https://developer-docs.amazon.com/amazon-shipping/docs/marketplace-ids>`_, and the Seller Central URL as described in the `Amazon Documentation for seller central URLs <https://developer-docs.amazon.com/amazon-shipping/docs/seller-central-urls>`_."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:141
-msgid "Set the name of the record to ``Amazon.<domain>`` to easily retrieve it (for instance: ``Amazon.se``). The **Code**, **Domain** and **API Identifier** fields should respectively hold the *Country Code*, *Amazon MWS Endpoint* and *MarketplaceId* values from the Amazon Documentation."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:99
+msgid "Set the name of the record to ``Amazon.<country code>`` to easily retrieve it (e.g.: ``Amazon.se``). The :guilabel:`API Identifier`, the :guilabel:`Region` and the :guilabel:`Seller Central URL` fields should respectively hold the *MarketplaceId*, the selected Amazon region and the *Seller Central URL* values from the Amazon Documentation."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:145
-msgid "Once the marketplace is saved, you should then update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`, open the account on which you wish to use the new marketplace, go to the **Marketplaces** tab and click on **Update available marketplaces** (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account."
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:104
+msgid "Once the marketplace is saved, update the Amazon Account configuration by going to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`. Open the account on which you wish to use the new marketplace, go to the :guilabel:`Marketplaces` tab and click on :guilabel:`Update available marketplaces` (an animation should confirm the success of the operation). Newly added marketplaces are automatically added to the list of synchronized marketplaces. If the new marketplace is not added to the list, it means that it is either incompatible or unavailable for your seller account."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/setup.rst:154
+#: ../../content/applications/sales/sales/amazon_connector/setup.rst:113
 msgid "As manually added marketplaces are not officially supported by Odoo, there is no guarantee that adding one as described above will work, nor can this be considered as a bug when contacting Odoo Support."
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/update.rst:3
-msgid "Install the Amazon Connector Authentication Update"
+msgid "Install the Amazon Selling Partner API Update"
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/update.rst:5
-msgid "Starting July 2020, the Amazon Connector requires the use of a new authentication method that makes it easier for you to set up the Connector."
+msgid "Starting July 2022, due to a change in Amazon's API, the Amazon Connector needs to be updated to continue to exchange information with Amazon. This also makes it easier for you to set up the Connector."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:8
-msgid "Prior to the update, Odoo customers who wished to use the Amazon Connector had to apply to get developer credentials through Amazon, which was a painful and long process that could take weeks. This method of authentication is still technically possible, but Amazon will refuse to provide developer credentials for Odoo customers from July 2020 onwards and will deactivate such credentials for existing customers."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/update.rst:14
-msgid "This documentation will help you install the update and use the new authentication flow."
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:10
+msgid "If your Odoo database is created after the update was released, the update module is installed automatically. To check if this module is already installed, go to :guilabel:`Apps`, remove the ``Apps`` filter and search for ``Amazon``. If the module :guilabel:`Amazon/Selling Partner API Patch` is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the :doc:`setup <setup>` step of the Amazon Connector."
 msgstr ""

 #: ../../content/applications/sales/sales/amazon_connector/update.rst:17
-msgid "Note that if your Odoo database was first created after the update was released, the update module is installed automatically. You can check if this module is already installed by going to the  **Apps** menu, removing the ``Apps`` search facet and search for ``amazon``. If the module **Amazon/Authentication Patch** is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the :doc:`setup <setup>` step of the Amazon Connector."
-msgstr ""
-
-#: ../../content/applications/sales/sales/amazon_connector/update.rst:25
 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:63
 msgid "Update Odoo to the latest release"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:27
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:19
 msgid "The new authentication mechanism is made available through a new Odoo module; to be able to install it, you must make sure that your Odoo source code is up-to-date."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:30
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:22
 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:68
 msgid "If you use Odoo on Odoo.com or Odoo.sh platform, your code is already up-to-date and you can proceed to the next step."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:33
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:25
 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:70
 msgid "If you use Odoo with an on-premise setup or through a partner, then you must update your installation as detailed in :doc:`this documentation page </administration/maintain/update>` or by contacting your integrating partner."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:39
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:31
 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:75
 msgid "Update the list of available modules"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:41
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:33
 msgid "New modules must be *discovered* by your Odoo instance to be available in the **Apps** menu."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:44
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:36
 msgid "To do so, activate the :ref:`developer mode <developer-mode>`, and go to :menuselection:`Apps --> Update Apps List`. A wizard will ask for confirmation."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:48
-msgid "Install the Amazon/Authentication Patch"
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:40
+msgid "Install the Amazon/Selling Partner API Patch"
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:51
-#: ../../content/applications/sales/sales/ebay_connector/setup.rst:87
-msgid "You should never install new modules in your production database without testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment - you should contact your integrating partner for more information regarding how to test a new module in your particular setup."
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:43
+msgid "You should never install new modules in your production database without first testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment---contact your integrating partner for more information regarding how to test a new module in your particular setup."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:58
-msgid "The module should now be available in your **Apps** menu. Remove the ``Apps`` search facet and search for ``amazon``; the module **Amazon/Authentication Patch** should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page."
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:49
+msgid "The module should now be available in your :guilabel:`Apps` menu. Remove the ``Apps`` filter and search for ``Amazon``; the module :guilabel:`Amazon/Selling Partner API Patch` should be available for installation. If you cannot find the module after having updated the list of available modules, it means your Odoo source code is not up-to-date; refer to step one of this page."
 msgstr ""

-#: ../../content/applications/sales/sales/amazon_connector/update.rst:67
-msgid "Once the module is installed, you will need to generate an Authorization Token in Amazon Seller Central and set it up on your Amazon Account in Odoo; this process is detailed in the :doc:`setup <setup>` page."
+#: ../../content/applications/sales/sales/amazon_connector/update.rst:54
+msgid "Once the module is installed, link your Amazon account by following the instructions on the :doc:`setup <setup>` page."
 msgstr ""

 #: ../../content/applications/sales/sales/ebay_connector.rst:5
@ -2927,6 +2972,10 @@ msgstr ""
 msgid "Install the eBay Connector - Account Deletion update"
 msgstr ""

+#: ../../content/applications/sales/sales/ebay_connector/setup.rst:87
+msgid "You should never install new modules in your production database without testing them in a duplicate or staging environment. For Odoo.com customers, a duplicate database can be created from the database management page. For Odoo.sh users, you should use a staging or duplicate database. For on-premise users, you should use a staging environment - you should contact your integrating partner for more information regarding how to test a new module in your particular setup."
+msgstr ""
+
 #: ../../content/applications/sales/sales/ebay_connector/setup.rst:94
 msgid "To install the module, go to the :menuselection:`Apps` menu, remove the `Apps` search facet and search for `ebay`. If the module **eBay Connector - Account Deletion** is present and marked as installed, your Odoo database is already up-to-date and you can proceed with the next step. If it is not yet installed, install it now."
 msgstr ""
--- a/locale/sources/sphinx.pot
+++ b/locale/sources/sphinx.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -28,7 +28,7 @@ msgstr ""
 msgid "Ask the Odoo Community"
 msgstr ""

-#: ../../extensions/odoo_theme/layout_templates/header.html:11
+#: ../../extensions/odoo_theme/layout_templates/header.html:10
 msgid "Try Odoo for FREE"
 msgstr ""

@ -131,10 +131,14 @@ msgid "You want to contribute to Odoo but don't know where to start? The tutoria
 msgstr ""

 #: ../../extensions/odoo_theme/layout_templates/homepage.html:102
-msgid "Write documentation"
+msgid "Coding guidelines"
 msgstr ""

 #: ../../extensions/odoo_theme/layout_templates/homepage.html:107
+msgid "Documentation"
+msgstr ""
+
+#: ../../extensions/odoo_theme/layout_templates/homepage.html:112
 msgid "Content guidelines"
 msgstr ""

--- a/locale/sources/websites.pot
+++ b/locale/sources/websites.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-08 13:15+0000\n"
+"POT-Creation-Date: 2022-09-01 12:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -34,11 +34,15 @@ msgid "Odoo offers a :ref:`free custom domain name <domain-name/odoo-register>`
 msgstr ""

 #: ../../content/applications/websites/ecommerce.rst:19
+msgid ":doc:`Website Documentation <website>`"
+msgstr ""
+
+#: ../../content/applications/websites/ecommerce.rst:20
 #: ../../content/applications/websites/website.rst:20
 msgid "`Odoo Tutorials: Website <https://www.odoo.com/slides/website-25>`_"
 msgstr ""

-#: ../../content/applications/websites/ecommerce.rst:20
+#: ../../content/applications/websites/ecommerce.rst:21
 #: ../../content/applications/websites/website.rst:21
 msgid "`Odoo Tutorials: eCommerce <https://www.odoo.com/slides/ecommerce-26>`_"
 msgstr ""
@ -545,10 +549,6 @@ msgstr ""
 msgid "Turn on *Alternative Products* from the *Customize* menu of the product web page."
 msgstr ""

-#: ../../content/applications/websites/ecommerce/publish.rst:5
-msgid "Launch my website"
-msgstr ""
-
 #: ../../content/applications/websites/ecommerce/shopper_experience.rst:5
 msgid "Get paid"
 msgstr ""
@ -880,31 +880,43 @@ msgstr ""
 msgid "How to track your website's traffic in Google Analytics"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics.rst:5
-msgid "To follow your website's traffic with Google Analytics:"
-msgstr ""
-
-#: ../../content/applications/websites/website/optimize/google_analytics.rst:7
-msgid "`Create a Google Analytics account <https://www.google.com/analytics/>`__ if you don't have any."
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:6
+msgid "Google deprecated **Universal Analytics** which won't be supported anymore in `July 2023 <https://support.google.com/analytics/answer/11583528>`_. They are replacing it with **Analytics 4**."
 msgstr ""

 #: ../../content/applications/websites/website/optimize/google_analytics.rst:10
+msgid "New accounts are already using it, but accounts created before `October 2020 <https://support.google.com/analytics/answer/11583832>`_ are most likely still using **Universal Analytics**."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:14
+msgid "Odoo 15.0 is already adapted and ready for **Analytics 4**. After July 2023, if you want to use Google Analytics tracking in versions before 15.0, you will need to insert the GA tracker code manually, instead of entering your GA key in the Odoo settings."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:19
+msgid "To follow your website's traffic with Google Analytics:"
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:21
+msgid "`Create a Google Analytics account <https://www.google.com/analytics/>`__ if you don't have any."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:24
 msgid "Go through the creation form and accept the conditions to get the tracking ID."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics.rst:15
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:29
 msgid "Copy the tracking ID to insert it in Odoo."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics.rst:20
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:34
 msgid "Go to the *Configuration* menu of your Odoo's Website app. In the settings, turn on Google Analytics and paste the tracking ID. Then save the page."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics.rst:27
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:41
 msgid "To make your first steps in Google Analytics, refer to `Google Documentation <https://support.google.com/analytics/answer/1008015?hl=en/>`_."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics.rst:32
+#: ../../content/applications/websites/website/optimize/google_analytics.rst:46
 msgid ":doc:`google_analytics_dashboard`"
 msgstr ""

@ -912,55 +924,71 @@ msgstr ""
 msgid "How to track your website traffic from your Odoo Dashboard"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:5
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:6
+msgid "It is not possible anymore for new Google Analytics accounts to integrate their **Google Analytics Dashboard** inside their **Odoo Dashboard**. Google deprecated **Universal Analytics** which won't be supported anymore in `July 2023 <https://support.google.com/analytics/answer/11583528>`_. They are replacing it with **Analytics 4**. New accounts are already using it."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:12
+msgid "**Analytics 4** `doesn't allow <https://issuetracker.google.com/issues/233738709?pli=1>`_ its dashboard to be integrated in external websites."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:15
+msgid "You now have to check your Analytics data directly in the Google Platform as it won't be possible in Odoo anymore."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:18
+msgid "Accounts created before `October 2020 <https://support.google.com/analytics/answer/11583832>`_ should still be using **Universal Analytics** and be able to integrate their dashboard on external website until the official end of support `around mid 2023 <https://developers.googleblog.com/2022/03/gis-jsweb-authz-migration.html>`_."
+msgstr ""
+
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:23
 msgid "You can follow your traffic statistics straight from your Odoo Website Dashboard thanks to Google Analytics."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:8
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:26
 msgid "A preliminary step is creating a Google Analytics account and entering the tracking ID in your Website's settings (see :doc:`google_analytics`)."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:11
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:29
 msgid "Go to `Google APIs platform <https://console.developers.google.com>`__ to generate Analytics API credentials. Log in with your Google account."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:14
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:32
 msgid "Select Analytics API."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:19
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:37
 msgid "Create a new project and give it a name (e.g. Odoo). This project is needed to store your API credentials."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:25
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:43
 msgid "Enable the API."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:30
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:48
 msgid "Create credentials to use in Odoo."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:35
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:53
 msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:41
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:59
 msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:51
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:69
 msgid "Go through the Consent Screen step by entering a product name (e.g. Google Analytics in Odoo). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:56
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:74
 msgid "Finally you are provided with your Client ID. Copy and paste it in Odoo."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:61
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:79
 msgid "Open your Website Dashboard in Odoo and link your Analytics account. to past your Client ID."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:67
+#: ../../content/applications/websites/website/optimize/google_analytics_dashboard.rst:85
 msgid "As a last step, authorize Odoo to access Google API."
 msgstr ""

@ -1669,86 +1697,78 @@ msgid "Scalability"
 msgstr ""

 #: ../../content/applications/websites/website/optimize/seo.rst:561
-msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop). The following link provides an analysis of the major open source CMS and eCommerce compared to Odoo when it comes to high query volumes: `https://www.odoo.com/slides/slide/197 <https://www.odoo.com/slides/slide/odoo-cms-performance-comparison-and-optimisation-197>`_"
+msgid "In addition to being fast, Odoo is also more scalable than traditional CMS and eCommerce (Drupal, Wordpress, Magento, Prestashop)."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:568
-msgid "Todo"
-msgstr ""
-
-#: ../../content/applications/websites/website/optimize/seo.rst:568
-msgid "fix above link"
-msgstr ""
-
-#: ../../content/applications/websites/website/optimize/seo.rst:570
+#: ../../content/applications/websites/website/optimize/seo.rst:564
 msgid "Here is the slide that summarizes the scalability of Odoo Website & eCommerce."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:576
+#: ../../content/applications/websites/website/optimize/seo.rst:570
 msgid "Search Engines Files"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:579
+#: ../../content/applications/websites/website/optimize/seo.rst:573
 msgid "Sitemap"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:581
+#: ../../content/applications/websites/website/optimize/seo.rst:575
 msgid "The sitemap points out pages to index to search engine robots. Odoo generates a ``/sitemap.xml`` file automatically for you. For performance reasons, this file is cached and updated every 12 hours."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:585
+#: ../../content/applications/websites/website/optimize/seo.rst:579
 msgid "By default, all URLs will be in a single ``/sitemap.xml`` file, but if you have a lot of pages, Odoo will automatically create a Sitemap Index file, respecting the `sitemaps.org protocol <http://www.sitemaps.org/protocol.html>`__ grouping sitemap URL's in 45000 chunks per file."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:591
+#: ../../content/applications/websites/website/optimize/seo.rst:585
 msgid "Every sitemap entry has 4 attributes that are computed automatically:"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:593
+#: ../../content/applications/websites/website/optimize/seo.rst:587
 msgid "``<loc>`` : the URL of a page"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:595
+#: ../../content/applications/websites/website/optimize/seo.rst:589
 msgid "``<lastmod>`` : last modification date of the resource, computed automatically based on related object. For a page related to a product, this could be the last modification date of the product or the page."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:600
+#: ../../content/applications/websites/website/optimize/seo.rst:594
 msgid "``<priority>`` : modules may implement their own priority algorithm based on their content (example: a forum might assign a priority based on the number of votes on a specific post). The priority of a static page is defined by it's priority field, which is normalized (16 is the default)."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:607
+#: ../../content/applications/websites/website/optimize/seo.rst:601
 msgid "Structured Data Markup"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:609
+#: ../../content/applications/websites/website/optimize/seo.rst:603
 msgid "Structured Data Markup is used to generate Rich Snippets in search engine results. It is a way for website owners to send structured data to search engine robots; helping them understand your content and create well-presented search results."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:614
+#: ../../content/applications/websites/website/optimize/seo.rst:608
 msgid "Google supports a number of rich snippets for content types, including: Reviews, People, Products, Businesses, Events and Organizations."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:617
+#: ../../content/applications/websites/website/optimize/seo.rst:611
 msgid "Odoo implements micro data as defined in the `schema.org <http://schema.org>`__ specification for events, eCommerce products, forum posts and contact addresses. This allows your product pages to be displayed in Google using extra information like the price and rating of a product:"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:627
+#: ../../content/applications/websites/website/optimize/seo.rst:621
 msgid "robots.txt"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:629
+#: ../../content/applications/websites/website/optimize/seo.rst:623
 msgid "When indexing your website, search engines take a first look at the general indexing rules of the a``/robots.txt`` file (allowed robots, sitemap path, etc.). Odoo automatically creates it. Its content is:"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:633
+#: ../../content/applications/websites/website/optimize/seo.rst:627
 msgid "User-agent: \\* Sitemap: https://www.odoo.com/sitemap.xml"
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:636
+#: ../../content/applications/websites/website/optimize/seo.rst:630
 msgid "It means that all robots are allowed to index your website and there is no other indexing rule than specified in the sitemap to be found at following address."
 msgstr ""

-#: ../../content/applications/websites/website/optimize/seo.rst:640
+#: ../../content/applications/websites/website/optimize/seo.rst:634
 msgid "You can customize the file *robots* in :ref:`developer mode <developer-mode>` from *Settings --> Technical --> User Interface --> Views* (exclude robots, exclude some pages, redirect to a custom Sitemap). Make the Model Data of the view *Non Updatable* to not reset the file after system upgrades."
 msgstr ""

@ -1932,191 +1952,207 @@ msgstr ""
 msgid ":doc:`/administration/maintain/domain_names`"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:130
+#: ../../content/applications/websites/website/publish/multi_website.rst:129
+msgid "If you setup an extra website and specify the domain name you will have to do three things to get this feature to work:"
+msgstr ""
+
+#: ../../content/applications/websites/website/publish/multi_website.rst:132
+msgid "Setup an A-record in the DNS configuration of your hosting provider so that \"www.mywebsite2.ext\" is redirected to the IP of your Odoo instance."
+msgstr ""
+
+#: ../../content/applications/websites/website/publish/multi_website.rst:134
+msgid "Create an extra Nginx ``server`` block in which you set the ``server_name`` that you've set in the :guilabel:`Website domain` field."
+msgstr ""
+
+#: ../../content/applications/websites/website/publish/multi_website.rst:136
+msgid "Reload and restart your Nginx instance to use the new ``server`` block."
+msgstr ""
+
+#: ../../content/applications/websites/website/publish/multi_website.rst:139
 msgid "Customize the visitor experience"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:133
+#: ../../content/applications/websites/website/publish/multi_website.rst:142
 msgid "The customer experience can be customized very profoundly thanks to the menu \\*Customize\\*. All the visual options available there are specific to each website. Go through the different pages to adapt them to this new audience. Focus on workflows, and automatic pages (eCommerce checkout, blogs, events, etc.) as the number of available options is higher there."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:143
+#: ../../content/applications/websites/website/publish/multi_website.rst:152
 msgid "Publish specific content per website"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:146
+#: ../../content/applications/websites/website/publish/multi_website.rst:155
 msgid "Like static pages, any content created from the front-end (product, blog post, etc.) is always only published in the current website. You can change that from the edit form view in the backend and leave the *Website* field blank. This will publish it in all the websites."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:154
+#: ../../content/applications/websites/website/publish/multi_website.rst:163
 msgid "Here are all the objects that you can link to *either one or all the websites*:"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:157
+#: ../../content/applications/websites/website/publish/multi_website.rst:166
 msgid "Products"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:159
+#: ../../content/applications/websites/website/publish/multi_website.rst:168
 msgid "Product Categories for eCommerce"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:161
+#: ../../content/applications/websites/website/publish/multi_website.rst:170
 msgid "Blogs"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:163
+#: ../../content/applications/websites/website/publish/multi_website.rst:172
 msgid "Slide Channels"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:165
+#: ../../content/applications/websites/website/publish/multi_website.rst:174
 msgid "Forums"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:167
+#: ../../content/applications/websites/website/publish/multi_website.rst:176
 msgid "Events"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:169
+#: ../../content/applications/websites/website/publish/multi_website.rst:178
 msgid "Job Positions"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:172
+#: ../../content/applications/websites/website/publish/multi_website.rst:181
 msgid "When you create the record from the backend and publish it, typically a product or an event, it is made available in all websites."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:176
+#: ../../content/applications/websites/website/publish/multi_website.rst:185
 msgid "Publish a page in all websites"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:178
+#: ../../content/applications/websites/website/publish/multi_website.rst:187
 msgid "A new static page is created and only made available in the current website. You can duplicate it to other websites from :menuselection:`Website --> Configuration --> Pages`. To do so, leave the *Website* field empty."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:182
+#: ../../content/applications/websites/website/publish/multi_website.rst:191
 msgid "If you want to duplicate it in just one other website, duplicate the page and set the new website."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:188
+#: ../../content/applications/websites/website/publish/multi_website.rst:197
 msgid "When you edit the page again, the change only affects the current website. A new page is duplicated and tied up to the website. The original page still being linked to all websites."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:193
+#: ../../content/applications/websites/website/publish/multi_website.rst:202
 msgid "By grouping pages by URL in the page manager, you quickly find the original page behind each edited page."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:200
+#: ../../content/applications/websites/website/publish/multi_website.rst:209
 msgid "Multi-companies"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:202
+#: ../../content/applications/websites/website/publish/multi_website.rst:211
 msgid "Each website can be linked to a specific company of your system, in a multi-companies environment."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:208
+#: ../../content/applications/websites/website/publish/multi_website.rst:217
 msgid "With such a configuration, only company-related data appear on the website (products, jobs, events, etc.)."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:211
+#: ../../content/applications/websites/website/publish/multi_website.rst:220
 msgid "Website editors can only view and edit the pages of the records they have access to, typically the ones belonging to their current company (and to their subsidiaries, or child companies in Odoo language). And so is it for visitors."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:217
+#: ../../content/applications/websites/website/publish/multi_website.rst:226
 msgid "If websites are multi-companies, you don’t change company when switching websites. To change the company and see the related content, use the company selector in the menu."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:223
+#: ../../content/applications/websites/website/publish/multi_website.rst:232
 msgid "Configure your eCommerce website"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:225
+#: ../../content/applications/websites/website/publish/multi_website.rst:234
 msgid "eCommerce is a crucial feature in the multi-websites environment. We made it so that the entire flow can be customized to fit the very audience of each website."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:230
+#: ../../content/applications/websites/website/publish/multi_website.rst:239
 msgid "Products only available on one website"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:232
+#: ../../content/applications/websites/website/publish/multi_website.rst:241
 msgid "We already saw earlier how to publish a specific record in only one website. You will find the \\*Website\\* field in the eCommerce tab of the product edit form. Empty means available in all websites."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:240
+#: ../../content/applications/websites/website/publish/multi_website.rst:249
 msgid "Products available on *some* websites"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:242
+#: ../../content/applications/websites/website/publish/multi_website.rst:251
 msgid "To make a product available on some websites, but not all of them, you should duplicate the product for each website."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:245
+#: ../../content/applications/websites/website/publish/multi_website.rst:254
 msgid "If you need a unique reference to manage in your inventory, you should install *Manufacturing\\ and create *Kits* BoMs (bills of materials). Each kit will link each published “virtual” product to the main reference managed in your inventory. That way, any item sold from your website will be converted into the storable item in the delivery order."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:252
+#: ../../content/applications/websites/website/publish/multi_website.rst:261
 msgid "Pricelists"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:254
+#: ../../content/applications/websites/website/publish/multi_website.rst:263
 msgid "To manage specific prices by websites, you can activate *Multiple Sales Prices per Product* in Website settings."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:257
+#: ../../content/applications/websites/website/publish/multi_website.rst:266
 msgid "Then, go to :menuselection:`Website --> Products --> Pricelists` to create additional pricelists. See :doc:`../../ecommerce/maximizing_revenue/pricing`."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:260
+#: ../../content/applications/websites/website/publish/multi_website.rst:269
 msgid "If you need help. Select a website to make a pricelist only available on this website."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:266
+#: ../../content/applications/websites/website/publish/multi_website.rst:275
 msgid "Leaving the field empty means that you make it work in all websites if *Selectable* is selected. Otherwise, it makes it only available for backend operations of Sales and Point of Sale applications."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:271
+#: ../../content/applications/websites/website/publish/multi_website.rst:280
 msgid "Payment Acquirers and Delivery Methods"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:273
+#: ../../content/applications/websites/website/publish/multi_website.rst:282
 msgid "By default, published payment acquirers and delivery methods are deployed in all websites. You could already use specific payment acquirers per country using Geo IP by defining countries in their configuration. Now you can also do it per website by filling in the *Website* field."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:279
+#: ../../content/applications/websites/website/publish/multi_website.rst:288
 msgid "Customer accounts"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:281
+#: ../../content/applications/websites/website/publish/multi_website.rst:290
 msgid "There is a setting to choose how to manage customer accounts in Website settings. You can either allow customers to use one account through all the websites or compel them to create one account for each website. This last option is convenient if your websites shouldn’t be related to each other in the visitor mind."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:291
+#: ../../content/applications/websites/website/publish/multi_website.rst:300
 msgid "Technical hints for customization"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:293
+#: ../../content/applications/websites/website/publish/multi_website.rst:302
 msgid "If you want to publish custom objects on the website, here are a few tips to make it work with multi websites:"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:297
+#: ../../content/applications/websites/website/publish/multi_website.rst:306
 msgid "Sitemap: don’t forget the domain in the route to only publish"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:297
+#: ../../content/applications/websites/website/publish/multi_website.rst:306
 msgid "available records in each website’s sitemap."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:301
+#: ../../content/applications/websites/website/publish/multi_website.rst:310
 msgid "Access: you should call the method"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:300
+#: ../../content/applications/websites/website/publish/multi_website.rst:309
 msgid "*can_access_from_current_website* in the controller to make sure the visitor can see a record in the current website."
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:305
+#: ../../content/applications/websites/website/publish/multi_website.rst:314
 msgid "Search: when a list of records is displayed, don’t forget to specify"
 msgstr ""

-#: ../../content/applications/websites/website/publish/multi_website.rst:304
+#: ../../content/applications/websites/website/publish/multi_website.rst:313
 msgid "the domain to only display records available for the current website."
 msgstr ""

@ -2153,7 +2189,7 @@ msgid "If you can't/don't want to locate the geoip database in ``/usr/share/GeoI
 msgstr ""

 #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:36
-msgid ":doc:`CLI documentation </developer/misc/other/cmdline>`."
+msgid ":doc:`CLI documentation </developer/cli>`."
 msgstr ""

 #: ../../content/applications/websites/website/publish/on-premise_geo-ip-installation.rst:39