diff --git a/src/translation/de.json b/src/translation/de.json index 4beec4baf..fa1c3d361 100644 --- a/src/translation/de.json +++ b/src/translation/de.json @@ -985,10 +985,8 @@ "usage": "Benutzung", "addAction": "Hinzufügen" }, - "description": "Mit dem Cloudron E-Mail-Server können User E-Mails für diese Domäne empfangen. Die Anwendungen Rainloop, SOGo, Roundcube sind für den Zugriff auf Cloudron E-Mail bereits vorkonfiguriert.", "outgointServerInfo": "Ausgehende E-Mails (SMTP)", "sieveServerInfo": "Sieve-Filter verwalten", - "loginHelp": "Postfachname@{{ domain }} und das Passwort des Postfach-Users verwenden, um auf die Postfächer dieser Domäne zuzugreifen", "incomingServerInfo": "Eintreffende E-Mail (IMAP)" }, "masquerading": { @@ -1047,8 +1045,7 @@ "title": "Abonnement erforderlich" }, "config": { - "title": "E-Mail-Konfiguration für {{ domain }}", - "connectionDetails": "Verbindungsdetails für andere E-Mail-Clients" + "title": "E-Mail-Konfiguration für {{ domain }}" }, "addMailboxDialog": { "owner": "Besitzer*in des Postfachs", diff --git a/src/translation/en.json b/src/translation/en.json index 28a4e362e..3a87f833d 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -1048,16 +1048,14 @@ "backAction": "Back to Email", "config": { "title": "Email configuration {{ domain }}", - "connectionDetails": "Connection details for other email clients" + "clientConfiguration": "Configuring Email Clients" }, "incoming": { "title": "Incoming Email", - "description": "Cloudron Email Server allows users to receive email for this domain. Rainloop, SOGo, Roundcube are pre-configured to access Cloudron Email.", "disableAction": "Disable", "enableAction": "Enable", "outgointServerInfo": "Outgoing Mail (SMTP)", "sieveServerInfo": "ManageSieve", - "loginHelp": "Use mailboxname@{{ domain }} and the mailbox owner password to access mailboxes of this domain", "server": "Server", "port": "Port", "tabTitle": "Mailboxes", @@ -1084,7 +1082,13 @@ "subscriptionRequired": "This feature is only available in the paid plans. Set up Subscription Now", "saveAction": "Save" }, - "incomingServerInfo": "Incoming Mail (IMAP)" + "incomingServerInfo": "Incoming Mail (IMAP)", + "enabled": "Cloudron Email Server is configured to receive incoming emails for this domain.", + "disabled": "Cloudron Email Server will not receive incoming emails for this domain.", + "howToConnectDescription": "Use the settings below to configure email clients.", + "incomingUserInfo": "Username", + "incomingPasswordInfo": "Password", + "incomingPasswordUsage": "Password of the owner of the mailbox" }, "outbound": { "tabTitle": "Outbound", @@ -1208,7 +1212,8 @@ "updateMailboxDialog": { "activeCheckbox": "Mailbox is active", "enablePop3": "Enable POP3 access" - } + }, + "howToConnectInfoModal": "Configuring Email Clients" }, "app": { "backAction": "Back to My Apps", diff --git a/src/translation/es.json b/src/translation/es.json index f4b1da9eb..c086df618 100644 --- a/src/translation/es.json +++ b/src/translation/es.json @@ -1373,7 +1373,6 @@ "title": "Atrapa todo", "saveAction": "Guardar" }, - "description": "El Servidor de Correo de Cloudron permite a los usuarios recibir emails para este dominio. Rainloop, SOGo, Roundcube están pre-configurados para acceder al Correo de Cloudron.", "mailboxes": { "aliases": "Alias", "title": "Buzones de correo", @@ -1393,7 +1392,6 @@ }, "outgointServerInfo": "Correo Saliente (SMTP)", "sieveServerInfo": "ManageSieve", - "loginHelp": "Utiliza nombre del buzón @ {{domain}} y la contraseña del propietario del buzón para acceder a los buzones de este dominio", "title": "Correo electrónico entrante", "disableAction": "Deshabilitar", "enableAction": "Habilitar", @@ -1422,8 +1420,7 @@ }, "backAction": "Volver a Correo Electrónico", "config": { - "title": "Configuración de Correo electrónico {{ domain }}", - "connectionDetails": "Detalles de conexión para otros clientes de correo electrónico" + "title": "Configuración de Correo electrónico {{ domain }}" }, "updateMailboxDialog": { "activeCheckbox": "El buzón de correo está activo", diff --git a/src/translation/fr.json b/src/translation/fr.json index 56c1a78f1..18a07e0f0 100644 --- a/src/translation/fr.json +++ b/src/translation/fr.json @@ -1181,11 +1181,9 @@ "addAction": "Ajouter" }, "tabTitle": "Messageries", - "loginHelp": "Utilisez l'adresse mailboxname@{{ domain }} et le mot de passe de la messagerie de l'utilisateur pour accéder à toutes les messageries de ce domaine.", "sieveServerInfo": "ManageSieve", "incomingServerInfo": "Réception (IMAP)", "outgointServerInfo": "Envoi (SMTP)", - "description": "Le serveur de messagerie Cloudron permet aux utilisateurs de recevoir des emails sur ce domaine. Rainloop, SOGo, Roundcube sont préconfigurés pour fonctionner avec la messagerie Cloudron.", "port": "Port", "server": "Serveur", "enableAction": "Activer", @@ -1290,8 +1288,7 @@ }, "backAction": "Retour vers Messagerie", "config": { - "title": "Configuration de la messagerie {{ domain }}", - "connectionDetails": "Informations de connexion pour les autres clients de la messagerie" + "title": "Configuration de la messagerie {{ domain }}" }, "editMailinglistDialog": { "title": "Modifier la liste de diffusion {{ name }}@{{ domain }}" diff --git a/src/translation/it.json b/src/translation/it.json index 3ff335faa..ea4cec2e0 100644 --- a/src/translation/it.json +++ b/src/translation/it.json @@ -448,17 +448,14 @@ "tabTitle": "Caselle", "port": "Porta", "server": "Server", - "loginHelp": "Usa nomecasella@{{ domain }} e la password del proprietario della casella per accedere alle caselle di questi dominio", "sieveServerInfo": "ManageSieve", "outgointServerInfo": "Posta in uscita (SMTP)", "enableAction": "Abilita", "disableAction": "Disabilita", - "description": "Cloudron server e-mail permette di ricevere posta elettronica su questo dominio. Rainloop, SOGo, Roundcube sono pre-configurati per consentire l'accesso alle e-mail gestite da Cloudorn.", "title": "Posta in arrivo", "incomingServerInfo": "Posta in entrata (IMAP)" }, "config": { - "connectionDetails": "Parametri di connessione per altri client di posta elettronica", "title": "Configurazione e-mail {{ domain }}" }, "backAction": "Torna a E-mail", diff --git a/src/translation/nl.json b/src/translation/nl.json index bce369105..3884387a4 100644 --- a/src/translation/nl.json +++ b/src/translation/nl.json @@ -1343,15 +1343,13 @@ "email": { "backAction": "Terug naar e-mail", "config": { - "title": "E-mailconfiguratie {{ domain }}", - "connectionDetails": "Verbindingsdetails voor andere e-mailprogramma's" + "title": "E-mailconfiguratie {{ domain }}" }, "incoming": { "disableAction": "Uitschakelen", "enableAction": "Inschakelen", "outgointServerInfo": "Uitgaande e-mail (SMTP)", "sieveServerInfo": "ManageSieve", - "loginHelp": "Gebruik mailboxname@{{ domain }} en het wachtwoord van de e-mailbox eigenaar voor toegang tot mailboxen van dit domein", "server": "Server", "port": "Poort", "tabTitle": "E-mailboxen", @@ -1379,8 +1377,7 @@ "subscriptionRequired": "Deze functie is alleen beschikbaar voor betaalde abonnementen. Neem een abonnement" }, "incomingServerInfo": "Inkomende e-mail (IMAP)", - "title": "Inkomende e-mail", - "description": "Cloudron E-mailserver maakt het mogelijk e-mail te ontvangen voor dit domein. Rainloop, SOGo, Roundcube zijn voorgeconfigureerd voor Cloudron e-mail." + "title": "Inkomende e-mail" }, "outbound": { "tabTitle": "Uitgaand", diff --git a/src/translation/ru.json b/src/translation/ru.json index 214054ef9..1b04b0f67 100644 --- a/src/translation/ru.json +++ b/src/translation/ru.json @@ -1402,7 +1402,6 @@ }, "title": "Входящие письма", "sieveServerInfo": "Сервис ManageSieve", - "loginHelp": "Используйте имя_почтового_ящика@{{ domain }} и пароль владельца почтового ящика для получения доступа", "mailinglists": { "title": "Списки рассылок", "name": "Имя", @@ -1417,12 +1416,10 @@ "saveAction": "Сохранить", "description": "Письма, отправленные на несуществующие адреса, будут переадресованы на выбранные почтовые ящики." }, - "incomingServerInfo": "Входящая почта (IMAP)", - "description": "Почтовый сервер Cloudron позволяет пользователям получать электронные письма для данного домена. Rainloop, SOGo, Roundcube предварительно настроены на использование почтовых аккаунтов Cloudron." + "incomingServerInfo": "Входящая почта (IMAP)" }, "config": { - "title": "Конфигурация электронной почты {{ domain }}", - "connectionDetails": "Параметры для настройки прочих клиентов электронной почты" + "title": "Конфигурация электронной почты {{ domain }}" }, "settings": { "tabTitle": "Настройки" diff --git a/src/translation/vi.json b/src/translation/vi.json index d8233ed90..16b27153b 100644 --- a/src/translation/vi.json +++ b/src/translation/vi.json @@ -550,12 +550,10 @@ "tabTitle": "Hộp thư", "port": "Cổng", "server": "Server", - "loginHelp": "Dùng tenhopthu@{{ domain }} và mật khẩu của chủ hộp thư để truy cập tất cả hộp thư trên tên miền này", "sieveServerInfo": "Giao thức ManageSieve", "outgointServerInfo": "Mail gửi ra (SMTP)", "enableAction": "Bật", "disableAction": "Tắt", - "description": "Mail server của Cloudron cho phép người dùng nhận mail về tên miền này. Các app Rainloop, SOGo, Roundcube đã được cấu hình sẵn để truy cập được vào mail trên Cloudron.", "title": "Mail đến", "incomingServerInfo": "Mail đến (IMAP)", "catchall": { @@ -566,7 +564,6 @@ } }, "config": { - "connectionDetails": "Chi tiết kết nối cho những mail client khác", "title": "Cấu hình email cho {{ domain }}" }, "backAction": "Trở về mục email", diff --git a/src/translation/zh_Hans.json b/src/translation/zh_Hans.json index d5c4ab4d5..c10b262b7 100644 --- a/src/translation/zh_Hans.json +++ b/src/translation/zh_Hans.json @@ -971,8 +971,7 @@ "email": { "backAction": "回到邮件", "config": { - "title": "{{ domain }} Email 设置", - "connectionDetails": "其他邮件客户端的连接详情" + "title": "{{ domain }} Email 设置" }, "incoming": { "title": "入站邮件", @@ -1000,8 +999,6 @@ }, "disableAction": "停用", "outgointServerInfo": "发送邮件（SMTP）", - "description": "Cloudron 的邮件服务器允许用户接收这个域名的邮件。Rainloop, SOGo, Roundcube 已经为使用 Cloudron Email 预先配置好。", - "loginHelp": "使用 mailboxname@{{ domain }} 和邮箱所有者的 Cloudron 密码来登录邮箱", "incomingServerInfo": "入站邮件（IMAP）", "catchall": { "saveAction": "保存", diff --git a/src/views/email.html b/src/views/email.html index 5f14cc83c..fbfa69122 100644 --- a/src/views/email.html +++ b/src/views/email.html @@ -294,6 +294,29 @@ + + +

@@ -304,7 +327,20 @@
-

{{ 'email.config.title' | tr:{ domain: domain.domain } }}

+

+ {{ 'email.config.title' | tr:{ domain: domain.domain } }} + +
+ + +
+


@@ -314,9 +350,8 @@

{{ 'email.incoming.title' | tr }}

-

- -

{{ 'email.config.connectionDetails' | tr }}

+

{{ 'email.incoming.enabled' | tr }}

+

{{ 'email.incoming.disabled' | tr }}

@@ -326,19 +361,6 @@
- -
-
-
-
-

{{ 'email.incoming.incomingServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 993 (TLS)

-

{{ 'email.incoming.outgointServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 587 (STARTTLS) or 465 (TLS)

-

{{ 'email.incoming.sieveServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 4190 (STARTTLS)

-

-
-
-
-

diff --git a/src/views/email.js b/src/views/email.js index 490369814..417d5020e 100644 --- a/src/views/email.js +++ b/src/views/email.js @@ -787,6 +787,12 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio }); }; + $scope.howToConnectInfo = { + show: function () { + $('#howToConnectInfoModal').modal('show'); + } + }; + Client.onReady(function () { $scope.isAdminDomain = $scope.config.adminDomain === domainName;