[MERGE] forward port branch saas-12.4 up to 98a55917a60

1 files changed, 39 insertions, 27 deletions

diff --git a/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot b/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot
index 01164947e1d..b7371cd0586 100644
--- a/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot
+++ b/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot
@@ -1,14 +1,14 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* sale_quotation_builder
+# 	* sale_quotation_builder
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server saas~12.2\n"
+"Project-Id-Version: Odoo Server saas~12.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-20 13:50+0000\n"
-"PO-Revision-Date: 2019-03-20 13:50+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2019-08-12 11:32+0000\n"
+"PO-Revision-Date: 2019-08-12 11:32+0000\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.sale_order_portal_content_inherit_sale_quotation_builder
-#: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
 msgid "&amp;times;"
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.brand_promotion
-msgid ",\n"
+msgid ""
+",\n"
 "                an awesome"
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
-msgid ":\n"
+msgid ""
+":\n"
 "                                        this content will appear on the quotation only if this\n"
 "                                        product is put on the quote."
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
-msgid ":\n"
+msgid ""
+":\n"
 "                                        this content will appear on the quotation only if this\n"
 "                                        product is used in the quote."
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.sale_order_portal_content_inherit_sale_quotation_builder
-msgid ":\n"
+msgid ""
+":\n"
 "                        this content will appear on the quotation only if this\n"
 "                        product is not removed."
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
-msgid "<strong>Template Header:</strong> this content\n"
+msgid ""
+"<strong>Template Header:</strong> this content\n"
 "                                    will appear on all quotations using this\n"
 "                                    template."
 msgstr ""
@@ -62,19 +66,14 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "As a leading professional services firm,\n"
+msgid ""
+"As a leading professional services firm,\n"
 "                                we know that success is all about the\n"
 "                                commitment we put on strong services."
 msgstr ""
 
 #. module: sale_quotation_builder
-#: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
-msgid "Back"
-msgstr ""
-
-#. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.sale_order_portal_content_inherit_sale_quotation_builder
-#: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
 msgid "Close"
 msgstr ""
 
@@ -90,7 +89,8 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "Great quotation templates will significantly\n"
+msgid ""
+"Great quotation templates will significantly\n"
 "                                <strong>boost your success rate</strong>. The\n"
 "                                first section is usually about your company,\n"
 "                                your references, your methodology or\n"
@@ -99,7 +99,8 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "If you edit a quotation from the 'Preview' of a quotation, you will\n"
+msgid ""
+"If you edit a quotation from the 'Preview' of a quotation, you will\n"
 "                        update that quotation only. If you edit the quotation\n"
 "                        template (from the Configuration menu), all future quotations will\n"
 "                        use this modified template."
@@ -152,7 +153,8 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "Product quality is the foundation we\n"
+msgid ""
+"Product quality is the foundation we\n"
 "                                stand on; we build it with a relentless\n"
 "                                focus on fabric, performance and craftsmanship."
 msgstr ""
@@ -220,12 +222,15 @@ msgstr ""
 #. module: sale_quotation_builder
 #: model:ir.model.fields,help:sale_quotation_builder.field_product_product__quotation_description
 #: model:ir.model.fields,help:sale_quotation_builder.field_product_template__quotation_description
-msgid "This field uses the Quotation Only Description if it is defined, otherwise it will try to read the eCommerce Description."
+msgid ""
+"This field uses the Quotation Only Description if it is defined, otherwise "
+"it will try to read the eCommerce Description."
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "This is a <strong>sample quotation template</strong>. You should\n"
+msgid ""
+"This is a <strong>sample quotation template</strong>. You should\n"
 "                                customize it to fit your own needs from the <i>Sales</i>\n"
 "                                application, using the menu: Configuration /\n"
 "                                Quotation Templates."
@@ -233,14 +238,21 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
-msgid "Titles with style <i>Heading 1</i> and\n"
+msgid "This is a preview of the sale order template."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model_terms:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid ""
+"Titles with style <i>Heading 1</i> and\n"
 "                                    <i>Heading 2</i> will be used to generate the\n"
 "                                    table of content automatically."
 msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "We always ensure that our products are\n"
+msgid ""
+"We always ensure that our products are\n"
 "                                set at a fair price so that you will be\n"
 "                                happy to buy them."
 msgstr ""
@@ -258,10 +270,10 @@ msgstr ""
 
 #. module: sale_quotation_builder
 #: model_terms:sale.order.template,website_description:sale_quotation_builder.sale_order_template_default
-msgid "You can <strong>set a description per product</strong>. Odoo will\n"
+msgid ""
+"You can <strong>set a description per product</strong>. Odoo will\n"
 "                        automatically create a quotation using the descriptions\n"
 "                        of all products in the proposal. The table of content\n"
 "                        on the left is generated automatically using the styles you\n"
 "                        used in your description (heading 1, heading 2, ...)"
 msgstr ""
-