Bug 1551133 - Implement new UI for account creation dialog. r=mkmelin
authorAlessandro Castellani <alessandro@thunderbird.net>
Mon, 13 May 2019 18:12:43 -0700
changeset 11748 c2d4e685dada59fd75e8c29791f8285c4052e633
parent 11747 cc1a103e807dcc75a3d3b64567d456a84fa70ab2
child 11749 9016c5cdf9dbc91db2205b4b7101006303d5f63a
push id156
push userflodolo@mozilla.com
push dateMon, 29 Jul 2019 09:39:25 +0000
reviewersmkmelin
bugs1551133
Bug 1551133 - Implement new UI for account creation dialog. r=mkmelin X-Channel-Repo: comm-central X-Channel-Converted-Revision: 047998237781d0e3c85c90e798bdba36e8bd7d92 X-Channel-Repo: releases/comm-beta X-Channel-Revision: 741524ea4c59cf9445e2a24115792606113026bd X-Channel-Repo: releases/comm-release X-Channel-Revision: 5e26ffc6e8879bda1b683b28f34fd089fa4d01f5 X-Channel-Repo: releases/comm-esr68 X-Channel-Revision: 5e26ffc6e8879bda1b683b28f34fd089fa4d01f5
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -1,44 +1,58 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY autoconfigWizard2.title         "Set Up an Existing Email Account">
+
+<!ENTITY emailWizard.title               "Set Up Your Existing Email Address">
+<!ENTITY emailWizard.caption             "Use your current email address">
 <!ENTITY name.label                      "Your name:">
 <!ENTITY name.accesskey                  "n">
 <!ENTITY name.placeholder                "First Last">
+<!ENTITY fullname.placeholder            "Your full name">
 <!ENTITY name.text                       "Your name, as shown to others">
+<!ENTITY name.error                      "Please enter your name">
 <!ENTITY email.label                     "Email address:">
 <!ENTITY email.accesskey                 "E">
 <!-- LOCALIZATION NOTE(email.placeholder): Domain @example.com must stay in English -->
 <!ENTITY email2.placeholder              "you@example.com">
+<!ENTITY email3.placeholder              "Your email address">
 <!ENTITY email.text                      "Your existing email address">
+<!ENTITY email.error                     "Invalid email address">
 <!ENTITY password.label                  "Password:">
 <!ENTITY password.accesskey              "P">
 <!ENTITY password.placeholder            "Password">
 <!ENTITY password.text                   "Optional, will only be used to validate the username">
+<!ENTITY password.toggle                 "Show/Hide password">
 <!ENTITY rememberPassword.label          "Remember password">
 <!ENTITY rememberPassword.accesskey      "m">
 <!ENTITY usernameEx.label                "Your login:">
 <!ENTITY usernameEx.accesskey            "l">
 <!-- LOCALIZATION NOTE(usernameEx.placeholder): YOURDOMAIN refers to the Windows domain in ActiveDirectory. yourusername refers to the user's account name in Windows. -->
 <!ENTITY usernameEx.placeholder          "YOURDOMAIN\yourusername">
 <!-- LOCALIZATION NOTE(usernameEx.text): Domain refers to the Windows domain in ActiveDirectory. We mean the user's login in Windows at the local corporate network. -->
 <!ENTITY usernameEx.text                 "Domain login">
 
+<!ENTITY protocol.label                  "Protocol:">
 <!ENTITY imapLong.label                  "IMAP (remote folders)">
 <!ENTITY pop3Long.label                  "POP3 (keep mail on your computer)">
 
 <!ENTITY incoming.label                  "Incoming:">
+<!ENTITY incomingColumn.label            "Incoming">
 <!ENTITY outgoing.label                  "Outgoing:">
+<!ENTITY outgoingColumn.label            "Outgoing">
 <!ENTITY username.label                  "Username:">
 <!ENTITY hostname.label                  "Server hostname">
 <!ENTITY port.label                      "Port">
 <!ENTITY ssl.label                       "SSL">
+<!ENTITY serverRow.label                 "Server:">
+<!ENTITY portRow.label                   "Port:">
+<!ENTITY sslRow.label                    "SSL:">
 <!ENTITY auth.label                      "Authentication">
 <!ENTITY imap.label                      "IMAP">
 <!ENTITY pop3.label                      "POP3">
 <!-- LOCALIZATION NOTE(exchange.label): Do not translate Exchange, it is a product name. -->
 <!ENTITY exchange.label                  "Exchange">
 <!ENTITY smtp.label                      "SMTP">
 <!ENTITY autodetect.label                "Autodetect">
 <!-- LOCALIZATION NOTE(noEncryption.label): Neither SSL/TLS nor STARTTLS.
@@ -54,27 +68,33 @@
 <!ENTITY advancedSetup.accesskey         "A">
 <!ENTITY cancel.label                    "Cancel">
 <!ENTITY cancel.accesskey                "a">
 <!ENTITY continue.label                  "Continue">
 <!ENTITY continue.accesskey              "C">
 <!ENTITY stop.label                      "Stop">
 <!ENTITY stop.accesskey                  "S">
 <!-- LOCALIZATION NOTE (half-manual-test.label): This is the text that is
-     displayed on the button in manual edit mode which will re-guess
+     displayed on the button in manual config mode which will re-guess
      the account configuration, taking into account the settings that
      the user has manually changed. -->
 <!ENTITY half-manual-test.label          "Re-test">
 <!ENTITY half-manual-test.accesskey      "t">
 <!ENTITY manual-edit.label               "Manual config">
 <!ENTITY manual-edit.accesskey           "M">
+<!ENTITY manual-config.label             "Configure manually…">
+<!ENTITY manual-config.accesskey         "M">
 <!ENTITY open-provisioner.label          "Get a new email address…">
 <!ENTITY open-provisioner.accesskey      "g">
 
 
+<!ENTITY get-help.label                  "Get Help">
+<!ENTITY get-help.accesskey              "H">
+
+
 <!ENTITY warning.label                   "Warning!">
 <!ENTITY incomingSettings.label          "Incoming settings:">
 <!ENTITY outgoingSettings.label          "Outgoing settings:">
 <!ENTITY technicaldetails.label          "Technical Details">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
 <!ENTITY confirmWarning.label            "I understand the risks.">
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -91,13 +91,15 @@ resultOutgoingExisting=Use existing outg
 resultIMAP=IMAP
 resultPOP3=POP3
 resultSMTP=SMTP
 resultExchange=Exchange
 # LOCALIZATION NOTE(resultNoEncryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
 resultNoEncryption=No Encryption
 resultSSL=SSL
 resultSTARTTLS=STARTTLS
-# LOCALIZATION NOTE(resultSSLCertWeak): \u0020 is just a space
-resultSSLCertWeak=\u0020(Warning: Could not verify server)
+resultSSLCertWeak=Warning! Could not verify server
 resultSSLCertOK=
 resultUsernameBoth=%1$S
 resultUsernameDifferent=Incoming: %1$S, Outgoing: %2$S
+
+confirmAdvancedConfigTitle=Confirm Advanced Configuration
+confirmAdvancedConfigText=This dialog will be closed and an account with the current settings will be created, even if the configuration is incorrect. Do you want to proceeed?