From ec3022603c0e2fc7b774e55b67f52e54c610bb2a Mon Sep 17 00:00:00 2001
From: Ben Bucksch <ben.bucksch@beonex.com>
Date: Mon, 12 Jul 2021 13:40:28 +0300
Subject: [PATCH] Bug 1697575 - [autoconfig] Add Office365 as the official
 brand name. r=aleca,mkmelin

---
 mail/components/accountcreation/content/accountSetup.xhtml   | 5 +++--
 .../locales/en-US/messenger/accountcreation/accountSetup.ftl | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail/components/accountcreation/content/accountSetup.xhtml b/mail/components/accountcreation/content/accountSetup.xhtml
index b6b29107a3..b3b8264765 100644
--- a/mail/components/accountcreation/content/accountSetup.xhtml
+++ b/mail/components/accountcreation/content/accountSetup.xhtml
@@ -398,10 +398,11 @@
                    value="exchange"
                    name="resultsServerType"
                    onchange="gAccountSetup.onResultServerTypeChanged();" />
-            <span data-l10n-id="account-setup-result-exchange" class="strong">
+            <span class="strong">
+              Exchange/Office365
             </span>
             <p class="result-indent"
-               data-l10n-id="account-setup-result-exchange-description">
+               data-l10n-id="account-setup-result-exchange2-description">
             </p>
           </label>
           <aside class="result-details">
diff --git a/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl b/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl
index 061306951d..3e19bc832b 100644
--- a/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl
+++ b/mail/locales/en-US/messenger/accountcreation/accountSetup.ftl
@@ -189,7 +189,8 @@ account-setup-result-pop-description = Keep your folders and emails on your comp
 # Note: Exchange is the name of a product.
 account-setup-result-exchange = Exchange
 
-account-setup-result-exchange-description = Connect to the Microsoft Exchange server
+# Note: Exchange, Office365 are the name of products.
+account-setup-result-exchange2-description = Use the Microsoft Exchange server or Office365 cloud services
 
 account-setup-incoming-title = Incoming