Merge pull request #112 from thunderbird/update

Update messages

Author: coreycb

_data/comm.json

@@ -8007,7 +8007,9 @@
     "account-hub-email-finish-button",
     "account-hub-email-manually-configure-button",
     "account-hub-email-continue-button",
+    "account-hub-email-set-up-account-button",
     "account-hub-email-confirm-button",
+    "account-hub-email-find-settings-button",
     "account-hub-result-incoming-legend",
     "account-hub-result-outgoing-legend",
     "account-hub-all-servers-legend",
@@ -8043,6 +8045,21 @@
     "account-hub-ssl-noencryption-option.label",
     "account-hub-auth-no-authentication-option.label",
     "account-hub-auth-label",
+    "account-hub-exchange-type-title",
+    "account-hub-exchange-type-account-type",
+    "account-hub-card-graph-title",
+    "account-hub-card-graph-description",
+    "account-hub-card-ews-title",
+    "account-hub-card-ews-tag",
+    "account-hub-card-ews-description",
+    "account-hub-card-recommended-description",
+    "account-hub-exchange-type-username",
+    "account-hub-exchange-type-username-hint",
+    "account-hub-exchange-type-authentication",
+    "account-hub-exchange-type-default-oauth",
+    "account-hub-exchange-type-oauth-tenant",
+    "account-hub-exchange-type-oauth-app",
+    "account-hub-exchange-type-advanced-config",
     "account-hub-result-username-label",
     "account-hub-result-username-label.title",
     "account-hub-name-label",
@@ -8058,7 +8075,10 @@
     "account-hub-email-setup-header",
     "account-hub-email-setup-incoming",
     "account-hub-email-setup-outgoing",
+    "account-hub-email-exchange-settings",
     "account-hub-email-connect-settings",
+    "account-hub-email-protocol-select-header",
+    "account-hub-email-protocol-select-notification",
     "account-hub-email-enter-password",
     "account-hub-email-sync-accounts",
     "account-hub-test-configuration",
@@ -8067,8 +8087,8 @@
     "account-hub-result-pop-description",
     "account-hub-result-ews-shortname",
     "account-hub-result-ews-description",
-    "account-hub-result-graph-shortname",
-    "account-hub-result-graph-description",
+    "account-hub-result-graph-api-shortname",
+    "account-hub-result-graph-api-description",
     "account-hub-result-exchange-description",
     "account-hub-result-ews-text",
     "account-hub-result-ews-expanded-text",
@@ -8113,14 +8133,14 @@
     "account-hub-add-address-book",
     "address-book-sync-existing-icon.alt",
     "address-book-sync-existing",
-    "address-book-add-remote-icon.alt",
+    "address-book-add-remote-icon2.alt",
     "address-book-add-remote",
-    "address-book-add-remote-description",
+    "address-book-add-remote-carddav-description",
     "address-book-add-local-icon.alt",
     "address-book-add-local",
     "address-book-add-local-description",
-    "address-book-add-ldap-icon.alt",
-    "address-book-add-ldap",
+    "address-book-add-ldap-icon2.alt",
+    "address-book-add-ldap-button",
     "address-book-add-ldap-description",
     "account-hub-address-book-sync-books-data",
     "address-book-sync-existing-description",
@@ -8163,6 +8183,7 @@
     "address-book-ldap-creation-error",
     "account-hub-email-setup-ews",
     "account-hub-result-exchange-url-label",
+    "account-hub-exchange-service-url-label",
     "account-hub-email-credentials-confirmation",
     "account-hub-result-unknown-hostname",
     "account-hub-result-unknown-cert",
@@ -8215,8 +8236,14 @@
     "account-hub-calendars-button",
     "account-hub-thundermail-button",
     "account-hub-thundermail-divider-text",
+    "account-hub-manual-config-imap-title",
+    "account-hub-manual-config-pop3-title",
     "account-hub-manual-config-incoming-legend",
