diff --git a/lib/autodetect-imap-settings.js b/lib/autodetect-imap-settings.js
index 7fdb1814c..e352b6c84 100644
--- a/lib/autodetect-imap-settings.js
+++ b/lib/autodetect-imap-settings.js
@@ -6,6 +6,7 @@ const { parseString: parseXmlCb } = require('xml2js');
const util = require('util');
const packageData = require('../package.json');
const parseXml = util.promisify(parseXmlCb);
+const { gt } = require('./translations');
const { FETCH_TIMEOUT } = require('./consts');
const { fetch: fetchCmd, Agent } = require('undici');
@@ -13,7 +14,8 @@ const fetchAgent = new Agent({ connect: { timeout: FETCH_TIMEOUT } });
const RESOLV_TIMEOUT = 5 * 1000;
-const APP_PASSWORDS = [
+// use a function instead of const to prevent translations before locale is set
+const getAppPasswords = () => [
{
trigger: {
exchange: /\bl\.google\.com$/i
@@ -65,6 +67,9 @@ const APP_PASSWORDS = [
},
value: {
required: true,
+ warning: gt.gettext(
+ 'Microsoft has disabled password-based sign-ins (including app passwords) for Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, please use the "Sign in with Microsoft" button to securely connect your account.'
+ ),
provider: 'Microsoft',
instructions: 'https://support.microsoft.com/en-us/account-billing/how-to-get-and-use-app-passwords-5896ed9b-4263-e681-128a-a6f2979a7944'
}
@@ -85,7 +90,7 @@ const APP_PASSWORDS = [
function getAppPassword(email, exchange) {
let domain = email.split('@').pop().trim().toLowerCase();
- for (let appPassword of APP_PASSWORDS) {
+ for (let appPassword of getAppPasswords()) {
if (appPassword.trigger.domains && appPassword.trigger.domains.includes(domain)) {
return appPassword.value;
}
diff --git a/package.json b/package.json
index f1ea9bf5d..7f23b59bb 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"build-dist": "pkg --compress Brotli package.json && npm install && node winconf.js",
"build-dist-fast": "pkg --debug package.json && npm install && node winconf.js",
"licenses": "license-checker --excludePackages 'emailengine-app' --json | node list-generate.js > static/licenses.html",
- "gettext": "find ./views -name \"*.hbs\" -print0 | xargs -0 xgettext-template -L Handlebars -o translations/messages.pot --force-po && jsxgettext lib/routes-ui.js workers/api.js lib/tools.js -j -o translations/messages.pot",
+ "gettext": "find ./views -name \"*.hbs\" -print0 | xargs -0 xgettext-template -L Handlebars -o translations/messages.pot --force-po && jsxgettext lib/routes-ui.js workers/api.js lib/tools.js lib/autodetect-imap-settings.js -j -o translations/messages.pot",
"prepare-docker": "echo \"EE_DOCKER_LEGACY=$EE_DOCKER_LEGACY\" >> system.env && cat system.env",
"update": "rm -rf node_modules package-lock.json && ncu -u && npm install && ./copy-static-files.sh && npm run licenses && npm run gettext",
"test-gmail-api": "node lib/email-client/gmail-client.js --dbs.redis=redis://127.0.0.1/11"
diff --git a/translations/de.mo b/translations/de.mo
index 2ddf19490..f9ffab07c 100644
Binary files a/translations/de.mo and b/translations/de.mo differ
diff --git a/translations/de.po b/translations/de.po
index f9a2e859e..cbb7b9f81 100644
--- a/translations/de.po
+++ b/translations/de.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-09-04 05:45+0000\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -12,6 +12,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.2\n"
+#: views/config/license.hbs:49
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
+
#: views/redirect.hbs:1
msgid "Click here to continue…"
msgstr "Klicken Sie hier, um fortzufahren…"
@@ -39,7 +45,7 @@ msgstr ""
"Sind Sie sicher, dass Sie Ihre E-Mail-Adresse %s erneut anmelden "
"möchten?"
-#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:226
+#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr "Schließen"
@@ -59,84 +65,60 @@ msgstr "E-Mail-Adresse"
msgid "Enter your email address"
msgstr "Geben Sie Ihre E-Mail-Adresse ein"
-#: views/config/license.hbs:49
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr "Ihr Name"
-
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr "Gib deinen vollen Namen ein"
-
-#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
-msgid "Password"
-msgstr "Passwort *"
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr "Passwort für Ihr Konto eingeben"
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr "Weiter"
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr "Wählen Sie Ihren E-Mail-Kontoanbieter"
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr "Standard IMAP"
-
-#: views/accounts/register/imap-server.hbs:18
+#: views/accounts/register/imap-server.hbs:19
msgid "IMAP"
msgstr "IMAP"
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
msgid "Username"
msgstr "Benutzername"
-#: views/accounts/register/imap-server.hbs:42
-#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
+#: views/accounts/register/imap.hbs:31
+msgid "Password"
+msgstr "Passwort *"
+
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
msgid "Application Password"
msgstr "Anwendungspasswort"
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:47
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
+msgstr "Wichtig!"
+
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr "Für %s-Konten muss ein Anwendungskennwort für %s verwendet werden."
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr "Anweisungen"
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr "Hostname"
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr "Port"
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr "TLS für IMAP"
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -145,20 +127,20 @@ msgstr ""
"Port 993 benötigt. Bei anderen Ports greift EmailEngine auf die STARTTLS-"
"basierte Verschlüsselung zurück."
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr "TLS verwenden"
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr "SMTP"
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr "TLS für SMTP"
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -167,90 +149,115 @@ msgstr ""
"Port 465 benötigt. Bei anderen Ports greift EmailEngine auf die STARTTLS-"
"basierte Verschlüsselung zurück."
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr "Test-Einstellungen"
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr "Weiter"
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr "Ohne Prüfung fortfahren"
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr "Test fehlgeschlagen"
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr ""
"Die angegebenen E-Mail-Server-Einstellungen konnten nicht validiert werden."
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr "Allgemeiner Fehler"
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr "Validierungsfehler"
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr "Validierung der IMAP-Servereinstellungen fehlgeschlagen"
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr "Der IMAP-Server antwortete mit der folgenden Meldung:"
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr "SMTP-Servereinstellungen konnten nicht validiert werden"
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr "Der SMTP-Server antwortete mit der folgenden Meldung:"
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr "HTTP-Fehler!"
-#: lib/routes-ui.js:653
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr "Ihr Name"
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr "Gib deinen vollen Namen ein"
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr "Passwort für Ihr Konto eingeben"
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr "Wählen Sie Ihren E-Mail-Kontoanbieter"
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr "Standard IMAP"
+
+#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr "Ungültiger API-Schlüssel für OpenAI"
-#: lib/routes-ui.js:4918 lib/routes-ui.js:6867 lib/routes-ui.js:6878
+#: lib/routes-ui.js:4940 lib/routes-ui.js:6889 lib/routes-ui.js:6900
msgid "Server hostname was not found"
msgstr "Server-Hostname wurde nicht gefunden"
-#: lib/routes-ui.js:4921 lib/routes-ui.js:6870 lib/routes-ui.js:6881
+#: lib/routes-ui.js:4943 lib/routes-ui.js:6892 lib/routes-ui.js:6903
msgid "Invalid username or password"
msgstr "Ungültiger Benutzername oder Passwort"
-#: lib/routes-ui.js:4925 lib/routes-ui.js:6885
+#: lib/routes-ui.js:4947 lib/routes-ui.js:6907
msgid "TLS protocol error"
msgstr "TLS-Protokollfehler"
-#: lib/routes-ui.js:6614 lib/routes-ui.js:6649 lib/routes-ui.js:6764
-#: lib/routes-ui.js:6811 lib/routes-ui.js:7039 lib/routes-ui.js:7075
+#: lib/routes-ui.js:6636 lib/routes-ui.js:6671 lib/routes-ui.js:6786
+#: lib/routes-ui.js:6833 lib/routes-ui.js:7061 lib/routes-ui.js:7097
msgid "Email Account Setup"
msgstr "E-Mail-Konto einrichten"
-#: lib/routes-ui.js:6674 lib/routes-ui.js:6707 lib/routes-ui.js:9500
+#: lib/routes-ui.js:6696 lib/routes-ui.js:6729 lib/routes-ui.js:9528
msgid "Failed to validate request arguments"
msgstr "Validierung der Anforderungsargumente fehlgeschlagen"
-#: lib/routes-ui.js:6804 lib/routes-ui.js:7068
+#: lib/routes-ui.js:6826 lib/routes-ui.js:7090
msgid "Failed to process account"
msgstr "Konto konnte nicht bearbeitet werden"
-#: lib/routes-ui.js:9463 lib/tools.js:731
+#: lib/routes-ui.js:9491 lib/tools.js:731
msgid "Invalid input"
msgstr "Ungültige Eingabe"
-#: lib/routes-ui.js:9473 lib/routes-ui.js:9591 lib/routes-ui.js:9608
-#: lib/routes-ui.js:9643
+#: lib/routes-ui.js:9501 lib/routes-ui.js:9619 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9671
msgid "Subscription Management"
msgstr "Mitgliederverwaltung"
-#: lib/routes-ui.js:9602 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9630 lib/routes-ui.js:9664
msgid "Failed to process request"
msgstr "Anfrage konnte nicht bearbeitet werden"
@@ -262,5 +269,17 @@ msgstr "Signaturüberprüfung fehlgeschlagen"
msgid "Invalid or expired account setup URL"
msgstr "Ungültige oder abgelaufene URL für die Kontoeinrichtung"
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) for "
+"Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, "
+"please use the \"Sign in with Microsoft\" button to securely connect your "
+"account."
+msgstr ""
+"Microsoft hat die kennwortbasierte Anmeldung (einschließlich Kennwörter für "
+"Anwendungen) für Outlook.com-, Hotmail.com- und Microsoft 365-E-Mail-Konten "
+"deaktiviert. Um fortzufahren, verwenden Sie bitte die Schaltfläche \"Sign in "
+"with Microsoft\", um Ihr Konto sicher zu verbinden."
+
#~ msgid "Unknown OAuth provider"
#~ msgstr "Unbekannter OAuth-Anbieter"
diff --git a/translations/en.mo b/translations/en.mo
index 1395465fe..1a0601d55 100644
Binary files a/translations/en.mo and b/translations/en.mo differ
diff --git a/translations/en.po b/translations/en.po
index 7992e012f..db3d8ff9e 100644
--- a/translations/en.po
+++ b/translations/en.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-09-04 05:45+0000\n"
-"PO-Revision-Date: 2024-09-04 08:45+0300\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
+"PO-Revision-Date: 2024-10-31 09:52+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en\n"
@@ -13,6 +13,12 @@ msgstr ""
"X-Generator: Poedit 3.2\n"
"X-Poedit-Basepath: .\n"
+#: views/config/license.hbs:49
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
#: views/redirect.hbs:1
msgid "Click here to continue…"
msgstr ""
@@ -37,7 +43,7 @@ msgstr ""
msgid "Are you sure you want to re-subscribe your email address %s?"
msgstr ""
-#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:226
+#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr ""
@@ -57,191 +63,192 @@ msgstr ""
msgid "Enter your email address"
msgstr ""
-#: views/config/license.hbs:49
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
+#: views/accounts/register/imap-server.hbs:19
+msgid "IMAP"
msgstr ""
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
+msgid "Username"
msgstr ""
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
msgid "Password"
msgstr ""
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr ""
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr ""
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr ""
-
-#: views/accounts/register/imap-server.hbs:18
-msgid "IMAP"
-msgstr ""
-
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
-msgid "Username"
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
+msgid "Application Password"
msgstr ""
-#: views/accounts/register/imap-server.hbs:42
#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
-msgid "Application Password"
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
msgstr ""
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr ""
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr ""
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr ""
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr ""
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr ""
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr ""
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr ""
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr ""
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr ""
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr ""
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr ""
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr ""
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr ""
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr ""
-#: lib/routes-ui.js:653
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr ""
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr ""
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr ""
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr ""
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr ""
+
+#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr ""
-#: lib/routes-ui.js:4918 lib/routes-ui.js:6867 lib/routes-ui.js:6878
+#: lib/routes-ui.js:4940 lib/routes-ui.js:6889 lib/routes-ui.js:6900
msgid "Server hostname was not found"
msgstr ""
-#: lib/routes-ui.js:4921 lib/routes-ui.js:6870 lib/routes-ui.js:6881
+#: lib/routes-ui.js:4943 lib/routes-ui.js:6892 lib/routes-ui.js:6903
msgid "Invalid username or password"
msgstr ""
-#: lib/routes-ui.js:4925 lib/routes-ui.js:6885
+#: lib/routes-ui.js:4947 lib/routes-ui.js:6907
msgid "TLS protocol error"
msgstr ""
-#: lib/routes-ui.js:6614 lib/routes-ui.js:6649 lib/routes-ui.js:6764
-#: lib/routes-ui.js:6811 lib/routes-ui.js:7039 lib/routes-ui.js:7075
+#: lib/routes-ui.js:6636 lib/routes-ui.js:6671 lib/routes-ui.js:6786
+#: lib/routes-ui.js:6833 lib/routes-ui.js:7061 lib/routes-ui.js:7097
msgid "Email Account Setup"
msgstr ""
-#: lib/routes-ui.js:6674 lib/routes-ui.js:6707 lib/routes-ui.js:9500
+#: lib/routes-ui.js:6696 lib/routes-ui.js:6729 lib/routes-ui.js:9528
msgid "Failed to validate request arguments"
msgstr ""
-#: lib/routes-ui.js:6804 lib/routes-ui.js:7068
+#: lib/routes-ui.js:6826 lib/routes-ui.js:7090
msgid "Failed to process account"
msgstr ""
-#: lib/routes-ui.js:9463 lib/tools.js:731
+#: lib/routes-ui.js:9491 lib/tools.js:731
msgid "Invalid input"
msgstr ""
-#: lib/routes-ui.js:9473 lib/routes-ui.js:9591 lib/routes-ui.js:9608
-#: lib/routes-ui.js:9643
+#: lib/routes-ui.js:9501 lib/routes-ui.js:9619 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9671
msgid "Subscription Management"
msgstr ""
-#: lib/routes-ui.js:9602 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9630 lib/routes-ui.js:9664
msgid "Failed to process request"
msgstr ""
@@ -252,3 +259,11 @@ msgstr ""
#: lib/tools.js:1418 lib/tools.js:1423
msgid "Invalid or expired account setup URL"
msgstr ""
+
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) for "
+"Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, "
+"please use the \"Sign in with Microsoft\" button to securely connect your "
+"account."
+msgstr ""
diff --git a/translations/et.mo b/translations/et.mo
index 980910cb1..c6882ea47 100644
Binary files a/translations/et.mo and b/translations/et.mo differ
diff --git a/translations/et.po b/translations/et.po
index 579b0d2ed..0509aa3ff 100644
--- a/translations/et.po
+++ b/translations/et.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-09-04 05:45+0000\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -12,6 +12,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.2\n"
+#: views/config/license.hbs:49
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d päev"
+msgstr[1] "%d päeva"
+
#: views/redirect.hbs:1
msgid "Click here to continue…"
msgstr "Kliki siin, et jätkata…"
@@ -39,7 +45,7 @@ msgstr ""
"Kas olete kindel, et soovite oma e-posti aadressi %s uuesti "
"tellijaks märkida?"
-#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:226
+#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr "Sulge"
@@ -59,84 +65,60 @@ msgstr "E-posti aadress"
msgid "Enter your email address"
msgstr "Sisestage oma e-posti aadress"
-#: views/config/license.hbs:49
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d päev"
-msgstr[1] "%d päeva"
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr "Sinu nimi"
-
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr "Sisestage oma täisnimi"
-
-#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
-msgid "Password"
-msgstr "Parool"
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr "Sisestage oma konto parool"
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr "Jätka"
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr "Valige oma e-posti konto pakkuja"
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr "Standardne IMAP"
-
-#: views/accounts/register/imap-server.hbs:18
+#: views/accounts/register/imap-server.hbs:19
msgid "IMAP"
msgstr "IMAP"
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
msgid "Username"
msgstr "Kasutajanimi"
-#: views/accounts/register/imap-server.hbs:42
-#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
+#: views/accounts/register/imap.hbs:31
+msgid "Password"
+msgstr "Parool"
+
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
msgid "Application Password"
msgstr "Rakenduse parool"
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:47
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
+msgstr "Tähelepanu!"
+
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr "%s kontod peavad kasutama %s jaoks rakenduse parooli."
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr "Juhend"
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr "Serveri nimi"
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr "Port"
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr "TLS IMAP serveris"
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -145,20 +127,20 @@ msgstr ""
"porti 993. Teiste portide puhul kasutab EmailEngine STARTTLS-põhist "
"krüpteerimist."
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr "Kasuta TLS krüpteerimist"
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr "SMTP"
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr "TLS SMTP serveris"
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -167,89 +149,114 @@ msgstr ""
"porti 465. Teiste portide puhul kasutab EmailEngine STARTTLS-põhist "
"krüpteerimist."
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr "Kontrolli seadeid"
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr "Jätka"
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr "Jätka ilma seadistusi kontrollimata"
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr "Test ebaõnnestus"
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr "Esitatud e-posti serveri seadete valideerimine ebaõnnestus."
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr "Üldine viga"
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr "Valideerimisviga"
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr "IMAP serveri seadete valideerimine ebaõnnestus"
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr "IMAP server vastas järgmise teatega:"
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr "SMTP serveri seadete valideerimine ebaõnnestus"
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr "SMTP server vastas järgmise teatega:"
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr "HTTP viga!"
-#: lib/routes-ui.js:653
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr "Sinu nimi"
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr "Sisestage oma täisnimi"
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr "Sisestage oma konto parool"
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr "Valige oma e-posti konto pakkuja"
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr "Standardne IMAP"
+
+#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr "OpenAI jaoks vale API võti"
-#: lib/routes-ui.js:4918 lib/routes-ui.js:6867 lib/routes-ui.js:6878
+#: lib/routes-ui.js:4940 lib/routes-ui.js:6889 lib/routes-ui.js:6900
msgid "Server hostname was not found"
msgstr "Serverit ei leitud"
-#: lib/routes-ui.js:4921 lib/routes-ui.js:6870 lib/routes-ui.js:6881
+#: lib/routes-ui.js:4943 lib/routes-ui.js:6892 lib/routes-ui.js:6903
msgid "Invalid username or password"
msgstr "Vigane kasutajanimi või parool"
-#: lib/routes-ui.js:4925 lib/routes-ui.js:6885
+#: lib/routes-ui.js:4947 lib/routes-ui.js:6907
msgid "TLS protocol error"
msgstr "TLS protokolli viga"
-#: lib/routes-ui.js:6614 lib/routes-ui.js:6649 lib/routes-ui.js:6764
-#: lib/routes-ui.js:6811 lib/routes-ui.js:7039 lib/routes-ui.js:7075
+#: lib/routes-ui.js:6636 lib/routes-ui.js:6671 lib/routes-ui.js:6786
+#: lib/routes-ui.js:6833 lib/routes-ui.js:7061 lib/routes-ui.js:7097
msgid "Email Account Setup"
msgstr "E-posti konto seadistamine"
-#: lib/routes-ui.js:6674 lib/routes-ui.js:6707 lib/routes-ui.js:9500
+#: lib/routes-ui.js:6696 lib/routes-ui.js:6729 lib/routes-ui.js:9528
msgid "Failed to validate request arguments"
msgstr "Päringu argumentide kontroll ebaõnnestus"
-#: lib/routes-ui.js:6804 lib/routes-ui.js:7068
+#: lib/routes-ui.js:6826 lib/routes-ui.js:7090
msgid "Failed to process account"
msgstr "Konto töötlemine ebaõnnestus"
-#: lib/routes-ui.js:9463 lib/tools.js:731
+#: lib/routes-ui.js:9491 lib/tools.js:731
msgid "Invalid input"
msgstr "Vale sisestus"
-#: lib/routes-ui.js:9473 lib/routes-ui.js:9591 lib/routes-ui.js:9608
-#: lib/routes-ui.js:9643
+#: lib/routes-ui.js:9501 lib/routes-ui.js:9619 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9671
msgid "Subscription Management"
msgstr "Tellimuse haldamine"
-#: lib/routes-ui.js:9602 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9630 lib/routes-ui.js:9664
msgid "Failed to process request"
msgstr "Päringu töötlemine ebaõnnestus"
@@ -261,5 +268,17 @@ msgstr "Päringu allkirja kontroll ebaõnnestus"
msgid "Invalid or expired account setup URL"
msgstr "Kehtetu või aegunud konto seadistamise URL"
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) for "
+"Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, "
+"please use the \"Sign in with Microsoft\" button to securely connect your "
+"account."
+msgstr ""
+"Microsoft on keelanud paroolil põhineva sisselogimise (sealhulgas rakenduste "
+"paroolid) Outlook.com, Hotmail.com ja Microsoft 365 e-posti kontodele. "
+"Jätkamiseks kasutage oma konto turvaliseks ühendamiseks nuppu \"Sign in with "
+"Microsoft\"."
+
#~ msgid "Unknown OAuth provider"
#~ msgstr "Tundmatu OAuth teenus"
diff --git a/translations/fr.mo b/translations/fr.mo
index 4d88a0d1b..961f32b8e 100644
Binary files a/translations/fr.mo and b/translations/fr.mo differ
diff --git a/translations/fr.po b/translations/fr.po
index 7822ba82b..e37f20e4f 100644
--- a/translations/fr.po
+++ b/translations/fr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-09-04 05:45+0000\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -12,6 +12,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 3.2\n"
+#: views/config/license.hbs:49
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d jour"
+msgstr[1] "%d jours"
+
#: views/redirect.hbs:1
msgid "Click here to continue…"
msgstr "Cliquez sur ici pour continuer…"
@@ -36,7 +42,7 @@ msgstr "Se réabonner"
msgid "Are you sure you want to re-subscribe your email address %s?"
msgstr "Êtes-vous sûr de vouloir réabonner votre adresse e-mail %s ?"
-#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:226
+#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr "Fermer"
@@ -56,84 +62,60 @@ msgstr "Adresse e-mail"
msgid "Enter your email address"
msgstr "Entrez votre adresse email"
-#: views/config/license.hbs:49
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d jour"
-msgstr[1] "%d jours"
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr "Votre nom"
-
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr "Entrer votre nom et prénom"
-
-#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
-msgid "Password"
-msgstr "Mot de passe"
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr "Saisissez le mot de passe de votre compte"
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr "Continuer"
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr "Choisissez votre fournisseur de compte de messagerie"
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr "IMAP Standard"
-
-#: views/accounts/register/imap-server.hbs:18
+#: views/accounts/register/imap-server.hbs:19
msgid "IMAP"
msgstr "IMAP"
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
msgid "Username"
msgstr "Nom d'utilisateur"
-#: views/accounts/register/imap-server.hbs:42
-#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
+#: views/accounts/register/imap.hbs:31
+msgid "Password"
+msgstr "Mot de passe"
+
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
msgid "Application Password"
msgstr "Mot de passe de l'application"
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:47
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
+msgstr "Important"
+
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr "Les comptes %s doivent utiliser un mot de passe d'application pour %s."
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr "Instructions"
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr "Nom d'hôte"
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr "Port"
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr "TLS pour IMAP"
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -142,20 +124,20 @@ msgstr ""
"lors de l'utilisation du port 993. Pour les autres ports, EmailEngine "
"revient à l'utilisation du cryptage basé sur STARTTLS."
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr "SMTP"
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr "TLS pour SMTP"
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
@@ -164,90 +146,115 @@ msgstr ""
"lors de l'utilisation du port 465. Pour les autres ports, EmailEngine "
"revient à l'utilisation du cryptage basé sur STARTTLS."
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr "Tester"
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr "Continuer"
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr "Continuer sans tester"
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr "Test échoué"
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr ""
"Échec de la validation des paramètres de serveur de messagerie fournis."
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr "Erreur générale"
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr "Erreur de validation"
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr "Impossible de valider les paramètres du serveur IMAP"
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr "Le serveur IMAP a répondu avec le message suivant :"
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr "Impossible de valider les paramètres du serveur SMTP"
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr "Le serveur SMTP a répondu avec le message suivant :"
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr "Erreur HTTP!"
-#: lib/routes-ui.js:653
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr "Votre nom"
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr "Entrer votre nom et prénom"
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr "Saisissez le mot de passe de votre compte"
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr "Choisissez votre fournisseur de compte de messagerie"
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr "IMAP Standard"
+
+#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr "Clé API invalide pour OpenAI"
-#: lib/routes-ui.js:4918 lib/routes-ui.js:6867 lib/routes-ui.js:6878
+#: lib/routes-ui.js:4940 lib/routes-ui.js:6889 lib/routes-ui.js:6900
msgid "Server hostname was not found"
msgstr "Le nom d'hôte du serveur est introuvable"
-#: lib/routes-ui.js:4921 lib/routes-ui.js:6870 lib/routes-ui.js:6881
+#: lib/routes-ui.js:4943 lib/routes-ui.js:6892 lib/routes-ui.js:6903
msgid "Invalid username or password"
msgstr "Nom d'utilisateur ou mot de passe invalide"
-#: lib/routes-ui.js:4925 lib/routes-ui.js:6885
+#: lib/routes-ui.js:4947 lib/routes-ui.js:6907
msgid "TLS protocol error"
msgstr "Erreur de protocole TLS"
-#: lib/routes-ui.js:6614 lib/routes-ui.js:6649 lib/routes-ui.js:6764
-#: lib/routes-ui.js:6811 lib/routes-ui.js:7039 lib/routes-ui.js:7075
+#: lib/routes-ui.js:6636 lib/routes-ui.js:6671 lib/routes-ui.js:6786
+#: lib/routes-ui.js:6833 lib/routes-ui.js:7061 lib/routes-ui.js:7097
msgid "Email Account Setup"
msgstr "Configuration du compte de messagerie"
-#: lib/routes-ui.js:6674 lib/routes-ui.js:6707 lib/routes-ui.js:9500
+#: lib/routes-ui.js:6696 lib/routes-ui.js:6729 lib/routes-ui.js:9528
msgid "Failed to validate request arguments"
msgstr "Impossible de valider les arguments de la demande"
-#: lib/routes-ui.js:6804 lib/routes-ui.js:7068
+#: lib/routes-ui.js:6826 lib/routes-ui.js:7090
msgid "Failed to process account"
msgstr "Échec du traitement du compte"
-#: lib/routes-ui.js:9463 lib/tools.js:731
+#: lib/routes-ui.js:9491 lib/tools.js:731
msgid "Invalid input"
msgstr "Entrée invalide"
-#: lib/routes-ui.js:9473 lib/routes-ui.js:9591 lib/routes-ui.js:9608
-#: lib/routes-ui.js:9643
+#: lib/routes-ui.js:9501 lib/routes-ui.js:9619 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9671
msgid "Subscription Management"
msgstr "Gestion des abonnements"
-#: lib/routes-ui.js:9602 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9630 lib/routes-ui.js:9664
msgid "Failed to process request"
msgstr "Le traitement de la demande a échoué."
@@ -259,5 +266,18 @@ msgstr "La validation de la signature a échoué"
msgid "Invalid or expired account setup URL"
msgstr "URL de configuration du compte invalide ou expirée"
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) for "
+"Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, "
+"please use the \"Sign in with Microsoft\" button to securely connect your "
+"account."
+msgstr ""
+"Microsoft a désactivé les connexions basées sur un mot de passe (y compris "
+"les mots de passe des applications) pour les comptes de messagerie Outlook."
+"com, Hotmail.com et Microsoft 365. Pour continuer, veuillez utiliser le "
+"bouton \"Sign in with Microsoft\" pour connecter votre compte en toute "
+"sécurité."
+
#~ msgid "Unknown OAuth provider"
#~ msgstr "Fournisseur OAuth inconnu"
diff --git a/translations/ja.mo b/translations/ja.mo
index b120de371..21752f6a2 100644
Binary files a/translations/ja.mo and b/translations/ja.mo differ
diff --git a/translations/ja.po b/translations/ja.po
index 2941d0daf..5078b4465 100644
--- a/translations/ja.po
+++ b/translations/ja.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-09-04 05:45+0000\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -12,6 +12,11 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.2\n"
+#: views/config/license.hbs:49
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d日"
+
#: views/redirect.hbs:1
msgid "Click here to continue…"
msgstr "続けるにはここをクリックしてください。"
@@ -36,7 +41,7 @@ msgstr "再購読"
msgid "Are you sure you want to re-subscribe your email address %s?"
msgstr "メールアドレス%sを再購読しますか？"
-#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:226
+#: views/unsubscribe.hbs:31 views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr "閉じる"
@@ -56,194 +61,196 @@ msgstr "メールアドレス"
msgid "Enter your email address"
msgstr "メールアドレスを入力してください"
-#: views/config/license.hbs:49
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d日"
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr "名前"
-
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr "フルネームを入力してください"
-
-#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
-msgid "Password"
-msgstr "パスワード"
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr "アカウントのパスワードを入力してください"
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr "続行"
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr "メールアカウントプロバイダーを選択してください"
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr "標準IMAP"
-
-#: views/accounts/register/imap-server.hbs:18
+#: views/accounts/register/imap-server.hbs:19
msgid "IMAP"
msgstr "IMAP"
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
msgid "Username"
msgstr "ユーザー名"
-#: views/accounts/register/imap-server.hbs:42
-#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
+#: views/accounts/register/imap.hbs:31
+msgid "Password"
+msgstr "パスワード"
+
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
msgid "Application Password"
msgstr "アプリケーションパスワード"
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:47
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
+msgstr "重要"
+
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr "%sアカウントでは%s用のアプリケーションパスワードの使用が必要です。"
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr "指示"
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr "ホスト名"
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr "ポート"
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr "IMAPのTLS"
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-"TLS（SSLとも呼ばれます）は、通常ポート993を使用する場合にのみ必要です。その"
-"他のポートではEmailEngineがSTARTTLSベースの暗号化にフォールバックします。"
+"TLS（SSLとも呼ばれます）は、通常ポート993を使用する場合にのみ必要です。その他"
+"のポートではEmailEngineがSTARTTLSベースの暗号化にフォールバックします。"
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr "TLSを使用する"
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr "SMTP"
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr "SMTPのTLS"
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-"TLS（SSLとも呼ばれます）は、通常ポート465を使用する場合にのみ必要です。その"
-"他のポートではEmailEngineがSTARTTLSベースの暗号化にフォールバックします。"
+"TLS（SSLとも呼ばれます）は、通常ポート465を使用する場合にのみ必要です。その他"
+"のポートではEmailEngineがSTARTTLSベースの暗号化にフォールバックします。"
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr "設定のテスト"
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr "続行"
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr "テストせずに続行"
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr "テスト失敗"
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr "提供されたメールサーバーの設定の検証に失敗しました。"
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr "一般的なエラー"
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr "検証のエラー"
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr "IMAPサーバー設定の検証に失敗しました"
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr "IMAPサーバーは以下のメッセージで応答しました："
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr "SMTPサーバー設定の検証に失敗しました"
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr "SMTPサーバーは以下のメッセージで応答しました："
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr "HTTPエラー！"
-#: lib/routes-ui.js:653
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr "名前"
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr "フルネームを入力してください"
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr "アカウントのパスワードを入力してください"
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr "メールアカウントプロバイダーを選択してください"
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr "標準IMAP"
+
+#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr "OpenAIの無効なAPIキー"
-#: lib/routes-ui.js:4918 lib/routes-ui.js:6867 lib/routes-ui.js:6878
+#: lib/routes-ui.js:4940 lib/routes-ui.js:6889 lib/routes-ui.js:6900
msgid "Server hostname was not found"
msgstr "サーバーホスト名が見つかりませんでした"
-#: lib/routes-ui.js:4921 lib/routes-ui.js:6870 lib/routes-ui.js:6881
+#: lib/routes-ui.js:4943 lib/routes-ui.js:6892 lib/routes-ui.js:6903
msgid "Invalid username or password"
msgstr "無効なユーザー名またはパスワード"
-#: lib/routes-ui.js:4925 lib/routes-ui.js:6885
+#: lib/routes-ui.js:4947 lib/routes-ui.js:6907
msgid "TLS protocol error"
msgstr "TLSプロトコルエラー"
-#: lib/routes-ui.js:6614 lib/routes-ui.js:6649 lib/routes-ui.js:6764
-#: lib/routes-ui.js:6811 lib/routes-ui.js:7039 lib/routes-ui.js:7075
+#: lib/routes-ui.js:6636 lib/routes-ui.js:6671 lib/routes-ui.js:6786
+#: lib/routes-ui.js:6833 lib/routes-ui.js:7061 lib/routes-ui.js:7097
msgid "Email Account Setup"
msgstr "メールアカウント設定"
-#: lib/routes-ui.js:6674 lib/routes-ui.js:6707 lib/routes-ui.js:9500
+#: lib/routes-ui.js:6696 lib/routes-ui.js:6729 lib/routes-ui.js:9528
msgid "Failed to validate request arguments"
msgstr "リクエスト引数の検証に失敗しました"
-#: lib/routes-ui.js:6804 lib/routes-ui.js:7068
+#: lib/routes-ui.js:6826 lib/routes-ui.js:7090
msgid "Failed to process account"
msgstr "アカウントの処理に失敗しました"
-#: lib/routes-ui.js:9463 lib/tools.js:731
+#: lib/routes-ui.js:9491 lib/tools.js:731
msgid "Invalid input"
msgstr "無効な入力"
-#: lib/routes-ui.js:9473 lib/routes-ui.js:9591 lib/routes-ui.js:9608
-#: lib/routes-ui.js:9643
+#: lib/routes-ui.js:9501 lib/routes-ui.js:9619 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9671
msgid "Subscription Management"
msgstr "サブスクリプション管理"
-#: lib/routes-ui.js:9602 lib/routes-ui.js:9636
+#: lib/routes-ui.js:9630 lib/routes-ui.js:9664
msgid "Failed to process request"
msgstr "リクエストの処理に失敗しました"
@@ -254,3 +261,15 @@ msgstr "署名の検証に失敗しました"
#: lib/tools.js:1418 lib/tools.js:1423
msgid "Invalid or expired account setup URL"
msgstr "無効または期限切れのアカウント設定URL"
+
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) for "
+"Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To continue, "
+"please use the \"Sign in with Microsoft\" button to securely connect your "
+"account."
+msgstr ""
+"マイクロソフトは、Outlook.com、Hotmail.com、およびMicrosoft 365メールアカウン"
+"トのパスワードベースのサインイン（アプリのパスワードを含む）を無効にしていま"
+"す。続行するには、「Microsoftでサインイン」ボタンを使用してアカウントを安全に"
+"接続してください。"
diff --git a/translations/messages.pot b/translations/messages.pot
index 13cf63671..54d29e574 100644
--- a/translations/messages.pot
+++ b/translations/messages.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=ascii\n"
-"POT-Creation-Date: 2024-10-31 07:14+0000\n"
+"POT-Creation-Date: 2024-10-31 07:51+0000\n"
#: views/config/license.hbs:49
msgid "%d day"
@@ -35,7 +35,7 @@ msgid "Are you sure you want to re-subscribe your email address %s?"
msgstr ""
#: views/unsubscribe.hbs:31
-#: views/accounts/register/imap-server.hbs:226
+#: views/accounts/register/imap-server.hbs:250
msgid "Close"
msgstr ""
@@ -57,146 +57,153 @@ msgstr ""
msgid "Enter your email address"
msgstr ""
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
+#: views/accounts/register/imap-server.hbs:19
+msgid "IMAP"
msgstr ""
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
+msgid "Username"
msgstr ""
+#: views/accounts/register/imap-server.hbs:36
+#: views/accounts/register/imap-server.hbs:128
#: views/accounts/register/imap.hbs:31
-#: views/accounts/register/imap-server.hbs:35
-#: views/accounts/register/imap-server.hbs:115
msgid "Password"
msgstr ""
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:51
-#: views/accounts/register/imap-server.hbs:194
-msgid "Continue"
-msgstr ""
-
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr ""
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr ""
-
-#: views/accounts/register/imap-server.hbs:18
-msgid "IMAP"
-msgstr ""
-
-#: views/accounts/register/imap-server.hbs:21
-#: views/accounts/register/imap-server.hbs:101
-msgid "Username"
+#: views/accounts/register/imap-server.hbs:46
+#: views/accounts/register/imap-server.hbs:53
+#: views/accounts/register/imap-server.hbs:60
+#: views/accounts/register/imap-server.hbs:137
+#: views/accounts/register/imap-server.hbs:144
+#: views/accounts/register/imap-server.hbs:151
+msgid "Application Password"
msgstr ""
-#: views/accounts/register/imap-server.hbs:42
#: views/accounts/register/imap-server.hbs:47
-#: views/accounts/register/imap-server.hbs:122
-#: views/accounts/register/imap-server.hbs:127
-msgid "Application Password"
+#: views/accounts/register/imap-server.hbs:138
+msgid "Important"
msgstr ""
-#: views/accounts/register/imap-server.hbs:43
-#: views/accounts/register/imap-server.hbs:123
+#: views/accounts/register/imap-server.hbs:54
+#: views/accounts/register/imap-server.hbs:145
msgid "%s accounts require to use an application password for %s."
msgstr ""
-#: views/accounts/register/imap-server.hbs:44
-#: views/accounts/register/imap-server.hbs:124
+#: views/accounts/register/imap-server.hbs:55
+#: views/accounts/register/imap-server.hbs:146
msgid "Instructions"
msgstr ""
-#: views/accounts/register/imap-server.hbs:62
-#: views/accounts/register/imap-server.hbs:142
+#: views/accounts/register/imap-server.hbs:75
+#: views/accounts/register/imap-server.hbs:166
msgid "Hostname"
msgstr ""
-#: views/accounts/register/imap-server.hbs:72
-#: views/accounts/register/imap-server.hbs:152
+#: views/accounts/register/imap-server.hbs:85
+#: views/accounts/register/imap-server.hbs:176
msgid "Port"
msgstr ""
-#: views/accounts/register/imap-server.hbs:86
+#: views/accounts/register/imap-server.hbs:99
msgid "TLS for IMAP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:87
+#: views/accounts/register/imap-server.hbs:100
msgid ""
"TLS (also known as SSL) is usually only needed when using port 993. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-#: views/accounts/register/imap-server.hbs:89
-#: views/accounts/register/imap-server.hbs:169
+#: views/accounts/register/imap-server.hbs:102
+#: views/accounts/register/imap-server.hbs:193
msgid "Use TLS"
msgstr ""
-#: views/accounts/register/imap-server.hbs:98
+#: views/accounts/register/imap-server.hbs:111
msgid "SMTP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:166
+#: views/accounts/register/imap-server.hbs:190
msgid "TLS for SMTP"
msgstr ""
-#: views/accounts/register/imap-server.hbs:167
+#: views/accounts/register/imap-server.hbs:191
msgid ""
"TLS (also known as SSL) is usually only needed when using port 465. For "
"other ports EmailEngine falls back to using STARTTLS based encryption."
msgstr ""
-#: views/accounts/register/imap-server.hbs:185
+#: views/accounts/register/imap-server.hbs:209
msgid "Test settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:202
+#: views/accounts/register/imap-server.hbs:218
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr ""
+
+#: views/accounts/register/imap-server.hbs:226
msgid "Continue without testing"
msgstr ""
-#: views/accounts/register/imap-server.hbs:216
+#: views/accounts/register/imap-server.hbs:240
msgid "Test failed"
msgstr ""
-#: views/accounts/register/imap-server.hbs:222
+#: views/accounts/register/imap-server.hbs:246
msgid "Failed to validate provided email server settings."
msgstr ""
-#: views/accounts/register/imap-server.hbs:292
+#: views/accounts/register/imap-server.hbs:316
msgid "General error"
msgstr ""
-#: views/accounts/register/imap-server.hbs:294
+#: views/accounts/register/imap-server.hbs:318
msgid "Validation error"
msgstr ""
-#: views/accounts/register/imap-server.hbs:300
+#: views/accounts/register/imap-server.hbs:324
msgid "Failed to validate IMAP server settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:302
+#: views/accounts/register/imap-server.hbs:326
msgid "IMAP Server responded with the following message:"
msgstr ""
-#: views/accounts/register/imap-server.hbs:309
+#: views/accounts/register/imap-server.hbs:333
msgid "Failed to validate SMTP server settings"
msgstr ""
-#: views/accounts/register/imap-server.hbs:311
+#: views/accounts/register/imap-server.hbs:335
msgid "SMTP Server responded with the following message:"
msgstr ""
-#: views/accounts/register/imap-server.hbs:369
+#: views/accounts/register/imap-server.hbs:393
msgid "HTTP error!"
msgstr ""
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
+msgstr ""
+
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
+msgstr ""
+
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr ""
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr ""
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr ""
+
#: lib/routes-ui.js:677
msgid "Invalid API key for OpenAI"
msgstr ""
@@ -262,4 +269,12 @@ msgstr ""
#: lib/tools.js:1418
#: lib/tools.js:1423
msgid "Invalid or expired account setup URL"
+msgstr ""
+
+#: lib/autodetect-imap-settings.js:69
+msgid ""
+"Microsoft has disabled password-based sign-ins (including app passwords) "
+"for Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To "
+"continue, please use the \"Sign in with Microsoft\" button to securely "
+"connect your account."
msgstr ""
\ No newline at end of file
diff --git a/views/accounts/register/imap-server.hbs b/views/accounts/register/imap-server.hbs
index da9966d79..a0b362cda 100644
--- a/views/accounts/register/imap-server.hbs
+++ b/views/accounts/register/imap-server.hbs
@@ -8,6 +8,7 @@
+
@@ -37,12 +38,24 @@
{{else}}
+
+ {{#if values.appPassword_warning}}
+
+ {{_ 'Important' }}
+
+ {{else}}
+
{{_ 'Instructions' }}
+ {{/if}}
+
@@ -117,12 +130,23 @@
{{else}}
+ {{#if values.appPassword_warning}}
+
+ {{_ 'Important' }}
+
+ {{else}}
+
{{_ 'Instructions' }}
+ {{/if}}
+