-    "account-hub-manual-config-outgoing-legend"
+    "account-hub-manual-config-outgoing-legend",
+    "account-hub-same-username-checkbox",
+    "account-hub-protocol-imap",
+    "account-hub-protocol-microsoft",
+    "account-hub-protocol-pop3"
   ],
   "mail/messenger/accountcreation/accountSetup.ftl": [
     "account-setup-tab-title",
@@ -11371,6 +11398,8 @@
     "mail-browse-sound-button.accesskey",
     "enable-gloda-search-label.label",
     "enable-gloda-search-label.accesskey",
+    "gloda-show-results-as-list-label.label",
+    "gloda-show-results-as-list-label.accesskey",
     "datetime-formatting-legend",
     "language-selector-legend",
     "allow-hw-accel.label",

mail/messenger/accountcreation/accountHub.ftl

@@ -49,7 +49,9 @@ account-hub-email-retest-button = Retest
 account-hub-email-finish-button = Finish
 account-hub-email-manually-configure-button = Configure Manually
 account-hub-email-continue-button = Continue
+account-hub-email-set-up-account-button = Set up account
 account-hub-email-confirm-button = Confirm
+account-hub-email-find-settings-button = Find settings
 account-hub-result-incoming-legend = Incoming
 account-hub-result-outgoing-legend = Outgoing
 account-hub-all-servers-legend = All servers
@@ -116,7 +118,7 @@ account-hub-ssl-cleartext-password-option =
 account-hub-ssl-encrypted-password-option =
     .label = Encrypted password
 
-## Incoming/Outgoing connection security options
+## Other Account Hub strings (sadly not sorted into sections)
 
 account-hub-ssl-noencryption-option =
     .label = None
@@ -158,6 +160,7 @@ address-book-ldap-duplicate-error = LDAP directory name already exists. Please i
 address-book-ldap-creation-error = Could not create LDAP Directory.
 account-hub-email-setup-ews = Server Settings
 account-hub-result-exchange-url-label = Exchange endpoint URL
+account-hub-exchange-service-url-label = Enter the service URL
 account-hub-email-credentials-confirmation = Account Configuration
 account-hub-result-unknown-hostname = Unknown Hostname
 account-hub-result-unknown-cert = Unverified Certificate
@@ -235,14 +238,24 @@ account-hub-calendars-button = Calendars
 account-hub-thundermail-button = Sign in with Thundermail
 # Used as part of a divider between sign in button and a sign in form.
 account-hub-thundermail-divider-text = or
+account-hub-manual-config-imap-title = IMAP Settings
+account-hub-manual-config-pop3-title = POP3 Settings
 account-hub-manual-config-incoming-legend = Incoming server
 account-hub-manual-config-outgoing-legend = Outgoing server
+# Label for checkbox that will hide an outgoing username input if it's the same is the incoming
+account-hub-same-username-checkbox = Same username as incoming server
+account-hub-protocol-imap = Sync across devices
+account-hub-protocol-microsoft = Exchange or Microsoft 365
+account-hub-protocol-pop3 = Download to device
 account-hub-notification-show-more = Show more
 account-hub-notification-show-less = Show less
 account-hub-email-setup-header = Add your email address
 account-hub-email-setup-incoming = Incoming server settings
 account-hub-email-setup-outgoing = Outgoing server settings
+account-hub-email-exchange-settings = Exchange settings
 account-hub-email-connect-settings = Connect your email settings
+account-hub-email-protocol-select-header = Choose an email account type
+account-hub-email-protocol-select-notification = Additional information is required to set up this account
 account-hub-email-config-found = Choose your email account type
 account-hub-email-enter-password = Enter your email account password
 account-hub-email-sync-accounts = Sync your calendars and address books
@@ -252,6 +265,8 @@ account-hub-result-imap-description = Keep your folders and emails synced on you
 account-hub-result-pop-description = Keep your folders and emails on your computer
 account-hub-result-ews-shortname = Exchange
 account-hub-result-ews-description = Use Microsoft Exchange Web Services to sync your folders and emails
+account-hub-result-graph-api-shortname = Microsoft Graph API
+account-hub-result-graph-api-description = Use the Microsoft Graph API to sync your folders and emails with Microsoft 365
 account-hub-result-graph-shortname = Exchange (Graph)
 account-hub-result-graph-description = Use Microsoft Graph API to sync your folders and emails
 account-hub-result-exchange-description = Sync folders & emails with Exchange or Office 365
@@ -312,14 +327,20 @@ account-hub-add-address-book = Add an address book
 address-book-sync-existing-icon =
     .alt = Sync an address book from an existing account
 address-book-sync-existing = Sync from an existing account
+address-book-add-remote-icon2 =
+    .alt = Add a remote address book
 address-book-add-remote-icon =
     .alt = Add a new remote address book
 address-book-add-remote = Add remote Address Book
+address-book-add-remote-carddav-description = Connect to a CardDAV address book
 address-book-add-remote-description = Connect to a remote CardDav Address Book
 address-book-add-local-icon =
     .alt = Create a new local address book
 address-book-add-local = New local Address Book
 address-book-add-local-description = Create a new local address book on your device
+address-book-add-ldap-icon2 =
+    .alt = Add an LDAP address book
+address-book-add-ldap-button = Add LDAP Address Book
 address-book-add-ldap-icon =
     .alt = Connect to a remote LDAP address book
 address-book-add-ldap = New LDAP Address Book
@@ -343,3 +364,23 @@ account-hub-local-address-book-label = Address Book Name
 account-hub-local-error-text = Please enter an address book name
 account-hub-sync-address-books = Sync existing address books
 account-hub-new-remote-address-book = New remote Address Book
+
+## Exchange Type Manual Config Step
+
+account-hub-exchange-type-account-type = Account type
+account-hub-card-graph-title = Microsoft Graph
+account-hub-card-graph-description = Microsoft Graph is a modern connection method for Microsoft 365.
+account-hub-card-ews-title = Exchange Web Services
+account-hub-card-ews-tag = Legacy
+account-hub-card-ews-description = Exchange Web Services (EWS) connects to Microsoft Exchange to sync your mail.
+# This is shown after the type description, so "it" is referring to the type (either Microsoft Graph or Exchange Web Services).
+account-hub-card-recommended-description = It’s recommended because it matches your Service URL.
+account-hub-exchange-type-username = Username
+account-hub-exchange-type-username-hint = Typically your email address or Active Directory UPN.
+account-hub-exchange-type-authentication = Authentication Method
+# Checkbox that can be unchecked to use a custom OAuth config.
+account-hub-exchange-type-default-oauth = Use default Microsoft 365 Copilot authentication settings
+account-hub-exchange-type-oauth-tenant = Tenant ID
+account-hub-exchange-type-oauth-app = App ID
+account-hub-exchange-type-advanced-config = Advanced Configuration
+account-hub-exchange-type-title = Choose an account type

mail/messenger/preferences/preferences.ftl

@@ -187,6 +187,9 @@ mail-browse-sound-button =
 enable-gloda-search-label =
     .label = Enable Global Search and Indexer
     .accesskey = G
+gloda-show-results-as-list-label =
+    .label = Show global search results as a list by default
+    .accesskey = L
 datetime-formatting-legend = Date and Time Formatting
 language-selector-legend = Language
 allow-hw-accel =