MX
points to this server"
msgstr ""
"Per a registrar un nou domini, heu de configurar la \n"
-" zona de dominis per tal que el domini MX
apunte a aquest "
-"servidor"
+" zona de dominis per tal que el domini MX
apunte a aquest"
+" servidor"
#: mailu/ui/templates/domain/signup.html:18
msgid ""
@@ -547,10 +601,10 @@ msgid ""
" expires."
msgstr ""
"Si no sabeu configurar un registre MX
a la zona DNS,\n"
-"contacteu amb el vostre proveïdor o administrador de DNS. Per favor, espereu "
-"\n"
-"uns quants minuts despres d'ajustar el registre MX
perquè la "
-"caixet \n"
+"contacteu amb el vostre proveïdor o administrador de DNS. Per favor, "
+"espereu \n"
+"uns quants minuts despres d'ajustar el registre MX
perquè la"
+" caixet \n"
"del servidor local expire."
#: mailu/ui/templates/fetch/create.html:4
@@ -565,23 +619,27 @@ msgstr "Actualitzeu compte extern"
msgid "Add an account"
msgstr "Afegiu un compte"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpoint"
-#: mailu/ui/templates/fetch/list.html:21
+#: mailu/ui/templates/fetch/list.html:22
msgid "Keep emails"
msgstr "Mantingueu els correus"
-#: mailu/ui/templates/fetch/list.html:22
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Última comprovació"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
msgid "yes"
msgstr "sí"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:38
msgid "no"
msgstr "no"
@@ -629,7 +687,7 @@ msgstr "Nou usuari"
msgid "General"
msgstr "General"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funcions i espai"
@@ -637,10 +695,6 @@ msgstr "Funcions i espai"
msgid "Edit user"
msgstr "Edita usuari"
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Reenvia correus"
-
#: mailu/ui/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
@@ -649,11 +703,11 @@ msgstr "Llista d'usuaris"
msgid "Add user"
msgstr "Afegiu usuari"
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
msgid "User settings"
msgstr "Ajustos d'usuari"
-#: mailu/ui/templates/user/list.html:21
+#: mailu/ui/templates/user/list.html:22
msgid "Features"
msgstr "Característiques"
@@ -665,7 +719,7 @@ msgstr "Canvieu la contrasenya"
msgid "Automatic reply"
msgstr "Resposta automàtica"
-#: mailu/ui/templates/user/settings.html:22
+#: mailu/ui/templates/user/settings.html:27
msgid "Auto-forward"
msgstr "Auto-reenviament"
@@ -680,3 +734,10 @@ msgstr "Nom de domini"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Ranures lliures"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "per accedir a les eines d'administració"
+
+#~ msgid "Forward emails"
+#~ msgstr "Reenvia correus"
+
diff --git a/core/admin/mailu/translations/da/LC_MESSAGES/messages.po b/core/admin/mailu/translations/da/LC_MESSAGES/messages.po
index 6a5d1cdf..23c5030d 100644
--- a/core/admin/mailu/translations/da/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/da/LC_MESSAGES/messages.po
@@ -1,4 +1,4 @@
-# Translations template for PROJECT.
+# Danish translations for PROJECT.
# Copyright (C) 2018 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR MX
points to this server"
+msgstr ""
+"Um eine neue Domain registrieren zu können, müssen Sie zuerst den "
+"MX Resource Record
der neuen Domäne konfigurieren. Dieser "
+"muss auf den aktuellen Mail-Server verweisen."
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Bitte kontaktieren Sie ihren DNS-Anbieter oder -Administrator, falls Sie "
+"nicht wissen, wie ein MX Resource Record
auf Ihrem DNS-"
+"Server eingerichtet wird. Bitte beachten Sie auch, dass aufgrund der "
+"lokalen Server Cache Einstellungen eine Änderung am MX Resource "
+"Record
erst nach einigen Minuten aktiv wird."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Externes Konto hinzufügen"
@@ -423,14 +614,30 @@ msgstr "Externes Konto aktualisieren"
msgid "Add an account"
msgstr "Konto hinzufügen"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpunkt"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "E-Mails behalten"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Letzte Prüfung"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "ja"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "nein"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Einen Manager hinzufügen"
@@ -443,126 +650,6 @@ msgstr "Manager"
msgid "Add manager"
msgstr "Manager hinzufügen"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Betreff"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Text"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Absenden"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Öffentliche Bekanntmachung"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "von"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Bekanntmachung"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Neuer Benutzer"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Benutzer bearbeiten"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "E-Mails weiterleiten"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Benutzer"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Benutzer hinzufügen"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Einstellungen"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Funktionen"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Passwort aktualisieren"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Automatische Antwort"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Maximale Quota pro Benutzer"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Kopie der E-Mails behalten"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "E-Mails auf dem Server belassen"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "E-Mails behalten"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "ja"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "nein"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Alternativer Name"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Relay-Domain-Name"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Entfernter Host"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Relay-Domains"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Alternative Domain erstellen"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Alternative Domains"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Alternative hinzufügen"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Name"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternativen"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Neue Relay-Domain"
@@ -579,30 +666,6 @@ msgstr "Relay-Domains"
msgid "New relayed domain"
msgstr "Neue Relay-Domain"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Token (bitte speichern, da er hier nach nicht mehr angezeigt wird)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Authorisierte IP-Adresse"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Authentifizierungs-Tokens"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Wechseln zu"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Website"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Authentifizierungs-Token erstellen"
@@ -611,87 +674,49 @@ msgstr "Authentifizierungs-Token erstellen"
msgid "New token"
msgstr "Neuer Token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Neuer Benutzer"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Allgemein"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funktionen und Quotas"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Allgemeine Einstellungen"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Benutzer bearbeiten"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Benutzer"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Spamfilter-Grenzwert"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Benutzer hinzufügen"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Neuanmeldung erlauben"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Einstellungen"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Initiale Admin-Adresse"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Funktionen"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Administrator Passwort"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Passwort aktualisieren"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Aktiv"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Automatische Antwort"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "E-Mail-Adresse"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Registrieren"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Ende der Abwesenheit"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Client Einrichtung"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "E-Mail-Protokoll"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Servername"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Regestrieren Sie eine Domain"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Schlüssel erzeugen"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Um eine neue Domain registrieren zu können, müssen Sie zuerst den MX Resource Record
der neuen Domäne konfigurieren. Dieser muss auf den aktuellen Mail-Server verweisen."
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Bitte kontaktieren Sie ihren DNS-Anbieter oder -Administrator, falls Sie nicht wissen, wie ein MX Resource Record
auf Ihrem DNS-Server eingerichtet wird. Bitte beachten Sie auch, dass aufgrund der lokalen Server Cache Einstellungen eine Änderung am MX Resource Record
erst nach einigen Minuten aktiv wird."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Auto-Weiterleitung"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -704,3 +729,40 @@ msgstr "Domain"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Verfügbare Plätze"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Schwellenwert für Spamfilter"
+
+#~ msgid "Your account"
+#~ msgstr "Konto"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "für administrativen Zugriff"
+
+#~ msgid "Services status"
+#~ msgstr "Dienst-Status"
+
+#~ msgid "Service"
+#~ msgstr "Dienst"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Started"
+#~ msgstr "Gestartet"
+
+#~ msgid "Last update"
+#~ msgstr "Letztes Update"
+
+#~ msgid "from"
+#~ msgstr "von"
+
+#~ msgid "Forward emails"
+#~ msgstr "E-Mails weiterleiten"
+
+#~ msgid "General settings"
+#~ msgstr "Allgemeine Einstellungen"
+
diff --git a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
index 4db1dbf1..47253a04 100644
--- a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
@@ -7,252 +7,294 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2021-03-04 18:46+0000\n"
"Last-Translator: Jaume Barber MX
points to this server"
+msgstr ""
+"Para registrar un nuevo dominio primero debe configurar la zona DNS de "
+"modo que los registros MX
apunten a este servidor"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Si no sabe cómo configurar un registro MX
para su.zona DNS, "
+"por favor, contacte con su proveedor del dominio o administrador. "
+"También debe esperar unos minutos después de configurar el "
+"MX
, para que se refresque la caché del servidor."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Añadir una cuenta externa (fetched)"
@@ -423,14 +610,30 @@ msgstr "Actualizar cuenta externa (fetched)"
msgid "Add an account"
msgstr "Añadir una cuenta"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpoint"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Mantener los correos"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Última comprobación"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Estado"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "sí"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "no"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Añadir un gestor"
@@ -443,127 +646,6 @@ msgstr "Lista de gestores"
msgid "Add manager"
msgstr "Añadir un gestor"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Título del anuncio"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Texto del anuncio"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Enviar"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Anuncio público"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "De"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Anuncio"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Nuevo usuario"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Editar usuario"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Redirigir correos"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Lista de usuarios"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Añadir usuario"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Configuración de usuario"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Características"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Actualizar contraseña"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Respuesta automática"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Límite de cuota de usuario"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Mantener una copia de los correos"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Mantener los correos en el servidor"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Mantener los correos"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "sí"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "no"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Nombre alternativo"
-
-#. I assume relayed domain means the server is a relay server (hoy receive it from another machine), and relay domain means hoy silla send it todo another machine. Is it right, or opossite?
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Nombre de dominio a recepcionar"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Servidor remoto"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Dominios recepcionados (relayed)"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Crear dominio alternativo"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Lista de dominios alternativos"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Añadir alternativa"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Nombre"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternativas"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Nuevo dominio externo (relay)"
@@ -580,30 +662,6 @@ msgstr "Lista de dominios externos (relayed)"
msgid "New relayed domain"
msgstr "Editar dominio externo (relay)"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Su token (anótelo, ya que no se mostrará nunca más)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "IP autorizada"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Tokens de autenticación"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Ir a"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Correo web"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Correo web"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Crear un token de autenticación"
@@ -612,87 +670,49 @@ msgstr "Crear un token de autenticación"
msgid "New token"
msgstr "Nuevo token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Nuevo usuario"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "General"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funcionalidades y cuotas"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Configuración general"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Editar usuario"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Lista de usuarios"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Tolerancia del filtro de spam"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Añadir usuario"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Permitir registros"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Configuración de usuario"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Administrador inicial"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Características"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Contraseña del administrador"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Actualizar contraseña"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Habilitado"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Respuesta automática"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Direcciones de correo"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Registrarse"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Fin de las vacaciones"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Configuración del cliente"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Protocolo de correo"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Nombre del servidor"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Registrar un dominio"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Generar llaves"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Para registrar un nuevo dominio primero debe configurar la zona DNS de modo que los registros MX
apunten a este servidor"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Si no sabe cómo configurar un registro MX
para su.zona DNS, por favor, contacte con su proveedor del dominio o administrador. También debe esperar unos minutos después de configurar el MX
, para que se refresque la caché del servidor."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Auto-reenvío"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -705,3 +725,40 @@ msgstr "Dominio"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Slots disponibles"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Límite del filtro de spam"
+
+#~ msgid "Your account"
+#~ msgstr "Su cuenta"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "para acceder a las herramientas de administración"
+
+#~ msgid "Services status"
+#~ msgstr "Estado de servicios"
+
+#~ msgid "Service"
+#~ msgstr "Servicio"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid "Started"
+#~ msgstr "Iniciado"
+
+#~ msgid "Last update"
+#~ msgstr "Última actualización"
+
+#~ msgid "from"
+#~ msgstr "De"
+
+#~ msgid "Forward emails"
+#~ msgstr "Redirigir correos"
+
+#~ msgid "General settings"
+#~ msgstr "Configuración general"
+
diff --git a/core/admin/mailu/translations/eu/LC_MESSAGES/messages.po b/core/admin/mailu/translations/eu/LC_MESSAGES/messages.po
index 6ca737a3..f7c2faa1 100644
--- a/core/admin/mailu/translations/eu/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/eu/LC_MESSAGES/messages.po
@@ -1,4 +1,4 @@
-# Translations template for PROJECT.
+# Basque translations for PROJECT.
# Copyright (C) 2018 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR MX
points to this server"
+msgstr ""
+"Pour enregistrer un nouveau domaine, vous devez d'abord configurer la "
+"zone DNS de sorte que le MX
du domaine pointe sur ce "
+"serveur."
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Si vous ne savez pas comment configurer un enregistrement "
+"MX
, contactez votre fournisseur de DNS ou votre "
+"administrateur. Egalement, attendez quelques minutes après avoir modifié "
+"le MX
, le temps que le cache local au serveur soit "
+"rafraîchi."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Ajouter un compte externe"
@@ -423,14 +612,30 @@ msgstr "Modifier un compte externe"
msgid "Add an account"
msgstr "Ajouter un compte"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Source"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Conserver les messages"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Dernier relevé"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Etat"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "oui"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "non"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Ajouter un gérant"
@@ -443,126 +648,6 @@ msgstr "Liste des gérants"
msgid "Add manager"
msgstr "Ajouter le gérant"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Sujet de l'annonce"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Corps de l'annonce"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Envoyer"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Annonce globale"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "de"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Annonce"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Nouvel utilisateur"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Modifier l'utilisateur"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Faire suivre les emails"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Utilisateurs"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Options de l'utilisateur"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Fonctionnalités"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Modifier le mot de passe"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Réponse automatique"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Quota maximum par utilisateur"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Conserver une copie des messages"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Conserver les messages sur le serveur"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Conserver les messages"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "oui"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "non"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Nom alternatif"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Nom du domaine relayé"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Hôte distant"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Domaines relayé"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Nouveau domaine alternatif"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Liste des domaines alternatifs"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Ajouter une alternative"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Nom"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternatives"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Nouveau domaine relayé"
@@ -579,30 +664,6 @@ msgstr "Liste des domaines relayés"
msgid "New relayed domain"
msgstr "Nouveau domaine relayé"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Votre jeton (à conserver, il ne sera plus affiché par la suite)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Adresse IP autorisée"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Jetons d'authentification"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Navigation"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Site web"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Créer un jeton d'authentification"
@@ -611,87 +672,49 @@ msgstr "Créer un jeton d'authentification"
msgid "New token"
msgstr "Nouveau jeton"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Nouvel utilisateur"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Général"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Fonctionnalités et quotas"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Général"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Modifier l'utilisateur"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Utilisateurs"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Tolérance du filtre antispam"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Autoriser l'inscription"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Options de l'utilisateur"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Administrateur initial"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Fonctionnalités"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Mot de passe administrateur"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Modifier le mot de passe"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Activé"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Réponse automatique"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Adresse e-mail"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "S'inscrire"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Fin du mode vacance"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Configuration client"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Protocole"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Nom du serveur"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Inscrire un domaine"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Générer les clés"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Pour enregistrer un nouveau domaine, vous devez d'abord configurer la zone DNS de sorte que le MX
du domaine pointe sur ce serveur."
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Si vous ne savez pas comment configurer un enregistrement MX
, contactez votre fournisseur de DNS ou votre administrateur. Egalement, attendez quelques minutes après avoir modifié le MX
, le temps que le cache local au serveur soit rafraîchi."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Redirection"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -704,3 +727,40 @@ msgstr "Domaine"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Places disponibles"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Seuil du filtre anti-spam"
+
+#~ msgid "Your account"
+#~ msgstr "Votre compte"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "pour accéder aux outils d'administration"
+
+#~ msgid "Services status"
+#~ msgstr "Etat des services"
+
+#~ msgid "Service"
+#~ msgstr "Service"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Started"
+#~ msgstr "Démarré depuis"
+
+#~ msgid "Last update"
+#~ msgstr "Dernière mise à jour"
+
+#~ msgid "from"
+#~ msgstr "de"
+
+#~ msgid "Forward emails"
+#~ msgstr "Faire suivre les emails"
+
+#~ msgid "General settings"
+#~ msgstr "Général"
+
diff --git a/core/admin/mailu/translations/he/LC_MESSAGES/messages.po b/core/admin/mailu/translations/he/LC_MESSAGES/messages.po
index 91fbbcff..113872c7 100644
--- a/core/admin/mailu/translations/he/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/he/LC_MESSAGES/messages.po
@@ -1,4 +1,4 @@
-# Translations template for Mailu.
+# Hebrew translations for Mailu.
# Copyright (C) 2018 Mailu
# This file is distributed under the same license as the Mailu project.
# Modi Sacks, 2019-2021.
@@ -8,253 +8,295 @@ msgid ""
msgstr ""
"Project-Id-Version: Mailu 1.5.1\n"
"Report-Msgid-Bugs-To: heb-bugzap@projects.hamakor.org.il \n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2021-07-19 09:04+0300\n"
"Last-Translator: Yaron Shahrabani MX
record for your DNS "
"zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
" couple minutes after the MX
is set so the local server "
"cache\n"
" expires."
msgstr ""
"אם לא ברור לך איך להקים רשומת MX
עבור אזור ה־DNS שלך,\n"
-" נא ליצור קשר עם ספק ה־ DNS או ההנהלה שלך. כמו כן, נא להמתין מספר דקות\n"
+" נא ליצור קשר עם ספק ה־ DNS או ההנהלה שלך. כמו כן, נא להמתין מספר דקות"
+"\n"
" לאחר הגדרת ה־MX
כדי לאפשר לתוקף המטמון המקורי בשרת\n"
" לפוג."
@@ -562,23 +617,27 @@ msgstr "עדכון חשבון שנמשך"
msgid "Add an account"
msgstr "הוספת חשבון"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "נקודת גישה"
-#: mailu/ui/templates/fetch/list.html:21
+#: mailu/ui/templates/fetch/list.html:22
msgid "Keep emails"
msgstr "לשמור על ההודעות"
-#: mailu/ui/templates/fetch/list.html:22
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "בדיקה אחרונה"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
msgid "yes"
msgstr "כן"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:38
msgid "no"
msgstr "לא"
@@ -626,7 +685,7 @@ msgstr "משתמש חדש"
msgid "General"
msgstr "כללי"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "יכולות ומיכסות"
@@ -634,10 +693,6 @@ msgstr "יכולות ומיכסות"
msgid "Edit user"
msgstr "עריכת משתמש"
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "העברת הודעות"
-
#: mailu/ui/templates/user/list.html:4
msgid "User list"
msgstr "רשימת משתמשים"
@@ -646,11 +701,11 @@ msgstr "רשימת משתמשים"
msgid "Add user"
msgstr "הוספת משתמש"
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
msgid "User settings"
msgstr "הגדרות משתמש"
-#: mailu/ui/templates/user/list.html:21
+#: mailu/ui/templates/user/list.html:22
msgid "Features"
msgstr "יכולות"
@@ -662,7 +717,7 @@ msgstr "עדכון סיסמה"
msgid "Automatic reply"
msgstr "מענה אוטומטי"
-#: mailu/ui/templates/user/settings.html:22
+#: mailu/ui/templates/user/settings.html:27
msgid "Auto-forward"
msgstr "העברה אוטומטית"
@@ -677,3 +732,10 @@ msgstr "שם תחום"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "מקומות פנויים"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "כדי לגשת לכלי הניהול"
+
+#~ msgid "Forward emails"
+#~ msgstr "העברת הודעות"
+
diff --git a/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
index d593c84f..676c975a 100644
--- a/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
@@ -1,184 +1,338 @@
+
msgid ""
msgstr ""
-"Project-Id-Version: Mailu\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2020-01-31 01:22+0000\n"
"Last-Translator: Andrási István MX
points to this server"
+msgstr ""
+"Új tartomány létrehozásához először regisztrálnia kell a tartományi "
+"zónát,\n"
+" hogy a tartomány MX
rekordja erre a kiszolgálóra mutasson."
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Ha nem tudja hogyan kell az MX
rekordot regisztrálnia a DNS "
+"zónában, kérjük vegye fel a kapcsolatot a DNS rendszergazdával. Pár perc "
+"szükséges az MX
rekord regisztárciója után, amíg a helyi "
+"gyorsítótár elavul."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Letöltött fiók hozzáadása"
@@ -423,14 +611,30 @@ msgstr "Letöltött fiók frissítése"
msgid "Add an account"
msgstr "Fiók hozzáadása"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Végpont"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Levelek megtartása"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Utolsó ellenőrzés"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Állapot"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "igen"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "nem"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Kezelő hozzáadása"
@@ -443,126 +647,6 @@ msgstr "Kezelők listája"
msgid "Add manager"
msgstr "Kezelő hozzáadása"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Bejelentés tárgya"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Bejelentés levéltörzs"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Küldés"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Nyilvános bejelentés"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "küldő"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Bejelentés"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Új felhasználó"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Felhasználó szerkesztése"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Továbbítás"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Felhasználók"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Felhasználó hozzáadása"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Felhasználói beállítások"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Jellemzők"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Jelszó frissítése"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Automatikus válasz"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Maximális felhasználói kvóta"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Levélmásolat megtartása"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Levelek szerveren tartása"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Levelek megtartása"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "igen"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "nem"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Alternatív név"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Továbbított tartomány neve"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Távoli hoszt"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Továbbított tartományok"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Alternatív tartomány létrehozása"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Alternatív tartományok"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Alternatív hozzáadása"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Név"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternatívák"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Új továbbító tartomány"
@@ -579,30 +663,6 @@ msgstr "Továbbított tartományok"
msgid "New relayed domain"
msgstr "Új továbbított tartomány"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Token (írja le, többet nem jelenik meg a képernyőn)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Engedélyezett IP"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Belépési tokenek"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Ugrás"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Weboldal"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Belépési token létrehozása"
@@ -611,88 +671,49 @@ msgstr "Belépési token létrehozása"
msgid "New token"
msgstr "Új token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Új felhasználó"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Általános"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Jellemzők és kvóták"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Általános beállítások"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Felhasználó szerkesztése"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Levélszemét szűrő"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Felhasználók"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Szűrő tolerancia"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Felhasználó hozzáadása"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Feliratkozás engedélyezése"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Felhasználói beállítások"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Kezdeti adminisztrátor"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Jellemzők"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Adminisztrátor jelszó"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Jelszó frissítése"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Engedélyezve"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Automatikus válasz"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Email cím"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Feliratkozás"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Távollét vége"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Kliens beállítás"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Levél protokoll"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Kiszolgáló neve"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Tartomány regisztrálása"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Kulcsok létrehozása"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Új tartomány létrehozásához először regisztrálnia kell a tartományi zónát,\n"
-" hogy a tartomány MX
rekordja erre a kiszolgálóra mutasson."
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Ha nem tudja hogyan kell az MX
rekordot regisztrálnia a DNS zónában, kérjük vegye fel a kapcsolatot a DNS rendszergazdával. Pár perc szükséges az MX
rekord regisztárciója után, amíg a helyi gyorsítótár elavul."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Automatikus továbbítás"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -705,3 +726,40 @@ msgstr "Tartomány"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Elérhető rekeszek"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Levélszemét szűrő korlátja"
+
+#~ msgid "Your account"
+#~ msgstr "Saját fiók"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "az rendszergazai eszközökhöz fér hozzá"
+
+#~ msgid "Services status"
+#~ msgstr "Szolgáltatások állapota"
+
+#~ msgid "Service"
+#~ msgstr "Szolgáltatás"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Kép"
+
+#~ msgid "Started"
+#~ msgstr "Elindítva"
+
+#~ msgid "Last update"
+#~ msgstr "Utolsó frissítés"
+
+#~ msgid "from"
+#~ msgstr "küldő"
+
+#~ msgid "Forward emails"
+#~ msgstr "Továbbítás"
+
+#~ msgid "General settings"
+#~ msgstr "Általános beállítások"
+
diff --git a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
index 9798a792..d48a5bab 100644
--- a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
@@ -1,4 +1,4 @@
-# Translations template for PROJECT.
+# Icelandic translations for PROJECT.
# Copyright (C) 2018 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR MX
points to this server"
+msgstr ""
+"Per registrare un nuovo dominio, dovrà aggiustare prima la \n"
+"domain zone affinché il vostro dominio MX
punti contro il "
+"server"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Se non sa come aggiungere un registro MX
alla vostra zona "
+"DNS, \n"
+"dovrà contattare il suo provider o amministratore DNS. Prego, attenda "
+"qualche\n"
+"minuto tra l'impostazione del registro MX
finché la cache "
+"locale \n"
+"del server scaderà."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Aggiungere un conto ricuperato"
@@ -423,14 +614,30 @@ msgstr "Aggiornare un conto ricuperato"
msgid "Add an account"
msgstr "Aggiungi un account"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpoint"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Conserva email"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Ultimo controllo"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Stato"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "si"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "no"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Aggiungi un manager"
@@ -443,126 +650,6 @@ msgstr "Elenco di Manager"
msgid "Add manager"
msgstr "Aggiungi manager"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Oggetto dell'avviso"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Corpo dell'annuncio"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Invia"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Annuncio pubblico"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "da"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Annuncio"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Nuovo utente"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Modifica utente"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Inoltra email"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Lista utenti"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Aggiungi utente"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Impostazioni utente"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Funzionalità"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Aggiornamento password"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Risposta automatica"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Spazio massimo per utente"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Conserva una copia delle email"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Conserva email sul server"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Conserva email"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "si"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "no"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Nome alternativo"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Nome di dominio affidato"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Host remoto"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Domini affidati"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Creare un dominio alternativo"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Elenco di domini alternativi"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Aggiungi alternativa"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Nome"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternative"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Nuovo dominio affidato"
@@ -579,30 +666,6 @@ msgstr "Elenco di domini affidati"
msgid "New relayed domain"
msgstr "Nuovo dominio affidato"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Il suo token (dovrà annotarlo, dato che non verrà più mostrato)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "IP Autorizzato"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Token di autenticazione"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Vai a"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Sito web"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Crea un token di autenticazione"
@@ -611,97 +674,49 @@ msgstr "Crea un token di autenticazione"
msgid "New token"
msgstr "Nuovo token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Nuovo utente"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Generale"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funzionalità e quota"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Impostazioni generali"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Modifica utente"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Lista utenti"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Tolleranza filtro spam"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Aggiungi utente"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Avviare l'iscrizione"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Impostazioni utente"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Admin iniziale"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Funzionalità"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Admin password"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Aggiornamento password"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Attivo"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Risposta automatica"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Indirizzo email"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Iscriversi"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Rientro delle vacanze"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Impostazioni del cliente"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Protocolo mail"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Nome del server"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Registrare un dominio"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Generare chiavi"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr ""
-"Per registrare un nuovo dominio, dovrà aggiustare prima la \n"
-"domain zone affinché il vostro dominio MX
punti contro il "
-"server"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr ""
-"Se non sa come aggiungere un registro MX
alla vostra zona DNS, "
-"\n"
-"dovrà contattare il suo provider o amministratore DNS. Prego, attenda "
-"qualche\n"
-"minuto tra l'impostazione del registro MX
finché la cache "
-"locale \n"
-"del server scaderà."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Auto-inoltro"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -714,3 +729,40 @@ msgstr "Dominio"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Slot disponibili"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Soglia del filtro antispam"
+
+#~ msgid "Your account"
+#~ msgstr "Il tuo account"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "per accedere le impostazioni d'admin"
+
+#~ msgid "Services status"
+#~ msgstr "Status dei servizi"
+
+#~ msgid "Service"
+#~ msgstr "Servizio"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Immagine"
+
+#~ msgid "Started"
+#~ msgstr "Avviato"
+
+#~ msgid "Last update"
+#~ msgstr "Ultimo aggiornamento"
+
+#~ msgid "from"
+#~ msgstr "da"
+
+#~ msgid "Forward emails"
+#~ msgstr "Inoltra email"
+
+#~ msgid "General settings"
+#~ msgstr "Impostazioni generali"
+
diff --git a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
index 54b68c45..d6bad326 100644
--- a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
@@ -1,183 +1,337 @@
+
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
-"Project-Id-Version: Mailu\n"
-"Language: ja\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Ichikawa Yuriko MX
points to this server"
+msgstr ""
+"新しいドメインを登録するには、最初にMX
レコードが\n"
+"このサーバーを指すようにDNSゾーンを設定する必要があります。"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"もしDNSゾーンにMX
レコードを設定する方法が分からなければ、\n"
+"お使いのDNSサーバ管理者にお問い合わせ下さい。MX
レコード設定後は\n"
+"キャッシュ有効期限が切れるまでしばらくお待ちください。"
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "外部メールアカウントを追加"
@@ -427,14 +608,30 @@ msgstr "外部メールアカウントを更新"
msgid "Add an account"
msgstr "アカウントを追加"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "エンドポイント"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "メールを残す"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "最終確認"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "状態"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "はい"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "いいえ"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "管理者を追加"
@@ -447,127 +644,6 @@ msgstr "管理者一覧"
msgid "Add manager"
msgstr "管理者を追加"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "告知タイトル"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "告知本文"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "送信"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "一斉告知"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "差出人"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "告知"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "ユーザーを作成"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "ユーザーを編集"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "メール転送"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "ユーザー一覧"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "ユーザーを追加"
-
-#: mailu/ui/templates/user/list.html:19
-#: mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "ユーザー設定"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "サーバ機能"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "パスワード変更"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "自動返信"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "ユーザーの最大容量"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "メールのコピーを残す"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "サーバーにメールを残す"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "メールを残す"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "はい"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "いいえ"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "代替ドメイン名"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "リレードメイン名"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "サーバー"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "リレードメイン"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "代替ドメイン名を作成"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "代替ドメイン名一覧"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "代替ドメイン名を追加"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "代替ドメイン名"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "代替ドメイン"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "リレードメイン名を追加"
@@ -584,30 +660,6 @@ msgstr "リレードメイン名一覧"
msgid "New relayed domain"
msgstr "リレードメイン名を追加"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "トークン (一度だけしか表示されません。書き留めてください。)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "認証するIPアドレス"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "認証トークン"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "リンク"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webメール"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Webサイト"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "認証トークンを作成"
@@ -616,97 +668,49 @@ msgstr "認証トークンを作成"
msgid "New token"
msgstr "トークンを作成"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "ユーザーを作成"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "一般"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "サーバ機能と容量"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "一般設定"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "ユーザーを編集"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "スパムメール対策"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "ユーザー一覧"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "スパムフィルターの閾値"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "ユーザーを追加"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "ユーザー登録を有効にする"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "ユーザー設定"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "初期管理者アドレス"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "サーバ機能"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "管理パスワード"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "パスワード変更"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "有効"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "自動返信"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "E-Mailアドレス"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "ユーザー登録"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "自動返信終了日"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "クライアント設定"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "メールプロトコル"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "サーバーアドレス"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "ドメインを登録"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "キーを生成"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid ""
-"In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr ""
-"新しいドメインを登録するには、最初にMX
レコードが\n"
-"このサーバーを指すようにDNSゾーンを設定する必要があります。"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid ""
-"If you do not know how to setup an MX
record for your DNS "
-"zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server "
-"cache\n"
-" expires."
-msgstr ""
-"もしDNSゾーンにMX
レコードを設定する方法が分からなければ、\n"
-"お使いのDNSサーバ管理者にお問い合わせ下さい。MX
レコード設定後"
-"は\n"
-"キャッシュ有効期限が切れるまでしばらくお待ちください。"
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "自動転送"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -719,3 +723,40 @@ msgstr "ドメイン名"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "空きメールボックス数"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "スパムフィルターの閾値"
+
+#~ msgid "Your account"
+#~ msgstr "あなたのアカウント"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "管理画面"
+
+#~ msgid "Services status"
+#~ msgstr "サービス稼働状態"
+
+#~ msgid "Service"
+#~ msgstr "サービス"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Docker イメージ"
+
+#~ msgid "Started"
+#~ msgstr "実行中"
+
+#~ msgid "Last update"
+#~ msgstr "最終更新日"
+
+#~ msgid "from"
+#~ msgstr "差出人"
+
+#~ msgid "Forward emails"
+#~ msgstr "メール転送"
+
+#~ msgid "General settings"
+#~ msgstr "一般設定"
+
diff --git a/core/admin/mailu/translations/nb_NO/LC_MESSAGES/messages.po b/core/admin/mailu/translations/nb_NO/LC_MESSAGES/messages.po
index f8a942bc..ab1034bb 100644
--- a/core/admin/mailu/translations/nb_NO/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/nb_NO/LC_MESSAGES/messages.po
@@ -1,4 +1,4 @@
-# Translations template for PROJECT.
+# Norwegian Bokmål (Norway) translations for PROJECT.
# Copyright (C) 2018 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR MX
oppføring for ditt "
-"domeneområde,\n"
+"Om du ikke vet hvordan du setter opp en MX
oppføring for "
+"ditt domeneområde,\n"
" så kan du ta kontakt med din DNS-leverandør. Vennligst vent et\n"
-" par minutter etter at MX
er satt, slik at den lokal cachen "
-"på serveren\n"
+" par minutter etter at MX
er satt, slik at den lokal "
+"cachen på serveren\n"
" utløper."
#: mailu/ui/templates/fetch/create.html:4
@@ -563,23 +616,27 @@ msgstr "Oppdater en hentet konto"
msgid "Add an account"
msgstr "Legg til en konto"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endepunkt"
-#: mailu/ui/templates/fetch/list.html:21
+#: mailu/ui/templates/fetch/list.html:22
msgid "Keep emails"
msgstr "Behold e-poster"
-#: mailu/ui/templates/fetch/list.html:22
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Sist sjekk"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
msgid "yes"
msgstr "ja"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:38
msgid "no"
msgstr "nei"
@@ -627,7 +684,7 @@ msgstr "Ny bruker"
msgid "General"
msgstr "Generelt"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funksjoner og kvoter"
@@ -635,10 +692,6 @@ msgstr "Funksjoner og kvoter"
msgid "Edit user"
msgstr "Endre bruker"
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Videresend e-poster"
-
#: mailu/ui/templates/user/list.html:4
msgid "User list"
msgstr "Liste over brukere"
@@ -647,11 +700,11 @@ msgstr "Liste over brukere"
msgid "Add user"
msgstr "Legg til bruker"
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
msgid "User settings"
msgstr "Brukerinnstillinger"
-#: mailu/ui/templates/user/list.html:21
+#: mailu/ui/templates/user/list.html:22
msgid "Features"
msgstr "Funksjoner"
@@ -663,7 +716,7 @@ msgstr "Passord oppdatering"
msgid "Automatic reply"
msgstr "Automatisk svar"
-#: mailu/ui/templates/user/settings.html:22
+#: mailu/ui/templates/user/settings.html:27
msgid "Auto-forward"
msgstr "Automatisk videresending"
@@ -678,3 +731,10 @@ msgstr "Domene"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Tilgjengelige plasser"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "gå inn på administrasjonssenter"
+
+#~ msgid "Forward emails"
+#~ msgstr "Videresend e-poster"
+
diff --git a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
index c7f6db5e..33fc6779 100644
--- a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
@@ -1,179 +1,337 @@
+
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: POEditor.com\n"
-"Project-Id-Version: Mailu\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME MX
points to this server"
+msgstr ""
+"Om een nieuw domein te kunnen registreren moet je eerst je domein zone "
+"instellen zodat het domein MX
points to this server"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Als je niet weet hoe je een MX
moet instellen voor je DNS "
+"zone neem dan contact op met je DNS provider of beheerder. Wacht ook een "
+"paar minuten nader de MX
is ingesteld zodat de lokale server"
+" cache verloopt"
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Opgehaald account toevoegen"
@@ -418,14 +609,30 @@ msgstr "Opgehaald account aanpassen"
msgid "Add an account"
msgstr "Account toevoegen"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpoint"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Behoud e-mails"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Laatste controle"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "ja"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "nee"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Manager toevoegen"
@@ -438,126 +645,6 @@ msgstr "Manager overzicht"
msgid "Add manager"
msgstr "Manager toevoegen"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Mededeling onderwerp"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Mededeling bericht"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Versturen"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Publieke mededeling"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "van"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Mededeling"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Nieuwe gebruiker"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Gebruiker aanpassen"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "E-mails doorsturen"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Gebruikers overzicht"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Gebruiker toevoegen"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Gebruiker instellingen"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Functionaliteiten"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Wachtwoord aanpassen"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Automatisch antwoord"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Maximum quotum gebruikers"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Behoud een kopie van de e-mails"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Behoud de e-mails op de server"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Behoud e-mails"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "ja"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "nee"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Alternatieve naam"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Relayed domeinnaam"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Externe host"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Relayed domeinen"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Alternatief domein aanmaken"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Alternatieve domeinen overzicht"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Alternatief toevoegen"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Naam"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternatieven"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Nieuw relay domein"
@@ -574,30 +661,6 @@ msgstr "Overzicht relayed domeinen"
msgid "New relayed domain"
msgstr "Nieuw relayed domein"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Uw token (bewaar hem goed, want hij wordt nooit meer getoond)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Toegestaan IP"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Authenticatie tokens"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Ga naar"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Website"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Authenticatie token aanmaken"
@@ -606,87 +669,49 @@ msgstr "Authenticatie token aanmaken"
msgid "New token"
msgstr "Nieuw token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Nieuwe gebruiker"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Algemeen"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Functionaliteiten en quota"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Algemene instellingen"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Gebruiker aanpassen"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Anti-spam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Gebruikers overzicht"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Spam filter toleratie"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Gebruiker toevoegen"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Schakel registreren in"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Gebruiker instellingen"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Eerste beheerder"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Functionaliteiten"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Beheerder wachtwoord"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Wachtwoord aanpassen"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Ingeschakeld"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Automatisch antwoord"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "E-mailadres"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Registreren"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Einde van vakantie"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Client instellingen"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Mail protocol"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Server naam"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Registreer een domein"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Genereer sleutels"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Om een nieuw domein te kunnen registreren moet je eerst je domein zone instellen zodat het domein MX
points to this server"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Als je niet weet hoe je een MX
moet instellen voor je DNS zone neem dan contact op met je DNS provider of beheerder. Wacht ook een paar minuten nader de MX
is ingesteld zodat de lokale server cache verloopt"
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Automatisch doorsturen"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -700,3 +725,39 @@ msgstr "Domein"
msgid "Available slots"
msgstr "Vrije sloten"
+#~ msgid "Spam filter threshold"
+#~ msgstr "Spamfilter drempel"
+
+#~ msgid "Your account"
+#~ msgstr "Uw account"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "om toegang te krijgen tot systeembeheer"
+
+#~ msgid "Services status"
+#~ msgstr "Status diensten"
+
+#~ msgid "Service"
+#~ msgstr "Dienst"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Started"
+#~ msgstr "Gestart"
+
+#~ msgid "Last update"
+#~ msgstr "Laatste aanpassing"
+
+#~ msgid "from"
+#~ msgstr "van"
+
+#~ msgid "Forward emails"
+#~ msgstr "E-mails doorsturen"
+
+#~ msgid "General settings"
+#~ msgstr "Algemene instellingen"
+
diff --git a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
index 09130a7b..2d423020 100644
--- a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
@@ -1,7 +1,9 @@
+
msgid ""
msgstr ""
"Project-Id-Version: Mailu\n"
-"POT-Creation-Date: 2021-02-05 16:34+0100\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2020-02-17 20:23+0000\n"
"Last-Translator: Marcin Siennicki MX
points to this server"
+msgstr ""
+"Para registar um novo domínio, e necessário configurar as entradas "
+"MX
no DNS"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Caso não saiba configurar os registros MX
no DNS, entre well "
+"contato com o administrador do domínio. Aos configurado, ajude alguns "
+"minutos até que o cachê local do servidor expire"
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Adicionar conta a importar"
@@ -423,14 +609,30 @@ msgstr "Atualizar conta importada"
msgid "Add an account"
msgstr "Adicionar uma conta"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Endpoint"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Manter emails"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Última verificação"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "sim"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "não"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Adicionar gerente"
@@ -443,126 +645,6 @@ msgstr "Lista de gerentes"
msgid "Add manager"
msgstr "Adicionar gerente"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Título do comunicado"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Corpo do comunicado"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Enviar"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Comunicado geral"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "de"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Comunicado"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Novo usuário"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Editar usuário"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Encaminhar e-mails"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Lista de usuários"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Adicionar usuário"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Configurações de usuário"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Funcionalidades"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Atualizar senha"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Resposta automática"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Cota máxima por usuário"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Manter uma cópia dos emails"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Manter os e-mails no servidor"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Manter emails"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "sim"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "não"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Nome alternativo"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Nome de domínio para encaminhar"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Host remoto"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Domínios para encaminhamento"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Criar domínio alternativo"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Lista de domínios alternativos"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Adicionar alternativo"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Nome"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternativos"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Novo domínio para encaminhamento"
@@ -579,31 +661,6 @@ msgstr "Lista de domínios para encaminhamento"
msgid "New relayed domain"
msgstr "Novo domínio de encaminhamento"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Token (anote sem algum lugar pois não será mais exibido)\n"
-""
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "IP autorizado"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Tokens de autenticação"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Ir para"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Website"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Criar token de autenticação"
@@ -612,87 +669,49 @@ msgstr "Criar token de autenticação"
msgid "New token"
msgstr "Novo token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Novo usuário"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Geral"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Recursos e quotas"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Configurações"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Editar usuário"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Lista de usuários"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Filtro de tolerância de spam"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Adicionar usuário"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Habilitar acesso"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Configurações de usuário"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Administrador"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Funcionalidades"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Senha administrador"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Atualizar senha"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Habilitado"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Resposta automática"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Endereço de email"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Acesso"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Conclusão das férias"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Configuração"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Protocolo de e-mail"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Servidor"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Registrar domínio"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Gerar chaves"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Para registar um novo domínio, e necessário configurar as entradas MX
no DNS"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Caso não saiba configurar os registros MX
no DNS, entre well contato com o administrador do domínio. Aos configurado, ajude alguns minutos até que o cachê local do servidor expire"
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Encaminhamento automático"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -705,3 +724,40 @@ msgstr "Domínio"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Slots disponíveis"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Limite de filtro de spam"
+
+#~ msgid "Your account"
+#~ msgstr "Sua conta"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "para acessar as ferramentas administrativas"
+
+#~ msgid "Services status"
+#~ msgstr "Status do serviço"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
+#~ msgid "Started"
+#~ msgstr "Iniciado"
+
+#~ msgid "Last update"
+#~ msgstr "Última atualização"
+
+#~ msgid "from"
+#~ msgstr "de"
+
+#~ msgid "Forward emails"
+#~ msgstr "Encaminhar e-mails"
+
+#~ msgid "General settings"
+#~ msgstr "Configurações"
+
diff --git a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
index 790119fc..eb70db2f 100644
--- a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
@@ -1,185 +1,339 @@
+
msgid ""
msgstr ""
-"Project-Id-Version: Mailu\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2021-03-04 18:46+0000\n"
"Last-Translator: Jaume Barber MX
points to this server"
+msgstr ""
+"Чтобы зарегистрировать новый домен, вы должны сначала настроить\n"
+" доменная зона, так что домен MX code> указывает на этот "
+"сервер"
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+"Если вы не знаете, как настроить запись MX code> для своей зоны"
+" DNS,\n"
+" пожалуйста, свяжитесь с вашим поставщиком DNS или администратором. "
+"Также, пожалуйста, подождите\n"
+" через пару минут после установки MX code>, чтобы кэш "
+"локального сервера\n"
+" истекает."
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Добавить учетную запись стороннего сервера"
@@ -424,14 +615,30 @@ msgstr "Обновить учетную запись стороннего сер
msgid "Add an account"
msgstr "Добавить учетную запись"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Конечная точка"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Сохранять письма"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Последняя проверка"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr "Статус"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "да"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "нет"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Добавить менеджера"
@@ -444,126 +651,6 @@ msgstr "Список менеджеров"
msgid "Add manager"
msgstr "Добавить менеджера"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Тема объявления"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Содержание объявления"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Отправить"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Публичное объявление"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "От"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Объявление"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Новый пользователь"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Изменить пользователя"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Перенаправлять письма"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Список пользователей"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Добавить пользователя"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Настройки пользователя"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Функции"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Изменение пароля"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Автоматический ответ"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Квота на пользователя"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Хранить копии писем"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Хранить письма на сервере"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Сохранять письма"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "да"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "нет"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Имя альтернативного домена"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Имя релейного домена"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Удаленный хост"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Релейные домены"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Создать альтернативный домен"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Список альтернативных доменов"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Добавить альтернативный домен"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Имя"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Альтернативные домены"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Новый релейный домен"
@@ -580,30 +667,6 @@ msgstr "Список релейных доменов"
msgid "New relayed domain"
msgstr "Новый релейный домен"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Ваш токен (перепишите его, больше он показываться не будет)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Авторизованные IP-адреса"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Авторизационные токены"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Перейти к"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Электронная почта"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Сайт"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Создать токен авторизации"
@@ -612,91 +675,49 @@ msgstr "Создать токен авторизации"
msgid "New token"
msgstr "Новый токен"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Новый пользователь"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Общие"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Функции и квоты"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Общие настройки"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Изменить пользователя"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Антиспам"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Список пользователей"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr "Порог спам-фильтра"
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Добавить пользователя"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "Разрешить регистрацию"
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Настройки пользователя"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "Начальный админ"
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Функции"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "Пароль администратора"
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Изменение пароля"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "Включено"
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Автоматический ответ"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "Почтовый адрес"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr "Регистрация"
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr "Конец отпуска"
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "Настройка клиента"
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr "Почтовый протокол"
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr "Имя сервера"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "Зарегистрировать домен"
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr "Сгенерировать ключи"
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr "Чтобы зарегистрировать новый домен, вы должны сначала настроить\n"
-" доменная зона, так что домен MX code> указывает на этот сервер"
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr "Если вы не знаете, как настроить запись MX code> для своей зоны DNS,\n"
-" пожалуйста, свяжитесь с вашим поставщиком DNS или администратором. Также, пожалуйста, подождите\n"
-" через пару минут после установки MX code>, чтобы кэш локального сервера\n"
-" истекает."
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Автоматическая пересылка"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -709,3 +730,40 @@ msgstr "Домен"
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr "Доступные слоты"
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Порог чувствительности спам-фильтра"
+
+#~ msgid "Your account"
+#~ msgstr "Ваша учетная запись"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "для доступа к утилитам администрирования"
+
+#~ msgid "Services status"
+#~ msgstr "Статусы сервисов"
+
+#~ msgid "Service"
+#~ msgstr "Сервис"
+
+#~ msgid "PID"
+#~ msgstr "PID"
+
+#~ msgid "Image"
+#~ msgstr "Изображение"
+
+#~ msgid "Started"
+#~ msgstr "Начато"
+
+#~ msgid "Last update"
+#~ msgstr "Последнее обновление"
+
+#~ msgid "from"
+#~ msgstr "От"
+
+#~ msgid "Forward emails"
+#~ msgstr "Перенаправлять письма"
+
+#~ msgid "General settings"
+#~ msgstr "Общие настройки"
+
diff --git a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
index 071040f6..5b1bcce8 100644
--- a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
@@ -1,184 +1,338 @@
+
msgid ""
msgstr ""
-"Project-Id-Version: Mailu\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: 2021-03-04 18:46+0000\n"
"Last-Translator: Jaume Barber \n"
-"Language-Team: Swedish \n"
"Language: sv\n"
+"Language-Team: Swedish "
+" \n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0.1\n"
+"Generated-By: Babel 2.3.4\n"
-#: mailu/ui/forms.py:32
-msgid "Invalid email address."
-msgstr "Ogiltig adress"
-
-#: mailu/ui/forms.py:36
-msgid "Confirm"
-msgstr "Bekräfta"
-
-#: mailu/ui/forms.py:40 mailu/ui/forms.py:77
+#: mailu/sso/forms.py:8 mailu/ui/forms.py:79
msgid "E-mail"
msgstr "E-post"
-#: mailu/ui/forms.py:41 mailu/ui/forms.py:78 mailu/ui/forms.py:90
-#: mailu/ui/forms.py:109 mailu/ui/forms.py:162
-#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:59
+#: mailu/sso/forms.py:9 mailu/ui/forms.py:80 mailu/ui/forms.py:93
+#: mailu/ui/forms.py:112 mailu/ui/forms.py:166
+#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:57
msgid "Password"
msgstr "Lösenord"
-#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
-#: mailu/ui/templates/sidebar.html:111
+#: mailu/sso/forms.py:10 mailu/sso/forms.py:11 mailu/sso/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:142
msgid "Sign in"
msgstr "Logga in"
-#: mailu/ui/forms.py:46 mailu/ui/forms.py:56
-#: mailu/ui/templates/domain/details.html:27
-#: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
+#: mailu/sso/templates/base_sso.html:8 mailu/ui/templates/base.html:8
+msgid "Admin page for"
+msgstr ""
+
+#: mailu/sso/templates/base_sso.html:19 mailu/ui/templates/base.html:19
+msgid "toggle sidebar"
+msgstr ""
+
+#: mailu/sso/templates/base_sso.html:37 mailu/ui/templates/base.html:37
+msgid "change language"
+msgstr ""
+
+#: mailu/sso/templates/sidebar_sso.html:4 mailu/ui/templates/sidebar.html:94
+msgid "Go to"
+msgstr "Gå till"
+
+#: mailu/sso/templates/sidebar_sso.html:9 mailu/ui/templates/client.html:4
+#: mailu/ui/templates/sidebar.html:50 mailu/ui/templates/sidebar.html:107
+msgid "Client setup"
+msgstr ""
+
+#: mailu/sso/templates/sidebar_sso.html:16 mailu/ui/templates/sidebar.html:114
+msgid "Website"
+msgstr "Websida"
+
+#: mailu/sso/templates/sidebar_sso.html:22 mailu/ui/templates/sidebar.html:120
+msgid "Help"
+msgstr "Hjälp"
+
+#: mailu/sso/templates/sidebar_sso.html:35
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:127
+msgid "Register a domain"
+msgstr ""
+
+#: mailu/sso/templates/sidebar_sso.html:49 mailu/ui/forms.py:95
+#: mailu/ui/templates/sidebar.html:149 mailu/ui/templates/user/signup.html:4
+#: mailu/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:33 mailu/ui/forms.py:36
+msgid "Invalid email address."
+msgstr "Ogiltig adress"
+
+#: mailu/ui/forms.py:45
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#: mailu/ui/forms.py:48 mailu/ui/forms.py:58
+#: mailu/ui/templates/domain/details.html:26
+#: mailu/ui/templates/domain/list.html:19 mailu/ui/templates/relay/list.html:18
msgid "Domain name"
msgstr "Domännamn"
-#: mailu/ui/forms.py:47
+#: mailu/ui/forms.py:49
msgid "Maximum user count"
msgstr "Max antal användare"
-#: mailu/ui/forms.py:48
+#: mailu/ui/forms.py:50
msgid "Maximum alias count"
msgstr "Max antal alias"
-#: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
-#: mailu/ui/forms.py:128 mailu/ui/forms.py:140
-#: mailu/ui/templates/alias/list.html:21 mailu/ui/templates/domain/list.html:21
-#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
-#: mailu/ui/templates/user/list.html:23
+#: mailu/ui/forms.py:51
+msgid "Maximum user quota"
+msgstr "Max användar-quota"
+
+#: mailu/ui/forms.py:52
+msgid "Enable sign-up"
+msgstr ""
+
+#: mailu/ui/forms.py:53 mailu/ui/forms.py:74 mailu/ui/forms.py:86
+#: mailu/ui/forms.py:132 mailu/ui/forms.py:144
+#: mailu/ui/templates/alias/list.html:22 mailu/ui/templates/domain/list.html:22
+#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:20
+#: mailu/ui/templates/user/list.html:24
msgid "Comment"
msgstr "Kommentar"
-#: mailu/ui/forms.py:52 mailu/ui/forms.py:61 mailu/ui/forms.py:66
-#: mailu/ui/forms.py:73 mailu/ui/forms.py:132 mailu/ui/forms.py:141
-msgid "Create"
-msgstr "Skapa"
+#: mailu/ui/forms.py:54 mailu/ui/forms.py:68 mailu/ui/forms.py:75
+#: mailu/ui/forms.py:88 mailu/ui/forms.py:136 mailu/ui/forms.py:145
+msgid "Save"
+msgstr "Spara"
-#: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
+#: mailu/ui/forms.py:59
+msgid "Initial admin"
+msgstr ""
+
+#: mailu/ui/forms.py:60
+msgid "Admin password"
+msgstr ""
+
+#: mailu/ui/forms.py:61 mailu/ui/forms.py:81 mailu/ui/forms.py:94
msgid "Confirm password"
msgstr "Bekräfta lösenord"
-#: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
+#: mailu/ui/forms.py:63
+msgid "Create"
+msgstr "Skapa"
+
+#: mailu/ui/forms.py:67
+msgid "Alternative name"
+msgstr "Aleternativt namn"
+
+#: mailu/ui/forms.py:72
+msgid "Relayed domain name"
+msgstr "Reläade domännamn"
+
+#: mailu/ui/forms.py:73 mailu/ui/templates/relay/list.html:19
+msgid "Remote host"
+msgstr "Server"
+
+#: mailu/ui/forms.py:82 mailu/ui/templates/user/list.html:23
#: mailu/ui/templates/user/signup_domain.html:16
msgid "Quota"
msgstr "Quota"
-#: mailu/ui/forms.py:81
+#: mailu/ui/forms.py:83
msgid "Allow IMAP access"
msgstr "Tillåt IMAP"
-#: mailu/ui/forms.py:82
+#: mailu/ui/forms.py:84
msgid "Allow POP3 access"
msgstr "Tillåt POP3"
-#: mailu/ui/forms.py:85
-msgid "Save"
-msgstr "Spara"
-
-#: mailu/ui/forms.py:97
+#: mailu/ui/forms.py:85 mailu/ui/forms.py:101
+#: mailu/ui/templates/user/settings.html:15
msgid "Displayed name"
msgstr "Visat namn"
-#: mailu/ui/forms.py:98
+#: mailu/ui/forms.py:87
+msgid "Enabled"
+msgstr ""
+
+#: mailu/ui/forms.py:92
+msgid "Email address"
+msgstr ""
+
+#: mailu/ui/forms.py:102
msgid "Enable spam filter"
msgstr "Aktivera spamfilter"
-#: mailu/ui/forms.py:80
-msgid "Spam filter threshold"
-msgstr "Spamfilter gräns"
+#: mailu/ui/forms.py:103
+msgid "Enable marking spam mails as read"
+msgstr ""
+
+#: mailu/ui/forms.py:104
+msgid "Spam filter tolerance"
+msgstr ""
#: mailu/ui/forms.py:105
-msgid "Save settings"
-msgstr "Spara inställningar"
-
-#: mailu/ui/forms.py:110
-msgid "Password check"
-msgstr "Lösenordskoll"
-
-#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
-msgid "Update password"
-msgstr "Uppdatera lösenord"
-
-#: mailu/ui/forms.py:100
msgid "Enable forwarding"
msgstr "Aktivera vidarebefordring"
-#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
-#: mailu/ui/templates/alias/list.html:20
+#: mailu/ui/forms.py:106
+msgid "Keep a copy of the emails"
+msgstr "Behåll en kopia av e-posten"
+
+#: mailu/ui/forms.py:107 mailu/ui/forms.py:143
+#: mailu/ui/templates/alias/list.html:21
msgid "Destination"
msgstr "Destination"
-#: mailu/ui/forms.py:120
-msgid "Update"
-msgstr "Uppdatera"
+#: mailu/ui/forms.py:108
+msgid "Save settings"
+msgstr "Spara inställningar"
-#: mailu/ui/forms.py:115
+#: mailu/ui/forms.py:113
+msgid "Password check"
+msgstr "Lösenordskoll"
+
+#: mailu/ui/forms.py:114 mailu/ui/templates/sidebar.html:25
+msgid "Update password"
+msgstr "Uppdatera lösenord"
+
+#: mailu/ui/forms.py:118
msgid "Enable automatic reply"
msgstr "Aktivera autosvar"
-#: mailu/ui/forms.py:116
+#: mailu/ui/forms.py:119
msgid "Reply subject"
msgstr "Svar ämne"
-#: mailu/ui/forms.py:117
+#: mailu/ui/forms.py:120
msgid "Reply body"
msgstr "Svar meddelande"
-#: mailu/ui/forms.py:136
+#: mailu/ui/forms.py:122
+msgid "Start of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:123
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:124
+msgid "Update"
+msgstr "Uppdatera"
+
+#: mailu/ui/forms.py:129
+msgid "Your token (write it down, as it will never be displayed again)"
+msgstr "Din token (notera, eftersom den inte kommer att visas igen)"
+
+#: mailu/ui/forms.py:134 mailu/ui/templates/token/list.html:21
+msgid "Authorized IP"
+msgstr "Autentiserat IP"
+
+#: mailu/ui/forms.py:140
msgid "Alias"
msgstr "Alias"
-#: mailu/ui/forms.py:138
+#: mailu/ui/forms.py:142
msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
msgstr "Använd SQL-liknande syntax (t.ex. för catch-all alias)"
-#: mailu/ui/forms.py:145
+#: mailu/ui/forms.py:149
msgid "Admin email"
msgstr "Admin e-post"
-#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+#: mailu/ui/forms.py:150 mailu/ui/forms.py:155 mailu/ui/forms.py:168
msgid "Submit"
msgstr "Skicka in"
-#: mailu/ui/forms.py:150
+#: mailu/ui/forms.py:154
msgid "Manager email"
msgstr "Manager e-post"
-#: mailu/ui/forms.py:155
+#: mailu/ui/forms.py:159
msgid "Protocol"
msgstr "Protokoll"
-#: mailu/ui/forms.py:158
+#: mailu/ui/forms.py:162
msgid "Hostname or IP"
msgstr "Hostnamn eller IP"
-#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
-#: mailu/ui/templates/client.html:47
+#: mailu/ui/forms.py:163 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:45
msgid "TCP port"
msgstr "TCP port"
-#: mailu/ui/forms.py:160
+#: mailu/ui/forms.py:164
msgid "Enable TLS"
msgstr "Aktivera TLS"
-#: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
-#: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
+#: mailu/ui/forms.py:165 mailu/ui/templates/client.html:28
+#: mailu/ui/templates/client.html:53 mailu/ui/templates/fetch/list.html:21
msgid "Username"
msgstr "Användarnamn"
+#: mailu/ui/forms.py:167
+msgid "Keep emails on the server"
+msgstr "Behåll e-post på servern"
+
+#: mailu/ui/forms.py:172
+msgid "Announcement subject"
+msgstr "Publikt meddelande ämne"
+
+#: mailu/ui/forms.py:174
+msgid "Announcement body"
+msgstr "Publikt meddelande"
+
+#: mailu/ui/forms.py:176
+msgid "Send"
+msgstr "Skicka"
+
+#: mailu/ui/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "Publikt meddelande"
+
+#: mailu/ui/templates/antispam.html:4 mailu/ui/templates/sidebar.html:80
+#: mailu/ui/templates/user/settings.html:19
+msgid "Antispam"
+msgstr "Antispam"
+
+#: mailu/ui/templates/antispam.html:8
+msgid "RSPAMD status page"
+msgstr ""
+
+#: mailu/ui/templates/client.html:8
+msgid "configure your email client"
+msgstr ""
+
+#: mailu/ui/templates/client.html:13
+msgid "Incoming mail"
+msgstr ""
+
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:41
+msgid "Mail protocol"
+msgstr ""
+
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:49
+msgid "Server name"
+msgstr ""
+
+#: mailu/ui/templates/client.html:38
+msgid "Outgoing mail"
+msgstr ""
+
#: mailu/ui/templates/confirm.html:4
msgid "Confirm action"
msgstr "Bekräfta"
#: mailu/ui/templates/confirm.html:13
+#, python-format
msgid "You are about to %(action)s. Please confirm your action."
msgstr "Du håller på att %(action)s. Vänligen bekräfta."
@@ -190,82 +344,58 @@ msgstr "Docker fel"
msgid "An error occurred while talking to the Docker server."
msgstr "Ett fel inträffade vid kommunikation med Docker."
-#: mailu/admin/templates/login.html:6
-msgid "Your account"
-msgstr "Ditt konto"
-
-#: mailu/ui/templates/login.html:8
-msgid "to access the administration tools"
-msgstr "att komma åt administrationsverktygen"
-
-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
+#: mailu/ui/templates/macros.html:129
+msgid "copy to clipboard"
msgstr ""
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr ""
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr ""
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr ""
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:8
+#: mailu/ui/templates/sidebar.html:15
msgid "My account"
msgstr "Mitt konto"
-#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+#: mailu/ui/templates/sidebar.html:19 mailu/ui/templates/user/list.html:37
msgid "Settings"
msgstr "Inställningar"
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
-msgstr "Auto-forward"
-
-#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/user/list.html:38
msgid "Auto-reply"
msgstr "Autosvar"
-#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
-#: mailu/ui/templates/user/list.html:36
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:37
+#: mailu/ui/templates/user/list.html:39
msgid "Fetched accounts"
msgstr "Hämtade konton"
-#: mailu/ui/templates/sidebar.html:105
-msgid "Sign out"
-msgstr "Logga ut"
+#: mailu/ui/templates/sidebar.html:43 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr "Autentiserade tokens"
-#: mailu/ui/templates/sidebar.html:35
+#: mailu/ui/templates/sidebar.html:56
msgid "Administration"
msgstr "Administration"
-#: mailu/ui/templates/sidebar.html:49
+#: mailu/ui/templates/sidebar.html:62
+msgid "Announcement"
+msgstr "Meddelande"
+
+#: mailu/ui/templates/sidebar.html:68
msgid "Administrators"
msgstr "Administratörer"
-#: mailu/ui/templates/sidebar.html:66
+#: mailu/ui/templates/sidebar.html:74
+msgid "Relayed domains"
+msgstr "Reläade domäner"
+
+#: mailu/ui/templates/sidebar.html:88
msgid "Mail domains"
msgstr "Domäner"
-#: mailu/ui/templates/sidebar.html:92
-msgid "Help"
-msgstr "Hjälp"
+#: mailu/ui/templates/sidebar.html:99
+msgid "Webmail"
+msgstr "Webmail"
+
+#: mailu/ui/templates/sidebar.html:135
+msgid "Sign out"
+msgstr "Logga ut"
#: mailu/ui/templates/working.html:4
msgid "We are still working on this feature!"
@@ -283,26 +413,26 @@ msgstr "Globala administratörer"
msgid "Add administrator"
msgstr "Lägg till administratör"
-#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
-#: mailu/ui/templates/alternative/list.html:18
-#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
-#: mailu/ui/templates/manager/list.html:18
-#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
-#: mailu/ui/templates/user/list.html:18
+#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
+#: mailu/ui/templates/alternative/list.html:19
+#: mailu/ui/templates/domain/list.html:17 mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/manager/list.html:19
+#: mailu/ui/templates/relay/list.html:17 mailu/ui/templates/token/list.html:19
+#: mailu/ui/templates/user/list.html:19
msgid "Actions"
msgstr "Handling"
-#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
-#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
+#: mailu/ui/templates/admin/list.html:18 mailu/ui/templates/alias/list.html:20
+#: mailu/ui/templates/manager/list.html:20 mailu/ui/templates/user/list.html:21
msgid "Email"
msgstr "E-post"
-#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
-#: mailu/ui/templates/alternative/list.html:25
-#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
-#: mailu/ui/templates/manager/list.html:24
-#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
-#: mailu/ui/templates/user/list.html:31
+#: mailu/ui/templates/admin/list.html:25 mailu/ui/templates/alias/list.html:32
+#: mailu/ui/templates/alternative/list.html:29
+#: mailu/ui/templates/domain/list.html:34 mailu/ui/templates/fetch/list.html:34
+#: mailu/ui/templates/manager/list.html:27
+#: mailu/ui/templates/relay/list.html:30 mailu/ui/templates/token/list.html:30
+#: mailu/ui/templates/user/list.html:34
msgid "Delete"
msgstr "Radera"
@@ -322,26 +452,44 @@ msgstr "Alias-lista"
msgid "Add alias"
msgstr "Skapa alias"
-#: mailu/ui/templates/alias/list.html:22
-#: mailu/ui/templates/alternative/list.html:20
-#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
-#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
-#: mailu/ui/templates/user/list.html:24
+#: mailu/ui/templates/alias/list.html:23
+#: mailu/ui/templates/alternative/list.html:21
+#: mailu/ui/templates/domain/list.html:23 mailu/ui/templates/fetch/list.html:25
+#: mailu/ui/templates/relay/list.html:21 mailu/ui/templates/token/list.html:22
+#: mailu/ui/templates/user/list.html:25
msgid "Created"
msgstr "Skapad"
-#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
-#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
-#: mailu/ui/templates/user/list.html:25
+#: mailu/ui/templates/alias/list.html:24
+#: mailu/ui/templates/alternative/list.html:22
+#: mailu/ui/templates/domain/list.html:24 mailu/ui/templates/fetch/list.html:26
+#: mailu/ui/templates/relay/list.html:22 mailu/ui/templates/token/list.html:23
+#: mailu/ui/templates/user/list.html:26
msgid "Last edit"
msgstr "Senast redigerad"
-#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
-#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
-#: mailu/ui/templates/user/list.html:30
+#: mailu/ui/templates/alias/list.html:31 mailu/ui/templates/domain/list.html:33
+#: mailu/ui/templates/fetch/list.html:33 mailu/ui/templates/relay/list.html:29
+#: mailu/ui/templates/user/list.html:33
msgid "Edit"
msgstr "Redigera"
+#: mailu/ui/templates/alternative/create.html:4
+msgid "Create alternative domain"
+msgstr "Skapa alternativ domän"
+
+#: mailu/ui/templates/alternative/list.html:4
+msgid "Alternative domain list"
+msgstr "Alternativa domäner"
+
+#: mailu/ui/templates/alternative/list.html:12
+msgid "Add alternative"
+msgstr "Lägg till alternativ"
+
+#: mailu/ui/templates/alternative/list.html:20
+msgid "Name"
+msgstr "Namn"
+
#: mailu/ui/templates/domain/create.html:4
#: mailu/ui/templates/domain/list.html:9
msgid "New domain"
@@ -355,26 +503,38 @@ msgstr "Domändetaljer"
msgid "Regenerate keys"
msgstr "Generera nycklar"
-#: mailu/ui/templates/domain/details.html:31
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:30
msgid "DNS MX entry"
msgstr "DNS MX post"
-#: mailu/ui/templates/domain/details.html:35
+#: mailu/ui/templates/domain/details.html:34
msgid "DNS SPF entries"
msgstr "DNS SPF post"
-#: mailu/ui/templates/domain/details.html:42
+#: mailu/ui/templates/domain/details.html:40
msgid "DKIM public key"
msgstr "Publik DKIM-nyckel"
-#: mailu/ui/templates/domain/details.html:46
+#: mailu/ui/templates/domain/details.html:44
msgid "DNS DKIM entry"
msgstr "DNS DKIM post"
-#: mailu/ui/templates/domain/details.html:50
+#: mailu/ui/templates/domain/details.html:48
msgid "DNS DMARC entry"
msgstr "DNS DMARC post"
+#: mailu/ui/templates/domain/details.html:58
+msgid "DNS TLSA entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:63
+msgid "DNS client auto-configuration entries"
+msgstr ""
+
#: mailu/ui/templates/domain/edit.html:4
msgid "Edit domain"
msgstr "Redigera domän"
@@ -383,34 +543,55 @@ msgstr "Redigera domän"
msgid "Domain list"
msgstr "Domänlista"
-#: mailu/ui/templates/domain/list.html:17
+#: mailu/ui/templates/domain/list.html:18
msgid "Manage"
msgstr "Managera"
-#: mailu/ui/templates/domain/list.html:19
+#: mailu/ui/templates/domain/list.html:20
msgid "Mailbox count"
msgstr "Antal mailboxar"
-#: mailu/ui/templates/domain/list.html:20
+#: mailu/ui/templates/domain/list.html:21
msgid "Alias count"
msgstr "Antal alias"
-#: mailu/ui/templates/domain/list.html:28
+#: mailu/ui/templates/domain/list.html:31
msgid "Details"
msgstr "Detaljer"
-#: mailu/ui/templates/domain/list.html:35
+#: mailu/ui/templates/domain/list.html:38
msgid "Users"
msgstr "Användare"
-#: mailu/ui/templates/domain/list.html:36
+#: mailu/ui/templates/domain/list.html:39
msgid "Aliases"
msgstr "Alias"
-#: mailu/ui/templates/domain/list.html:37
+#: mailu/ui/templates/domain/list.html:40
msgid "Managers"
msgstr "Managers"
+#: mailu/ui/templates/domain/list.html:42
+msgid "Alternatives"
+msgstr "Alternativ"
+
+#: mailu/ui/templates/domain/signup.html:13
+msgid ""
+"In order to register a new domain, you must first setup the\n"
+" domain zone so that the domain MX
points to this server"
+msgstr ""
+
+#: mailu/ui/templates/domain/signup.html:18
+msgid ""
+"If you do not know how to setup an MX
record for your DNS "
+"zone,\n"
+" please contact your DNS provider or administrator. Also, please wait "
+"a\n"
+" couple minutes after the MX
is set so the local server "
+"cache\n"
+" expires."
+msgstr ""
+
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
msgstr "Lägg till hämtat konto"
@@ -423,14 +604,30 @@ msgstr "Uppdatera ett hämtat konto"
msgid "Add an account"
msgstr "Lägg till ett konto"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "Slutpunkt"
#: mailu/ui/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr "Behåll e-posten"
+
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "Senaste koll"
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "yes"
+msgstr "ja"
+
+#: mailu/ui/templates/fetch/list.html:38
+msgid "no"
+msgstr "nej"
+
#: mailu/ui/templates/manager/create.html:4
msgid "Add a manager"
msgstr "Lägg till en manager"
@@ -443,126 +640,6 @@ msgstr "Managerlista"
msgid "Add manager"
msgstr "Skapa manager"
-#: mailu/ui/forms.py:168
-msgid "Announcement subject"
-msgstr "Publikt meddelande ämne"
-
-#: mailu/ui/forms.py:170
-msgid "Announcement body"
-msgstr "Publikt meddelande"
-
-#: mailu/ui/forms.py:172
-msgid "Send"
-msgstr "Skicka"
-
-#: mailu/ui/templates/announcement.html:4
-msgid "Public announcement"
-msgstr "Publikt meddelande"
-
-#: mailu/ui/templates/announcement.html:8
-msgid "from"
-msgstr "från"
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr "Meddelande"
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr "Ny användare"
-
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
-msgstr "Redigera användare"
-
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "Vidarebefordra e-post"
-
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
-msgstr "Användarlista"
-
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
-msgstr "Lägg till användare"
-
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
-msgstr "Användarinställningar"
-
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
-msgstr "Funktioner"
-
-#: mailu/ui/templates/user/password.html:4
-msgid "Password update"
-msgstr "Uppdatera lösenord"
-
-#: mailu/ui/templates/user/reply.html:4
-msgid "Automatic reply"
-msgstr "Automatiskt svar"
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "Max användar-quota"
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr "Behåll en kopia av e-posten"
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-msgstr "Behåll e-post på servern"
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr "Behåll e-posten"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr "ja"
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr "nej"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "Aleternativt namn"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "Reläade domännamn"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "Server"
-
-#: mailu/ui/templates/sidebar.html:54
-msgid "Relayed domains"
-msgstr "Reläade domäner"
-
-#: mailu/ui/templates/alternative/create.html:4
-msgid "Create alternative domain"
-msgstr "Skapa alternativ domän"
-
-#: mailu/ui/templates/alternative/list.html:4
-msgid "Alternative domain list"
-msgstr "Alternativa domäner"
-
-#: mailu/ui/templates/alternative/list.html:12
-msgid "Add alternative"
-msgstr "Lägg till alternativ"
-
-#: mailu/ui/templates/alternative/list.html:19
-msgid "Name"
-msgstr "Namn"
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-msgstr "Alternativ"
-
#: mailu/ui/templates/relay/create.html:4
msgid "New relay domain"
msgstr "Ny relä-domän"
@@ -579,30 +656,6 @@ msgstr "Reläade domäner"
msgid "New relayed domain"
msgstr "Ny reläad domän"
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr "Din token (notera, eftersom den inte kommer att visas igen)"
-
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr "Autentiserat IP"
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr "Autentiserade tokens"
-
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "Gå till"
-
-#: mailu/ui/templates/sidebar.html:76
-msgid "Webmail"
-msgstr "Webmail"
-
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "Websida"
-
#: mailu/ui/templates/token/create.html:4
msgid "Create an authentication token"
msgstr "Skapa en autentiseringstoken"
@@ -611,87 +664,49 @@ msgstr "Skapa en autentiseringstoken"
msgid "New token"
msgstr "Ny token"
+#: mailu/ui/templates/user/create.html:4
+msgid "New user"
+msgstr "Ny användare"
+
#: mailu/ui/templates/user/create.html:15
msgid "General"
msgstr "Allmänt"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "Funktioner och quota"
-#: mailu/ui/templates/user/settings.html:14
-msgid "General settings"
-msgstr "Allmäna inställningar"
+#: mailu/ui/templates/user/edit.html:4
+msgid "Edit user"
+msgstr "Redigera användare"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "Antispam"
+#: mailu/ui/templates/user/list.html:4
+msgid "User list"
+msgstr "Användarlista"
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr ""
+#: mailu/ui/templates/user/list.html:12
+msgid "Add user"
+msgstr "Lägg till användare"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
+msgid "User settings"
+msgstr "Användarinställningar"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
+#: mailu/ui/templates/user/list.html:22
+msgid "Features"
+msgstr "Funktioner"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
+#: mailu/ui/templates/user/password.html:4
+msgid "Password update"
+msgstr "Uppdatera lösenord"
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
+#: mailu/ui/templates/user/reply.html:4
+msgid "Automatic reply"
+msgstr "Automatiskt svar"
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr ""
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
-#: mailu/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
-
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr ""
-
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
-msgid "Mail protocol"
-msgstr ""
-
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
-msgid "Server name"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:13
-msgid "In order to register a new domain, you must first setup the\n"
-" domain zone so that the domain MX
points to this server"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:18
-msgid "If you do not know how to setup an MX
record for your DNS zone,\n"
-" please contact your DNS provider or administrator. Also, please wait a\n"
-" couple minutes after the MX
is set so the local server cache\n"
-" expires."
-msgstr ""
+#: mailu/ui/templates/user/settings.html:27
+msgid "Auto-forward"
+msgstr "Auto-forward"
#: mailu/ui/templates/user/signup_domain.html:8
msgid "pick a domain for the new account"
@@ -704,3 +719,40 @@ msgstr ""
#: mailu/ui/templates/user/signup_domain.html:15
msgid "Available slots"
msgstr ""
+
+#~ msgid "Spam filter threshold"
+#~ msgstr "Spamfilter gräns"
+
+#~ msgid "Your account"
+#~ msgstr "Ditt konto"
+
+#~ msgid "to access the administration tools"
+#~ msgstr "att komma åt administrationsverktygen"
+
+#~ msgid "Services status"
+#~ msgstr ""
+
+#~ msgid "Service"
+#~ msgstr ""
+
+#~ msgid "PID"
+#~ msgstr ""
+
+#~ msgid "Image"
+#~ msgstr ""
+
+#~ msgid "Started"
+#~ msgstr ""
+
+#~ msgid "Last update"
+#~ msgstr ""
+
+#~ msgid "from"
+#~ msgstr "från"
+
+#~ msgid "Forward emails"
+#~ msgstr "Vidarebefordra e-post"
+
+#~ msgid "General settings"
+#~ msgstr "Allmäna inställningar"
+
diff --git a/core/admin/mailu/translations/zh/LC_MESSAGES/messages.po b/core/admin/mailu/translations/zh/LC_MESSAGES/messages.po
index 5543c5e8..9544091b 100644
--- a/core/admin/mailu/translations/zh/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/zh/LC_MESSAGES/messages.po
@@ -1,247 +1,295 @@
+
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
-"Project-Id-Version: Mailu\n"
-"Language: zh\n"
+"Project-Id-Version: Mailu\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Chris Chuan \n"
+"Language: zh\n"
"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
-#: mailu/ui/forms.py:32
-msgid "Invalid email address."
-msgstr "无效的邮件地址"
-
-#: mailu/ui/forms.py:36
-msgid "Confirm"
-msgstr "确认"
-
-#: mailu/ui/forms.py:40 mailu/ui/forms.py:77
+#: mailu/sso/forms.py:8 mailu/ui/forms.py:79
msgid "E-mail"
msgstr "电子邮件"
-#: mailu/ui/forms.py:41 mailu/ui/forms.py:78 mailu/ui/forms.py:90
-#: mailu/ui/forms.py:109 mailu/ui/forms.py:162
-#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:59
+#: mailu/sso/forms.py:9 mailu/ui/forms.py:80 mailu/ui/forms.py:93
+#: mailu/ui/forms.py:112 mailu/ui/forms.py:166
+#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:57
msgid "Password"
msgstr "密码"
-#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
-#: mailu/ui/templates/sidebar.html:111
+#: mailu/sso/forms.py:10 mailu/sso/forms.py:11 mailu/sso/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:142
msgid "Sign in"
msgstr "登录"
-#: mailu/ui/forms.py:46 mailu/ui/forms.py:56
-#: mailu/ui/templates/domain/details.html:27
-#: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
-msgid "Domain name"
-msgstr "域名"
+#: mailu/sso/templates/base_sso.html:8 mailu/ui/templates/base.html:8
+msgid "Admin page for"
+msgstr ""
-#: mailu/ui/forms.py:47
-msgid "Maximum user count"
-msgstr "最大用户数"
+#: mailu/sso/templates/base_sso.html:19 mailu/ui/templates/base.html:19
+msgid "toggle sidebar"
+msgstr ""
-#: mailu/ui/forms.py:48
-msgid "Maximum alias count"
-msgstr "最大别名数"
+#: mailu/sso/templates/base_sso.html:37 mailu/ui/templates/base.html:37
+msgid "change language"
+msgstr ""
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr "最大用户配额"
+#: mailu/sso/templates/sidebar_sso.html:4 mailu/ui/templates/sidebar.html:94
+msgid "Go to"
+msgstr "转到"
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr "启用注册"
+#: mailu/sso/templates/sidebar_sso.html:9 mailu/ui/templates/client.html:4
+#: mailu/ui/templates/sidebar.html:50 mailu/ui/templates/sidebar.html:107
+msgid "Client setup"
+msgstr "客户端设置"
-#: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
-#: mailu/ui/forms.py:128 mailu/ui/forms.py:140
-#: mailu/ui/templates/alias/list.html:21 mailu/ui/templates/domain/list.html:21
-#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
-#: mailu/ui/templates/user/list.html:23
-msgid "Comment"
-msgstr "说明"
+#: mailu/sso/templates/sidebar_sso.html:16 mailu/ui/templates/sidebar.html:114
+msgid "Website"
+msgstr "网站"
-#: mailu/ui/forms.py:52 mailu/ui/forms.py:61 mailu/ui/forms.py:66
-#: mailu/ui/forms.py:73 mailu/ui/forms.py:132 mailu/ui/forms.py:141
-msgid "Create"
-msgstr "创建"
+#: mailu/sso/templates/sidebar_sso.html:22 mailu/ui/templates/sidebar.html:120
+msgid "Help"
+msgstr "帮助"
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
-msgstr "初始管理员"
+#: mailu/sso/templates/sidebar_sso.html:35
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:127
+msgid "Register a domain"
+msgstr "注册域名"
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr "管理员密码"
-
-#: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
-msgid "Confirm password"
-msgstr "确认密码"
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr "备用名称"
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr "中继域域名"
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr "远程主机"
-
-#: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
-#: mailu/ui/templates/user/signup_domain.html:16
-msgid "Quota"
-msgstr "配额"
-
-#: mailu/ui/forms.py:81
-msgid "Allow IMAP access"
-msgstr "允许IMAP访问"
-
-#: mailu/ui/forms.py:82
-msgid "Allow POP3 access"
-msgstr "允许POP3访问"
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr "启用"
-
-#: mailu/ui/forms.py:85
-msgid "Save"
-msgstr "保存"
-
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr "邮件地址"
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
+#: mailu/sso/templates/sidebar_sso.html:49 mailu/ui/forms.py:95
+#: mailu/ui/templates/sidebar.html:149 mailu/ui/templates/user/signup.html:4
#: mailu/ui/templates/user/signup_domain.html:4
msgid "Sign up"
msgstr "注册"
-#: mailu/ui/forms.py:97
+#: mailu/ui/forms.py:33 mailu/ui/forms.py:36
+msgid "Invalid email address."
+msgstr "无效的邮件地址"
+
+#: mailu/ui/forms.py:45
+msgid "Confirm"
+msgstr "确认"
+
+#: mailu/ui/forms.py:48 mailu/ui/forms.py:58
+#: mailu/ui/templates/domain/details.html:26
+#: mailu/ui/templates/domain/list.html:19 mailu/ui/templates/relay/list.html:18
+msgid "Domain name"
+msgstr "域名"
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user count"
+msgstr "最大用户数"
+
+#: mailu/ui/forms.py:50
+msgid "Maximum alias count"
+msgstr "最大别名数"
+
+#: mailu/ui/forms.py:51
+msgid "Maximum user quota"
+msgstr "最大用户配额"
+
+#: mailu/ui/forms.py:52
+msgid "Enable sign-up"
+msgstr "启用注册"
+
+#: mailu/ui/forms.py:53 mailu/ui/forms.py:74 mailu/ui/forms.py:86
+#: mailu/ui/forms.py:132 mailu/ui/forms.py:144
+#: mailu/ui/templates/alias/list.html:22 mailu/ui/templates/domain/list.html:22
+#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:20
+#: mailu/ui/templates/user/list.html:24
+msgid "Comment"
+msgstr "说明"
+
+#: mailu/ui/forms.py:54 mailu/ui/forms.py:68 mailu/ui/forms.py:75
+#: mailu/ui/forms.py:88 mailu/ui/forms.py:136 mailu/ui/forms.py:145
+msgid "Save"
+msgstr "保存"
+
+#: mailu/ui/forms.py:59
+msgid "Initial admin"
+msgstr "初始管理员"
+
+#: mailu/ui/forms.py:60
+msgid "Admin password"
+msgstr "管理员密码"
+
+#: mailu/ui/forms.py:61 mailu/ui/forms.py:81 mailu/ui/forms.py:94
+msgid "Confirm password"
+msgstr "确认密码"
+
+#: mailu/ui/forms.py:63
+msgid "Create"
+msgstr "创建"
+
+#: mailu/ui/forms.py:67
+msgid "Alternative name"
+msgstr "备用名称"
+
+#: mailu/ui/forms.py:72
+msgid "Relayed domain name"
+msgstr "中继域域名"
+
+#: mailu/ui/forms.py:73 mailu/ui/templates/relay/list.html:19
+msgid "Remote host"
+msgstr "远程主机"
+
+#: mailu/ui/forms.py:82 mailu/ui/templates/user/list.html:23
+#: mailu/ui/templates/user/signup_domain.html:16
+msgid "Quota"
+msgstr "配额"
+
+#: mailu/ui/forms.py:83
+msgid "Allow IMAP access"
+msgstr "允许IMAP访问"
+
+#: mailu/ui/forms.py:84
+msgid "Allow POP3 access"
+msgstr "允许POP3访问"
+
+#: mailu/ui/forms.py:85 mailu/ui/forms.py:101
+#: mailu/ui/templates/user/settings.html:15
msgid "Displayed name"
msgstr "显示名称"
-#: mailu/ui/forms.py:98
+#: mailu/ui/forms.py:87
+msgid "Enabled"
+msgstr "启用"
+
+#: mailu/ui/forms.py:92
+msgid "Email address"
+msgstr "邮件地址"
+
+#: mailu/ui/forms.py:102
msgid "Enable spam filter"
msgstr "启用垃圾邮件过滤"
-#: mailu/ui/forms.py:99
+#: mailu/ui/forms.py:103
+msgid "Enable marking spam mails as read"
+msgstr ""
+
+#: mailu/ui/forms.py:104
msgid "Spam filter tolerance"
msgstr "垃圾邮件过滤器阈值"
-#: mailu/ui/forms.py:100
+#: mailu/ui/forms.py:105
msgid "Enable forwarding"
msgstr "启用转发"
-#: mailu/ui/forms.py:101
+#: mailu/ui/forms.py:106
msgid "Keep a copy of the emails"
msgstr "保留电子邮件副本"
-#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
-#: mailu/ui/templates/alias/list.html:20
+#: mailu/ui/forms.py:107 mailu/ui/forms.py:143
+#: mailu/ui/templates/alias/list.html:21
msgid "Destination"
msgstr "目的地址"
-#: mailu/ui/forms.py:105
+#: mailu/ui/forms.py:108
msgid "Save settings"
msgstr "保存设置"
-#: mailu/ui/forms.py:110
+#: mailu/ui/forms.py:113
msgid "Password check"
msgstr "检查密码"
-#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+#: mailu/ui/forms.py:114 mailu/ui/templates/sidebar.html:25
msgid "Update password"
msgstr "更新密码"
-#: mailu/ui/forms.py:115
+#: mailu/ui/forms.py:118
msgid "Enable automatic reply"
msgstr "启用自动回复"
-#: mailu/ui/forms.py:116
+#: mailu/ui/forms.py:119
msgid "Reply subject"
msgstr "回复主题"
-#: mailu/ui/forms.py:117
+#: mailu/ui/forms.py:120
msgid "Reply body"
msgstr "回复正文"
-#: mailu/ui/forms.py:119
+#: mailu/ui/forms.py:122
+msgid "Start of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:123
msgid "End of vacation"
msgstr "假期结束"
-#: mailu/ui/forms.py:120
+#: mailu/ui/forms.py:124
msgid "Update"
msgstr "更新"
-#: mailu/ui/forms.py:125
+#: mailu/ui/forms.py:129
msgid "Your token (write it down, as it will never be displayed again)"
msgstr "您的令牌(请记录,它只显示这一次)"
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
+#: mailu/ui/forms.py:134 mailu/ui/templates/token/list.html:21
msgid "Authorized IP"
msgstr "授权IP"
-#: mailu/ui/forms.py:136
+#: mailu/ui/forms.py:140
msgid "Alias"
msgstr "别名"
-#: mailu/ui/forms.py:138
+#: mailu/ui/forms.py:142
msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
msgstr "使用SQL LIKE语法(例如,用于全部别名)"
-#: mailu/ui/forms.py:145
+#: mailu/ui/forms.py:149
msgid "Admin email"
msgstr "管理员邮箱"
-#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+#: mailu/ui/forms.py:150 mailu/ui/forms.py:155 mailu/ui/forms.py:168
msgid "Submit"
msgstr "提交"
-#: mailu/ui/forms.py:150
+#: mailu/ui/forms.py:154
msgid "Manager email"
msgstr "管理员邮箱"
-#: mailu/ui/forms.py:155
+#: mailu/ui/forms.py:159
msgid "Protocol"
msgstr "协议"
-#: mailu/ui/forms.py:158
+#: mailu/ui/forms.py:162
msgid "Hostname or IP"
msgstr "主机名或IP"
-#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
-#: mailu/ui/templates/client.html:47
+#: mailu/ui/forms.py:163 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:45
msgid "TCP port"
msgstr "TCP端口"
-#: mailu/ui/forms.py:160
+#: mailu/ui/forms.py:164
msgid "Enable TLS"
msgstr "启用TLS"
-#: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
-#: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
+#: mailu/ui/forms.py:165 mailu/ui/templates/client.html:28
+#: mailu/ui/templates/client.html:53 mailu/ui/templates/fetch/list.html:21
msgid "Username"
msgstr "用户名"
-#: mailu/ui/forms.py:163
+#: mailu/ui/forms.py:167
msgid "Keep emails on the server"
msgstr "在服务器上保留电子邮件"
-#: mailu/ui/forms.py:168
+#: mailu/ui/forms.py:172
msgid "Announcement subject"
msgstr "公告主题"
-#: mailu/ui/forms.py:170
+#: mailu/ui/forms.py:174
msgid "Announcement body"
msgstr "公告正文"
-#: mailu/ui/forms.py:172
+#: mailu/ui/forms.py:176
msgid "Send"
msgstr "发送"
@@ -249,18 +297,35 @@ msgstr "发送"
msgid "Public announcement"
msgstr "公开公告"
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
-msgstr "客户端设置"
+#: mailu/ui/templates/antispam.html:4 mailu/ui/templates/sidebar.html:80
+#: mailu/ui/templates/user/settings.html:19
+msgid "Antispam"
+msgstr "反垃圾邮件"
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+#: mailu/ui/templates/antispam.html:8
+msgid "RSPAMD status page"
+msgstr ""
+
+#: mailu/ui/templates/client.html:8
+msgid "configure your email client"
+msgstr ""
+
+#: mailu/ui/templates/client.html:13
+msgid "Incoming mail"
+msgstr ""
+
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:41
msgid "Mail protocol"
msgstr "邮件协议"
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:49
msgid "Server name"
msgstr "服务器名称"
+#: mailu/ui/templates/client.html:38
+msgid "Outgoing mail"
+msgstr ""
+
#: mailu/ui/templates/confirm.html:4
msgid "Confirm action"
msgstr "确认操作"
@@ -278,76 +343,56 @@ msgstr "Docker错误"
msgid "An error occurred while talking to the Docker server."
msgstr "Docker服务器通信出错"
-#: mailu/ui/templates/login.html:8
-msgid "to access the administration tools"
-msgstr "访问管理工具"
+#: mailu/ui/templates/macros.html:129
+msgid "copy to clipboard"
+msgstr ""
-#: mailu/ui/templates/sidebar.html:8
+#: mailu/ui/templates/sidebar.html:15
msgid "My account"
msgstr "我的账户"
-#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+#: mailu/ui/templates/sidebar.html:19 mailu/ui/templates/user/list.html:37
msgid "Settings"
msgstr "设置"
-#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/user/list.html:38
msgid "Auto-reply"
msgstr "自动回复"
-#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
-#: mailu/ui/templates/user/list.html:36
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:37
+#: mailu/ui/templates/user/list.html:39
msgid "Fetched accounts"
msgstr "代收账户"
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+#: mailu/ui/templates/sidebar.html:43 mailu/ui/templates/token/list.html:4
msgid "Authentication tokens"
msgstr "认证令牌"
-#: mailu/ui/templates/sidebar.html:35
+#: mailu/ui/templates/sidebar.html:56
msgid "Administration"
msgstr "管理"
-#: mailu/ui/templates/sidebar.html:44
+#: mailu/ui/templates/sidebar.html:62
msgid "Announcement"
msgstr "公告"
-#: mailu/ui/templates/sidebar.html:49
+#: mailu/ui/templates/sidebar.html:68
msgid "Administrators"
msgstr "管理员"
-#: mailu/ui/templates/sidebar.html:54
+#: mailu/ui/templates/sidebar.html:74
msgid "Relayed domains"
msgstr "中继域"
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr "反垃圾邮件"
-
-#: mailu/ui/templates/sidebar.html:66
+#: mailu/ui/templates/sidebar.html:88
msgid "Mail domains"
msgstr "邮件域"
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr "转到"
-
-#: mailu/ui/templates/sidebar.html:76
+#: mailu/ui/templates/sidebar.html:99
msgid "Webmail"
msgstr "网页邮箱"
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr "网站"
-
-#: mailu/ui/templates/sidebar.html:92
-msgid "Help"
-msgstr "帮助"
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr "注册域名"
-
-#: mailu/ui/templates/sidebar.html:105
+#: mailu/ui/templates/sidebar.html:135
msgid "Sign out"
msgstr "登出"
@@ -367,26 +412,26 @@ msgstr "全局管理员"
msgid "Add administrator"
msgstr "添加管理员"
-#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
-#: mailu/ui/templates/alternative/list.html:18
-#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
-#: mailu/ui/templates/manager/list.html:18
-#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
-#: mailu/ui/templates/user/list.html:18
+#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
+#: mailu/ui/templates/alternative/list.html:19
+#: mailu/ui/templates/domain/list.html:17 mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/manager/list.html:19
+#: mailu/ui/templates/relay/list.html:17 mailu/ui/templates/token/list.html:19
+#: mailu/ui/templates/user/list.html:19
msgid "Actions"
msgstr "操作"
-#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
-#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
+#: mailu/ui/templates/admin/list.html:18 mailu/ui/templates/alias/list.html:20
+#: mailu/ui/templates/manager/list.html:20 mailu/ui/templates/user/list.html:21
msgid "Email"
msgstr "电子邮件"
-#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
-#: mailu/ui/templates/alternative/list.html:25
-#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
-#: mailu/ui/templates/manager/list.html:24
-#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
-#: mailu/ui/templates/user/list.html:31
+#: mailu/ui/templates/admin/list.html:25 mailu/ui/templates/alias/list.html:32
+#: mailu/ui/templates/alternative/list.html:29
+#: mailu/ui/templates/domain/list.html:34 mailu/ui/templates/fetch/list.html:34
+#: mailu/ui/templates/manager/list.html:27
+#: mailu/ui/templates/relay/list.html:30 mailu/ui/templates/token/list.html:30
+#: mailu/ui/templates/user/list.html:34
msgid "Delete"
msgstr "删除"
@@ -406,23 +451,25 @@ msgstr "别名列表"
msgid "Add alias"
msgstr "添加别名"
-#: mailu/ui/templates/alias/list.html:22
-#: mailu/ui/templates/alternative/list.html:20
-#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
-#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
-#: mailu/ui/templates/user/list.html:24
+#: mailu/ui/templates/alias/list.html:23
+#: mailu/ui/templates/alternative/list.html:21
+#: mailu/ui/templates/domain/list.html:23 mailu/ui/templates/fetch/list.html:25
+#: mailu/ui/templates/relay/list.html:21 mailu/ui/templates/token/list.html:22
+#: mailu/ui/templates/user/list.html:25
msgid "Created"
msgstr "已创建"
-#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
-#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
-#: mailu/ui/templates/user/list.html:25
+#: mailu/ui/templates/alias/list.html:24
+#: mailu/ui/templates/alternative/list.html:22
+#: mailu/ui/templates/domain/list.html:24 mailu/ui/templates/fetch/list.html:26
+#: mailu/ui/templates/relay/list.html:22 mailu/ui/templates/token/list.html:23
+#: mailu/ui/templates/user/list.html:26
msgid "Last edit"
msgstr "上次编辑"
-#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
-#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
-#: mailu/ui/templates/user/list.html:30
+#: mailu/ui/templates/alias/list.html:31 mailu/ui/templates/domain/list.html:33
+#: mailu/ui/templates/fetch/list.html:33 mailu/ui/templates/relay/list.html:29
+#: mailu/ui/templates/user/list.html:33
msgid "Edit"
msgstr "编辑"
@@ -438,7 +485,7 @@ msgstr "替代域名列表"
msgid "Add alternative"
msgstr "添加替代"
-#: mailu/ui/templates/alternative/list.html:19
+#: mailu/ui/templates/alternative/list.html:20
msgid "Name"
msgstr "名称"
@@ -459,26 +506,34 @@ msgstr "重新生成秘钥"
msgid "Generate keys"
msgstr "生成秘钥"
-#: mailu/ui/templates/domain/details.html:31
+#: mailu/ui/templates/domain/details.html:30
msgid "DNS MX entry"
msgstr "DNS MX条目"
-#: mailu/ui/templates/domain/details.html:35
+#: mailu/ui/templates/domain/details.html:34
msgid "DNS SPF entries"
msgstr "DNS SPF条目"
-#: mailu/ui/templates/domain/details.html:42
+#: mailu/ui/templates/domain/details.html:40
msgid "DKIM public key"
msgstr "DKIM公钥"
-#: mailu/ui/templates/domain/details.html:46
+#: mailu/ui/templates/domain/details.html:44
msgid "DNS DKIM entry"
msgstr "DNS DKIM条目"
-#: mailu/ui/templates/domain/details.html:50
+#: mailu/ui/templates/domain/details.html:48
msgid "DNS DMARC entry"
msgstr "DNS DMARC条目"
+#: mailu/ui/templates/domain/details.html:58
+msgid "DNS TLSA entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:63
+msgid "DNS client auto-configuration entries"
+msgstr ""
+
#: mailu/ui/templates/domain/edit.html:4
msgid "Edit domain"
msgstr "编辑域"
@@ -487,35 +542,35 @@ msgstr "编辑域"
msgid "Domain list"
msgstr "域列表"
-#: mailu/ui/templates/domain/list.html:17
+#: mailu/ui/templates/domain/list.html:18
msgid "Manage"
msgstr "管理"
-#: mailu/ui/templates/domain/list.html:19
+#: mailu/ui/templates/domain/list.html:20
msgid "Mailbox count"
msgstr "邮箱数量"
-#: mailu/ui/templates/domain/list.html:20
+#: mailu/ui/templates/domain/list.html:21
msgid "Alias count"
msgstr "别名数量"
-#: mailu/ui/templates/domain/list.html:28
+#: mailu/ui/templates/domain/list.html:31
msgid "Details"
msgstr "详细信息"
-#: mailu/ui/templates/domain/list.html:35
+#: mailu/ui/templates/domain/list.html:38
msgid "Users"
msgstr "用户"
-#: mailu/ui/templates/domain/list.html:36
+#: mailu/ui/templates/domain/list.html:39
msgid "Aliases"
msgstr "别名"
-#: mailu/ui/templates/domain/list.html:37
+#: mailu/ui/templates/domain/list.html:40
msgid "Managers"
msgstr "管理员"
-#: mailu/ui/templates/domain/list.html:39
+#: mailu/ui/templates/domain/list.html:42
msgid "Alternatives"
msgstr "备选方案"
@@ -534,8 +589,9 @@ msgid ""
" couple minutes after the MX
is set so the local server "
"cache\n"
" expires."
-msgstr "如果您不知道如何为域名设置 MX
记录,请联系你的DNS提供商或者系统管理员。在设置完成 MX
记录后,请等待本地域名服务器的缓存过期。"
-
+msgstr ""
+"如果您不知道如何为域名设置 MX
记录,请联系你的DNS提供商或者系统管理员。在设置完成 MX
"
+" 记录后,请等待本地域名服务器的缓存过期。"
#: mailu/ui/templates/fetch/create.html:4
msgid "Add a fetched account"
@@ -549,23 +605,27 @@ msgstr "更新代收账户"
msgid "Add an account"
msgstr "添加一个账户"
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr "端点"
-#: mailu/ui/templates/fetch/list.html:21
+#: mailu/ui/templates/fetch/list.html:22
msgid "Keep emails"
msgstr "保留电子邮件"
-#: mailu/ui/templates/fetch/list.html:22
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr "上次检查"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
msgid "yes"
msgstr "是"
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:38
msgid "no"
msgstr "否"
@@ -613,7 +673,7 @@ msgstr "新用户"
msgid "General"
msgstr "通用"
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr "功能和配额"
@@ -621,10 +681,6 @@ msgstr "功能和配额"
msgid "Edit user"
msgstr "编辑用户"
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr "转发邮件"
-
#: mailu/ui/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
@@ -633,11 +689,11 @@ msgstr "用户列表"
msgid "Add user"
msgstr "添加用户"
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
msgid "User settings"
msgstr "用户设置"
-#: mailu/ui/templates/user/list.html:21
+#: mailu/ui/templates/user/list.html:22
msgid "Features"
msgstr "功能"
@@ -649,7 +705,7 @@ msgstr "更新密码"
msgid "Automatic reply"
msgstr "自动回复"
-#: mailu/ui/templates/user/settings.html:22
+#: mailu/ui/templates/user/settings.html:27
msgid "Auto-forward"
msgstr "自动转发"
@@ -676,3 +732,10 @@ msgstr "可用"
#~ msgid "General settings"
#~ msgstr ""
+
+#~ msgid "to access the administration tools"
+#~ msgstr "访问管理工具"
+
+#~ msgid "Forward emails"
+#~ msgstr "转发邮件"
+
diff --git a/core/admin/mailu/ui/forms.py b/core/admin/mailu/ui/forms.py
index 24d6f899..34436a29 100644
--- a/core/admin/mailu/ui/forms.py
+++ b/core/admin/mailu/ui/forms.py
@@ -100,6 +100,7 @@ class UserSignupFormCaptcha(UserSignupForm):
class UserSettingsForm(flask_wtf.FlaskForm):
displayed_name = fields.StringField(_('Displayed name'))
spam_enabled = fields.BooleanField(_('Enable spam filter'))
+ spam_mark_as_read = fields.BooleanField(_('Enable marking spam mails as read'))
spam_threshold = fields_.IntegerSliderField(_('Spam filter tolerance'))
forward_enabled = fields.BooleanField(_('Enable forwarding'))
forward_keep = fields.BooleanField(_('Keep a copy of the emails'))
diff --git a/core/admin/mailu/ui/templates/client.html b/core/admin/mailu/ui/templates/client.html
index cc4517ad..bf0ba64e 100644
--- a/core/admin/mailu/ui/templates/client.html
+++ b/core/admin/mailu/ui/templates/client.html
@@ -9,6 +9,7 @@
{%- endblock %}
{%- block content %}
+If you use an Apple device, click here to autoconfigure it.
{%- call macros.table(title=_("Incoming mail"), datatable=False) %}
@@ -17,7 +18,7 @@
{% trans %}TCP port{% endtrans %}
- {{ "143" if config["TLS_FLAVOR"] == "notls" else "993 (TLS) or 143 (STARTTLS)" }}
+ {{ "143" if config["TLS_FLAVOR"] == "notls" else "993 (TLS)" }}
{% trans %}Server name{% endtrans %}
@@ -42,7 +43,7 @@
{% trans %}TCP port{% endtrans %}
- {{ "25" if config["TLS_FLAVOR"] == "notls" else "465 (TLS) or 587 (STARTTLS)" }}
+ {{ "25" if config["TLS_FLAVOR"] == "notls" else "465 (TLS)" }}
{% trans %}Server name{% endtrans %}
diff --git a/core/admin/mailu/ui/templates/domain/details.html b/core/admin/mailu/ui/templates/domain/details.html
index a30b9357..28f3f570 100644
--- a/core/admin/mailu/ui/templates/domain/details.html
+++ b/core/admin/mailu/ui/templates/domain/details.html
@@ -60,7 +60,7 @@
{%- endif %}
- {% trans %}DNS client auto-configuration (RFC6186) entries{% endtrans %}
+ {% trans %}DNS client auto-configuration entries{% endtrans %}
{{ macros.clip("dns_autoconfig") }}
{%- for line in domain.dns_autoconfig %}
{{ line }}
diff --git a/core/admin/mailu/ui/templates/user/settings.html b/core/admin/mailu/ui/templates/user/settings.html
index c1eb47f3..438f3b88 100644
--- a/core/admin/mailu/ui/templates/user/settings.html
+++ b/core/admin/mailu/ui/templates/user/settings.html
@@ -18,6 +18,7 @@
{%- call macros.card(title=_("Antispam")) %}
{%- call macros.fieldset(field=form.spam_enabled, enabled=user.spam_enabled) %}
+ {{ macros.form_field(form.spam_mark_as_read) }}
{{ macros.form_field(form.spam_threshold, step=1, max=100,
prepend=' / 100') }}
{%- endcall %}
diff --git a/core/admin/messages.pot b/core/admin/messages.pot
index 12687e5d..0eec2f6a 100644
--- a/core/admin/messages.pot
+++ b/core/admin/messages.pot
@@ -1,255 +1,298 @@
# Translations template for PROJECT.
-# Copyright (C) 2018 ORGANIZATION
+# Copyright (C) 2022 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2018.
+# FIRST AUTHOR , 2022.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-22 12:10+0200\n"
+"POT-Creation-Date: 2022-05-22 18:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.3\n"
+"Generated-By: Babel 2.3.4\n"
-#: mailu/ui/forms.py:32
-msgid "Invalid email address."
-msgstr ""
-
-#: mailu/ui/forms.py:36
-msgid "Confirm"
-msgstr ""
-
-#: mailu/ui/forms.py:40 mailu/ui/forms.py:77
+#: mailu/sso/forms.py:8 mailu/ui/forms.py:79
msgid "E-mail"
msgstr ""
-#: mailu/ui/forms.py:41 mailu/ui/forms.py:78 mailu/ui/forms.py:90
-#: mailu/ui/forms.py:109 mailu/ui/forms.py:162
-#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:59
+#: mailu/sso/forms.py:9 mailu/ui/forms.py:80 mailu/ui/forms.py:93
+#: mailu/ui/forms.py:112 mailu/ui/forms.py:166
+#: mailu/ui/templates/client.html:32 mailu/ui/templates/client.html:57
msgid "Password"
msgstr ""
-#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
-#: mailu/ui/templates/sidebar.html:111
+#: mailu/sso/forms.py:10 mailu/sso/forms.py:11 mailu/sso/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:142
msgid "Sign in"
msgstr ""
-#: mailu/ui/forms.py:46 mailu/ui/forms.py:56
-#: mailu/ui/templates/domain/details.html:27
-#: mailu/ui/templates/domain/list.html:18 mailu/ui/templates/relay/list.html:17
-msgid "Domain name"
+#: mailu/sso/templates/base_sso.html:8 mailu/ui/templates/base.html:8
+msgid "Admin page for"
msgstr ""
-#: mailu/ui/forms.py:47
-msgid "Maximum user count"
+#: mailu/sso/templates/base_sso.html:19 mailu/ui/templates/base.html:19
+msgid "toggle sidebar"
msgstr ""
-#: mailu/ui/forms.py:48
-msgid "Maximum alias count"
+#: mailu/sso/templates/base_sso.html:37 mailu/ui/templates/base.html:37
+msgid "change language"
msgstr ""
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
+#: mailu/sso/templates/sidebar_sso.html:4 mailu/ui/templates/sidebar.html:94
+msgid "Go to"
msgstr ""
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
+#: mailu/sso/templates/sidebar_sso.html:9 mailu/ui/templates/client.html:4
+#: mailu/ui/templates/sidebar.html:50 mailu/ui/templates/sidebar.html:107
+msgid "Client setup"
msgstr ""
-#: mailu/ui/forms.py:51 mailu/ui/forms.py:72 mailu/ui/forms.py:83
-#: mailu/ui/forms.py:128 mailu/ui/forms.py:140
-#: mailu/ui/templates/alias/list.html:21 mailu/ui/templates/domain/list.html:21
-#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
-#: mailu/ui/templates/user/list.html:23
-msgid "Comment"
+#: mailu/sso/templates/sidebar_sso.html:16 mailu/ui/templates/sidebar.html:114
+msgid "Website"
msgstr ""
-#: mailu/ui/forms.py:52 mailu/ui/forms.py:61 mailu/ui/forms.py:66
-#: mailu/ui/forms.py:73 mailu/ui/forms.py:132 mailu/ui/forms.py:141
-msgid "Create"
+#: mailu/sso/templates/sidebar_sso.html:22 mailu/ui/templates/sidebar.html:120
+msgid "Help"
msgstr ""
-#: mailu/ui/forms.py:57
-msgid "Initial admin"
+#: mailu/sso/templates/sidebar_sso.html:35
+#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:127
+msgid "Register a domain"
msgstr ""
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
-
-#: mailu/ui/forms.py:59 mailu/ui/forms.py:79 mailu/ui/forms.py:91
-msgid "Confirm password"
-msgstr ""
-
-#: mailu/ui/forms.py:65
-msgid "Alternative name"
-msgstr ""
-
-#: mailu/ui/forms.py:70
-msgid "Relayed domain name"
-msgstr ""
-
-#: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
-msgid "Remote host"
-msgstr ""
-
-#: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
-#: mailu/ui/templates/user/signup_domain.html:16
-msgid "Quota"
-msgstr ""
-
-#: mailu/ui/forms.py:81
-msgid "Allow IMAP access"
-msgstr ""
-
-#: mailu/ui/forms.py:82
-msgid "Allow POP3 access"
-msgstr ""
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
-
-#: mailu/ui/forms.py:85
-msgid "Save"
-msgstr ""
-
-#: mailu/ui/forms.py:89
-msgid "Email address"
-msgstr ""
-
-#: mailu/ui/forms.py:93 mailu/ui/templates/sidebar.html:117
-#: mailu/ui/templates/user/signup.html:4
+#: mailu/sso/templates/sidebar_sso.html:49 mailu/ui/forms.py:95
+#: mailu/ui/templates/sidebar.html:149 mailu/ui/templates/user/signup.html:4
#: mailu/ui/templates/user/signup_domain.html:4
msgid "Sign up"
msgstr ""
-#: mailu/ui/forms.py:97
+#: mailu/ui/forms.py:33 mailu/ui/forms.py:36
+msgid "Invalid email address."
+msgstr ""
+
+#: mailu/ui/forms.py:45
+msgid "Confirm"
+msgstr ""
+
+#: mailu/ui/forms.py:48 mailu/ui/forms.py:58
+#: mailu/ui/templates/domain/details.html:26
+#: mailu/ui/templates/domain/list.html:19 mailu/ui/templates/relay/list.html:18
+msgid "Domain name"
+msgstr ""
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user count"
+msgstr ""
+
+#: mailu/ui/forms.py:50
+msgid "Maximum alias count"
+msgstr ""
+
+#: mailu/ui/forms.py:51
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/ui/forms.py:52
+msgid "Enable sign-up"
+msgstr ""
+
+#: mailu/ui/forms.py:53 mailu/ui/forms.py:74 mailu/ui/forms.py:86
+#: mailu/ui/forms.py:132 mailu/ui/forms.py:144
+#: mailu/ui/templates/alias/list.html:22 mailu/ui/templates/domain/list.html:22
+#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:20
+#: mailu/ui/templates/user/list.html:24
+msgid "Comment"
+msgstr ""
+
+#: mailu/ui/forms.py:54 mailu/ui/forms.py:68 mailu/ui/forms.py:75
+#: mailu/ui/forms.py:88 mailu/ui/forms.py:136 mailu/ui/forms.py:145
+msgid "Save"
+msgstr ""
+
+#: mailu/ui/forms.py:59
+msgid "Initial admin"
+msgstr ""
+
+#: mailu/ui/forms.py:60
+msgid "Admin password"
+msgstr ""
+
+#: mailu/ui/forms.py:61 mailu/ui/forms.py:81 mailu/ui/forms.py:94
+msgid "Confirm password"
+msgstr ""
+
+#: mailu/ui/forms.py:63
+msgid "Create"
+msgstr ""
+
+#: mailu/ui/forms.py:67
+msgid "Alternative name"
+msgstr ""
+
+#: mailu/ui/forms.py:72
+msgid "Relayed domain name"
+msgstr ""
+
+#: mailu/ui/forms.py:73 mailu/ui/templates/relay/list.html:19
+msgid "Remote host"
+msgstr ""
+
+#: mailu/ui/forms.py:82 mailu/ui/templates/user/list.html:23
+#: mailu/ui/templates/user/signup_domain.html:16
+msgid "Quota"
+msgstr ""
+
+#: mailu/ui/forms.py:83
+msgid "Allow IMAP access"
+msgstr ""
+
+#: mailu/ui/forms.py:84
+msgid "Allow POP3 access"
+msgstr ""
+
+#: mailu/ui/forms.py:85 mailu/ui/forms.py:101
+#: mailu/ui/templates/user/settings.html:15
msgid "Displayed name"
msgstr ""
-#: mailu/ui/forms.py:98
+#: mailu/ui/forms.py:87
+msgid "Enabled"
+msgstr ""
+
+#: mailu/ui/forms.py:92
+msgid "Email address"
+msgstr ""
+
+#: mailu/ui/forms.py:102
msgid "Enable spam filter"
msgstr ""
-#: mailu/ui/forms.py:99
+#: mailu/ui/forms.py:103
+msgid "Enable marking spam mails as read"
+msgstr ""
+
+#: mailu/ui/forms.py:104
msgid "Spam filter tolerance"
msgstr ""
-#: mailu/ui/forms.py:100
+#: mailu/ui/forms.py:105
msgid "Enable forwarding"
msgstr ""
-#: mailu/ui/forms.py:101
+#: mailu/ui/forms.py:106
msgid "Keep a copy of the emails"
msgstr ""
-#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
-#: mailu/ui/templates/alias/list.html:20
+#: mailu/ui/forms.py:107 mailu/ui/forms.py:143
+#: mailu/ui/templates/alias/list.html:21
msgid "Destination"
msgstr ""
-#: mailu/ui/forms.py:105
+#: mailu/ui/forms.py:108
msgid "Save settings"
msgstr ""
-#: mailu/ui/forms.py:110
+#: mailu/ui/forms.py:113
msgid "Password check"
msgstr ""
-#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+#: mailu/ui/forms.py:114 mailu/ui/templates/sidebar.html:25
msgid "Update password"
msgstr ""
-#: mailu/ui/forms.py:115
+#: mailu/ui/forms.py:118
msgid "Enable automatic reply"
msgstr ""
-#: mailu/ui/forms.py:116
+#: mailu/ui/forms.py:119
msgid "Reply subject"
msgstr ""
-#: mailu/ui/forms.py:117
+#: mailu/ui/forms.py:120
msgid "Reply body"
msgstr ""
-#: mailu/ui/forms.py:119
+#: mailu/ui/forms.py:122
+msgid "Start of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:123
msgid "End of vacation"
msgstr ""
-#: mailu/ui/forms.py:120
+#: mailu/ui/forms.py:124
msgid "Update"
msgstr ""
-#: mailu/ui/forms.py:125
+#: mailu/ui/forms.py:129
msgid "Your token (write it down, as it will never be displayed again)"
msgstr ""
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
+#: mailu/ui/forms.py:134 mailu/ui/templates/token/list.html:21
msgid "Authorized IP"
msgstr ""
-#: mailu/ui/forms.py:136
+#: mailu/ui/forms.py:140
msgid "Alias"
msgstr ""
-#: mailu/ui/forms.py:138
+#: mailu/ui/forms.py:142
msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
msgstr ""
-#: mailu/ui/forms.py:145
+#: mailu/ui/forms.py:149
msgid "Admin email"
msgstr ""
-#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+#: mailu/ui/forms.py:150 mailu/ui/forms.py:155 mailu/ui/forms.py:168
msgid "Submit"
msgstr ""
-#: mailu/ui/forms.py:150
+#: mailu/ui/forms.py:154
msgid "Manager email"
msgstr ""
-#: mailu/ui/forms.py:155
+#: mailu/ui/forms.py:159
msgid "Protocol"
msgstr ""
-#: mailu/ui/forms.py:158
+#: mailu/ui/forms.py:162
msgid "Hostname or IP"
msgstr ""
-#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
-#: mailu/ui/templates/client.html:47
+#: mailu/ui/forms.py:163 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:45
msgid "TCP port"
msgstr ""
-#: mailu/ui/forms.py:160
+#: mailu/ui/forms.py:164
msgid "Enable TLS"
msgstr ""
-#: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
-#: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
+#: mailu/ui/forms.py:165 mailu/ui/templates/client.html:28
+#: mailu/ui/templates/client.html:53 mailu/ui/templates/fetch/list.html:21
msgid "Username"
msgstr ""
-#: mailu/ui/forms.py:163
+#: mailu/ui/forms.py:167
msgid "Keep emails on the server"
msgstr ""
-#: mailu/ui/forms.py:168
+#: mailu/ui/forms.py:172
msgid "Announcement subject"
msgstr ""
-#: mailu/ui/forms.py:170
+#: mailu/ui/forms.py:174
msgid "Announcement body"
msgstr ""
-#: mailu/ui/forms.py:172
+#: mailu/ui/forms.py:176
msgid "Send"
msgstr ""
@@ -257,18 +300,35 @@ msgstr ""
msgid "Public announcement"
msgstr ""
-#: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
-msgid "Client setup"
+#: mailu/ui/templates/antispam.html:4 mailu/ui/templates/sidebar.html:80
+#: mailu/ui/templates/user/settings.html:19
+msgid "Antispam"
msgstr ""
-#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+#: mailu/ui/templates/antispam.html:8
+msgid "RSPAMD status page"
+msgstr ""
+
+#: mailu/ui/templates/client.html:8
+msgid "configure your email client"
+msgstr ""
+
+#: mailu/ui/templates/client.html:13
+msgid "Incoming mail"
+msgstr ""
+
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:41
msgid "Mail protocol"
msgstr ""
-#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
+#: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:49
msgid "Server name"
msgstr ""
+#: mailu/ui/templates/client.html:38
+msgid "Outgoing mail"
+msgstr ""
+
#: mailu/ui/templates/confirm.html:4
msgid "Confirm action"
msgstr ""
@@ -286,72 +346,56 @@ msgstr ""
msgid "An error occurred while talking to the Docker server."
msgstr ""
-#: mailu/ui/templates/login.html:8
-msgid "to access the administration tools"
+#: mailu/ui/templates/macros.html:129
+msgid "copy to clipboard"
msgstr ""
-#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+#: mailu/ui/templates/sidebar.html:15
+msgid "My account"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:19 mailu/ui/templates/user/list.html:37
msgid "Settings"
msgstr ""
-#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/user/list.html:38
msgid "Auto-reply"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
-#: mailu/ui/templates/user/list.html:36
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:37
+#: mailu/ui/templates/user/list.html:39
msgid "Fetched accounts"
msgstr ""
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+#: mailu/ui/templates/sidebar.html:43 mailu/ui/templates/token/list.html:4
msgid "Authentication tokens"
msgstr ""
-#: mailu/ui/templates/sidebar.html:35
+#: mailu/ui/templates/sidebar.html:56
msgid "Administration"
msgstr ""
-#: mailu/ui/templates/sidebar.html:44
+#: mailu/ui/templates/sidebar.html:62
msgid "Announcement"
msgstr ""
-#: mailu/ui/templates/sidebar.html:49
+#: mailu/ui/templates/sidebar.html:68
msgid "Administrators"
msgstr ""
-#: mailu/ui/templates/sidebar.html:54
+#: mailu/ui/templates/sidebar.html:74
msgid "Relayed domains"
msgstr ""
-#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:66
+#: mailu/ui/templates/sidebar.html:88
msgid "Mail domains"
msgstr ""
-#: mailu/ui/templates/sidebar.html:72
-msgid "Go to"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:76
+#: mailu/ui/templates/sidebar.html:99
msgid "Webmail"
msgstr ""
-#: mailu/ui/templates/sidebar.html:87
-msgid "Website"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:92
-msgid "Help"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:105
+#: mailu/ui/templates/sidebar.html:135
msgid "Sign out"
msgstr ""
@@ -371,26 +415,26 @@ msgstr ""
msgid "Add administrator"
msgstr ""
-#: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
-#: mailu/ui/templates/alternative/list.html:18
-#: mailu/ui/templates/domain/list.html:16 mailu/ui/templates/fetch/list.html:18
-#: mailu/ui/templates/manager/list.html:18
-#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
-#: mailu/ui/templates/user/list.html:18
+#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
+#: mailu/ui/templates/alternative/list.html:19
+#: mailu/ui/templates/domain/list.html:17 mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/manager/list.html:19
+#: mailu/ui/templates/relay/list.html:17 mailu/ui/templates/token/list.html:19
+#: mailu/ui/templates/user/list.html:19
msgid "Actions"
msgstr ""
-#: mailu/ui/templates/admin/list.html:17 mailu/ui/templates/alias/list.html:19
-#: mailu/ui/templates/manager/list.html:19 mailu/ui/templates/user/list.html:20
+#: mailu/ui/templates/admin/list.html:18 mailu/ui/templates/alias/list.html:20
+#: mailu/ui/templates/manager/list.html:20 mailu/ui/templates/user/list.html:21
msgid "Email"
msgstr ""
-#: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
-#: mailu/ui/templates/alternative/list.html:25
-#: mailu/ui/templates/domain/list.html:31 mailu/ui/templates/fetch/list.html:31
-#: mailu/ui/templates/manager/list.html:24
-#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
-#: mailu/ui/templates/user/list.html:31
+#: mailu/ui/templates/admin/list.html:25 mailu/ui/templates/alias/list.html:32
+#: mailu/ui/templates/alternative/list.html:29
+#: mailu/ui/templates/domain/list.html:34 mailu/ui/templates/fetch/list.html:34
+#: mailu/ui/templates/manager/list.html:27
+#: mailu/ui/templates/relay/list.html:30 mailu/ui/templates/token/list.html:30
+#: mailu/ui/templates/user/list.html:34
msgid "Delete"
msgstr ""
@@ -410,23 +454,25 @@ msgstr ""
msgid "Add alias"
msgstr ""
-#: mailu/ui/templates/alias/list.html:22
-#: mailu/ui/templates/alternative/list.html:20
-#: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24
-#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
-#: mailu/ui/templates/user/list.html:24
+#: mailu/ui/templates/alias/list.html:23
+#: mailu/ui/templates/alternative/list.html:21
+#: mailu/ui/templates/domain/list.html:23 mailu/ui/templates/fetch/list.html:25
+#: mailu/ui/templates/relay/list.html:21 mailu/ui/templates/token/list.html:22
+#: mailu/ui/templates/user/list.html:25
msgid "Created"
msgstr ""
-#: mailu/ui/templates/alias/list.html:23 mailu/ui/templates/domain/list.html:23
-#: mailu/ui/templates/fetch/list.html:25 mailu/ui/templates/relay/list.html:21
-#: mailu/ui/templates/user/list.html:25
+#: mailu/ui/templates/alias/list.html:24
+#: mailu/ui/templates/alternative/list.html:22
+#: mailu/ui/templates/domain/list.html:24 mailu/ui/templates/fetch/list.html:26
+#: mailu/ui/templates/relay/list.html:22 mailu/ui/templates/token/list.html:23
+#: mailu/ui/templates/user/list.html:26
msgid "Last edit"
msgstr ""
-#: mailu/ui/templates/alias/list.html:28 mailu/ui/templates/domain/list.html:30
-#: mailu/ui/templates/fetch/list.html:30 mailu/ui/templates/relay/list.html:26
-#: mailu/ui/templates/user/list.html:30
+#: mailu/ui/templates/alias/list.html:31 mailu/ui/templates/domain/list.html:33
+#: mailu/ui/templates/fetch/list.html:33 mailu/ui/templates/relay/list.html:29
+#: mailu/ui/templates/user/list.html:33
msgid "Edit"
msgstr ""
@@ -442,7 +488,7 @@ msgstr ""
msgid "Add alternative"
msgstr ""
-#: mailu/ui/templates/alternative/list.html:19
+#: mailu/ui/templates/alternative/list.html:20
msgid "Name"
msgstr ""
@@ -463,26 +509,34 @@ msgstr ""
msgid "Generate keys"
msgstr ""
-#: mailu/ui/templates/domain/details.html:31
+#: mailu/ui/templates/domain/details.html:30
msgid "DNS MX entry"
msgstr ""
-#: mailu/ui/templates/domain/details.html:35
+#: mailu/ui/templates/domain/details.html:34
msgid "DNS SPF entries"
msgstr ""
-#: mailu/ui/templates/domain/details.html:42
+#: mailu/ui/templates/domain/details.html:40
msgid "DKIM public key"
msgstr ""
-#: mailu/ui/templates/domain/details.html:46
+#: mailu/ui/templates/domain/details.html:44
msgid "DNS DKIM entry"
msgstr ""
-#: mailu/ui/templates/domain/details.html:50
+#: mailu/ui/templates/domain/details.html:48
msgid "DNS DMARC entry"
msgstr ""
+#: mailu/ui/templates/domain/details.html:58
+msgid "DNS TLSA entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:63
+msgid "DNS client auto-configuration entries"
+msgstr ""
+
#: mailu/ui/templates/domain/edit.html:4
msgid "Edit domain"
msgstr ""
@@ -491,35 +545,35 @@ msgstr ""
msgid "Domain list"
msgstr ""
-#: mailu/ui/templates/domain/list.html:17
+#: mailu/ui/templates/domain/list.html:18
msgid "Manage"
msgstr ""
-#: mailu/ui/templates/domain/list.html:19
+#: mailu/ui/templates/domain/list.html:20
msgid "Mailbox count"
msgstr ""
-#: mailu/ui/templates/domain/list.html:20
+#: mailu/ui/templates/domain/list.html:21
msgid "Alias count"
msgstr ""
-#: mailu/ui/templates/domain/list.html:28
+#: mailu/ui/templates/domain/list.html:31
msgid "Details"
msgstr ""
-#: mailu/ui/templates/domain/list.html:35
+#: mailu/ui/templates/domain/list.html:38
msgid "Users"
msgstr ""
-#: mailu/ui/templates/domain/list.html:36
+#: mailu/ui/templates/domain/list.html:39
msgid "Aliases"
msgstr ""
-#: mailu/ui/templates/domain/list.html:37
+#: mailu/ui/templates/domain/list.html:40
msgid "Managers"
msgstr ""
-#: mailu/ui/templates/domain/list.html:39
+#: mailu/ui/templates/domain/list.html:42
msgid "Alternatives"
msgstr ""
@@ -552,23 +606,27 @@ msgstr ""
msgid "Add an account"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:19
+#: mailu/ui/templates/fetch/list.html:20
msgid "Endpoint"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:21
+#: mailu/ui/templates/fetch/list.html:22
msgid "Keep emails"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:22
+#: mailu/ui/templates/fetch/list.html:23
msgid "Last check"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:24
+msgid "Status"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:38
msgid "yes"
msgstr ""
-#: mailu/ui/templates/fetch/list.html:35
+#: mailu/ui/templates/fetch/list.html:38
msgid "no"
msgstr ""
@@ -616,7 +674,7 @@ msgstr ""
msgid "General"
msgstr ""
-#: mailu/ui/templates/user/create.html:22
+#: mailu/ui/templates/user/create.html:23
msgid "Features and quotas"
msgstr ""
@@ -624,10 +682,6 @@ msgstr ""
msgid "Edit user"
msgstr ""
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
-msgstr ""
-
#: mailu/ui/templates/user/list.html:4
msgid "User list"
msgstr ""
@@ -636,11 +690,11 @@ msgstr ""
msgid "Add user"
msgstr ""
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
+#: mailu/ui/templates/user/list.html:20 mailu/ui/templates/user/settings.html:4
msgid "User settings"
msgstr ""
-#: mailu/ui/templates/user/list.html:21
+#: mailu/ui/templates/user/list.html:22
msgid "Features"
msgstr ""
@@ -652,7 +706,7 @@ msgstr ""
msgid "Automatic reply"
msgstr ""
-#: mailu/ui/templates/user/settings.html:22
+#: mailu/ui/templates/user/settings.html:27
msgid "Auto-forward"
msgstr ""
diff --git a/core/admin/migrations/versions/8f9ea78776f4_.py b/core/admin/migrations/versions/8f9ea78776f4_.py
new file mode 100644
index 00000000..7af65b9b
--- /dev/null
+++ b/core/admin/migrations/versions/8f9ea78776f4_.py
@@ -0,0 +1,21 @@
+"""empty message
+
+Revision ID: 8f9ea78776f4
+Revises: 3b7eee912b41
+Create Date: 2022-03-11 13:53:08.996055
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '8f9ea78776f4'
+down_revision = '3b7eee912b41'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ op.add_column('user', sa.Column('spam_mark_as_read', sa.Boolean(), nullable=False, server_default=sa.sql.expression.false()))
+
+def downgrade():
+ op.drop_column('user', 'spam_mark_as_read')
diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt
index d6c7aca3..f14e484c 100644
--- a/core/admin/requirements-prod.txt
+++ b/core/admin/requirements-prod.txt
@@ -73,3 +73,4 @@ webencodings==0.5.1
Werkzeug==2.0.2
WTForms==2.3.3
WTForms-Components==0.10.5
+xmltodict==0.12.0
diff --git a/core/admin/requirements.txt b/core/admin/requirements.txt
index 65130a8c..61fbd92c 100644
--- a/core/admin/requirements.txt
+++ b/core/admin/requirements.txt
@@ -25,3 +25,4 @@ srslib
marshmallow
flask-marshmallow
marshmallow-sqlalchemy
+xmltodict
diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index ea25ecf0..d424f29c 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 83bb45dd..07021429 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 9bab7698..cc8125bf 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -117,9 +117,32 @@ http {
add_header X-Frame-Options 'SAMEORIGIN';
add_header X-Content-Type-Options 'nosniff';
add_header X-Permitted-Cross-Domain-Policies 'none';
- add_header X-XSS-Protection '1; mode=block';
add_header Referrer-Policy 'same-origin';
+ # mozilla autoconfiguration
+ location ~ ^/(\.well\-known/autoconfig/)?mail/config\-v1\.1\.xml {
+ rewrite ^ /internal/autoconfig/mozilla break;
+ include /etc/nginx/proxy.conf;
+ proxy_pass http://$admin;
+ }
+ # microsoft autoconfiguration
+ location ~* ^/Autodiscover/Autodiscover.json {
+ rewrite ^ /internal/autoconfig/microsoft.json break;
+ include /etc/nginx/proxy.conf;
+ proxy_pass http://$admin;
+ }
+ location ~* ^/Autodiscover/Autodiscover.xml {
+ rewrite ^ /internal/autoconfig/microsoft break;
+ include /etc/nginx/proxy.conf;
+ proxy_pass http://$admin;
+ }
+ # apple mobileconfig
+ location ~ ^/(apple\.)?mobileconfig {
+ rewrite ^ /internal/autoconfig/apple break;
+ include /etc/nginx/proxy.conf;
+ proxy_pass http://$admin;
+ }
+
{% if TLS_FLAVOR == 'mail-letsencrypt' %}
location ^~ /.well-known/acme-challenge/ {
proxy_pass http://127.0.0.1:8008;
diff --git a/core/nginx/letsencrypt.py b/core/nginx/letsencrypt.py
index 48316c1c..9c998fe2 100755
--- a/core/nginx/letsencrypt.py
+++ b/core/nginx/letsencrypt.py
@@ -4,10 +4,12 @@ import os
import time
import subprocess
+hostnames = ','.join(set(host.strip() for host in os.environ['HOSTNAMES'].split(',')))
+
command = [
"certbot",
"-n", "--agree-tos", # non-interactive
- "-d", os.environ["HOSTNAMES"],
+ "-d", hostnames, "--expand", "--allow-subset-of-names",
"-m", "{}@{}".format(os.environ["POSTMASTER"], os.environ["DOMAIN"]),
"certonly", "--standalone",
"--cert-name", "mailu",
@@ -20,7 +22,7 @@ command = [
command2 = [
"certbot",
"-n", "--agree-tos", # non-interactive
- "-d", os.environ["HOSTNAMES"],
+ "-d", hostnames, "--expand", "--allow-subset-of-names",
"-m", "{}@{}".format(os.environ["POSTMASTER"], os.environ["DOMAIN"]),
"certonly", "--standalone",
"--cert-name", "mailu-ecdsa",
diff --git a/core/none/Dockerfile b/core/none/Dockerfile
index c22c3bf6..06d351a9 100644
--- a/core/none/Dockerfile
+++ b/core/none/Dockerfile
@@ -1,6 +1,6 @@
# This is an idle image to dynamically replace any component if disabled.
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
CMD sleep 1000000d
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index fef4d304..7cc3fc9d 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/core/postfix/start.py b/core/postfix/start.py
index fe93de86..4faf2e2d 100755
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -6,6 +6,7 @@ import shutil
import multiprocessing
import logging as log
import sys
+import re
from podop import run_server
from pwd import getpwnam
@@ -15,7 +16,7 @@ log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
def start_podop():
os.setuid(getpwnam('postfix').pw_uid)
- os.mkdir('/dev/shm/postfix',mode=0o700)
+ os.makedirs('/dev/shm/postfix',mode=0o700, exist_ok=True)
url = "http://" + os.environ["ADMIN_ADDRESS"] + "/internal/postfix/"
# TODO: Remove verbosity setting from Podop?
run_server(0, "postfix", "/tmp/podop.socket", [
@@ -50,6 +51,10 @@ os.environ["LMTP_ADDRESS"] = system.get_host_address_from_environment("LMTP", "i
os.environ["POSTFIX_LOG_SYSLOG"] = os.environ.get("POSTFIX_LOG_SYSLOG","local")
os.environ["POSTFIX_LOG_FILE"] = os.environ.get("POSTFIX_LOG_FILE", "")
+# Postfix requires IPv6 addresses to be wrapped in square brackets
+if 'RELAYNETS' in os.environ:
+ os.environ["RELAYNETS"] = re.sub(r'([0-9a-fA-F]+:[0-9a-fA-F:]+)/', '[\\1]/', os.environ["RELAYNETS"])
+
for postfix_file in glob.glob("/conf/*.cf"):
conf.jinja(postfix_file, os.environ, os.path.join("/etc/postfix", os.path.basename(postfix_file)))
diff --git a/core/rspamd/conf/antivirus.conf b/core/rspamd/conf/antivirus.conf
index 57cde1b3..1d492850 100644
--- a/core/rspamd/conf/antivirus.conf
+++ b/core/rspamd/conf/antivirus.conf
@@ -1,6 +1,6 @@
{% if ANTIVIRUS == 'clamav' %}
clamav {
- attachments_only = true;
+ scan_mime_parts = true;
symbol = "CLAM_VIRUS";
type = "clamav";
servers = "{{ ANTIVIRUS_ADDRESS }}";
diff --git a/docs/cli.rst b/docs/cli.rst
index b407c6a3..cc596947 100644
--- a/docs/cli.rst
+++ b/docs/cli.rst
@@ -112,6 +112,7 @@ following are additional parameters that could be defined for users:
* reply_body
* displayed_name
* spam_enabled
+* spam_mark_as_read
* spam_threshold
Alias
@@ -293,6 +294,7 @@ This is a complete YAML template with all additional parameters that can be defi
reply_startdate: '1900-01-01'
reply_subject: ''
spam_enabled: true
+ spam_mark_as_read: true
spam_threshold: 80
tokens:
- id: 1
diff --git a/docs/conf.py b/docs/conf.py
index c753fef4..22bc1282 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,7 +12,7 @@ project = 'Mailu'
copyright = '2018, Mailu authors'
author = 'Mailu authors'
version = release = os.environ.get('VERSION', 'master')
-language = None
+language = 'en'
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'Dockerfile', 'docker-compose.yml']
pygments_style = 'sphinx'
todo_include_todos = False
diff --git a/docs/contributors/memo.rst b/docs/contributors/memo.rst
index 07ac8392..65b86649 100644
--- a/docs/contributors/memo.rst
+++ b/docs/contributors/memo.rst
@@ -29,5 +29,5 @@ Update information files
If you added a feature or fixed a bug or committed anything that is worth mentionning
for the next upgrade, add it in the ``CHANGELOG.md`` file.
-Also, if you would like to be mentionned by name or add a comment in ``AUTHORS.md``,
+Also, if you would like to be mentioned by name or add a comment in ``AUTHORS.md``,
feel free to do so.
diff --git a/docs/faq.rst b/docs/faq.rst
index 4757e6a1..264fbcb8 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -396,58 +396,6 @@ Mailu can serve an `MTA-STS policy`_; To configure it you will need to:
.. _`1798`: https://github.com/Mailu/Mailu/issues/1798
.. _`MTA-STS policy`: https://datatracker.ietf.org/doc/html/rfc8461
-How do I setup client autoconfiguration?
-````````````````````````````````````````
-
-Mailu can serve an `XML file for autoconfiguration`_; To configure it you will need to:
-
-1. add ``autoconfig.example.com`` to the ``HOSTNAMES`` configuration variable (and ensure that a valid SSL certificate is available for it; this may mean restarting your smtp container)
-
-2. configure an override with the policy itself; for example, your ``overrides/nginx/autoconfiguration.conf`` could read:
-
-.. code-block:: bash
-
- location ^~ /mail/config-v1.1.xml {
- return 200 "
-
-
- %EMAILDOMAIN%
-
- Email
- Email
-
-
- mailu.example.com
- 993
- SSL
- %EMAILADDRESS%
- password-cleartext
-
-
-
- mailu.example.com
- 465
- SSL
- %EMAILADDRESS%
- password-cleartext
- true
- true
-
-
-
- Configure your email client
-
-
- \r\n";
- }
-
-3. setup the appropriate DNS/CNAME record (``autoconfig.example.com`` -> ``mailu.example.com``).
-
-*issue reference:* `224`_.
-
-.. _`224`: https://github.com/Mailu/Mailu/issues/224
-.. _`XML file for autoconfiguration`: https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
-
Technical issues
----------------
diff --git a/docs/index.rst b/docs/index.rst
index 238cea5d..6a3c42b7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,7 @@ popular groupware.
Main features include:
-- **Standard email server**, IMAP and IMAP+, SMTP and Submission
+- **Standard email server**, IMAP and IMAP+, SMTP and Submission with autoconfiguration profiles for clients
- **Advanced email features**, aliases, domain aliases, custom routing
- **Web access**, multiple Webmails and administration interface
- **User features**, aliases, auto-reply, auto-forward, fetched accounts
diff --git a/docs/maintain.rst b/docs/maintain.rst
index ffb51a50..1c6e20ae 100644
--- a/docs/maintain.rst
+++ b/docs/maintain.rst
@@ -15,6 +15,7 @@ simply pull the latest images and recreate the containers :
.. code-block:: bash
docker-compose pull
+ docker-compose down
docker-compose up -d
Monitoring the mail server
diff --git a/docs/releases.rst b/docs/releases.rst
index fb729c12..8f4c2bf0 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -4,8 +4,8 @@ Release notes
Mailu 1.9 - 2021-12-29
----------------------
-Mailu 1.9 is available now. The helm-chart repo is not in sync yet with the new Mailu 1.9 release. If you use helm-chart (kubernetes), we advise to stick to version 1.8 for now.
-See the section `Upgrading` for important information in regard to upgrading to Mailu 1.9.
+Mailu 1.9 is available now.
+Please see the section `Upgrading` for important information in regard to upgrading to Mailu 1.9.
Highlights
````````````````````````````````
@@ -119,7 +119,7 @@ A short summary of the new features:
Upgrading
`````````
-Upgrade should run fine as long as you generate a new compose or stack configuration and upgrade your mailu.env.
+Upgrade should run fine as long as you generate a new compose or stack configuration and upgrade your mailu.env. Please note that once you have upgraded to 1.9 you won't be able to roll-back to earlier versions without resetting user passwords.
If you use a reverse proxy in front of Mailu, it is vital to configure the newly introduced environment variables `REAL_IP_HEADER`` and `REAL_IP_FROM`.
These settings tell Mailu that the HTTP header with the remote client IP address from the reverse proxy can be trusted.
diff --git a/docs/reverse.rst b/docs/reverse.rst
index 91c6f67e..50ddaae5 100644
--- a/docs/reverse.rst
+++ b/docs/reverse.rst
@@ -47,7 +47,7 @@ Then on your own frontend, point to these local ports. In practice, you only nee
location / {
proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr
+ proxy_set_header X-Real-IP $remote_addr;
proxy_pass https://localhost:8443;
}
}
@@ -59,16 +59,16 @@ Then on your own frontend, point to these local ports. In practice, you only nee
REAL_IP_FROM=x.x.x.x,y.y.y.y.y
#x.x.x.x,y.y.y.y.y is the static IP address your reverse proxy uses for connecting to Mailu.
-Because the admin interface is served as ``/admin``, the Webmail as ``/webmail``, the single sign on page as ``/sso``, webdav as ``/webdav`` and the static files endpoint as ``/static``, you may also want to use a single virtual host and serve other applications (still Nginx):
+Because the admin interface is served as ``/admin``, the Webmail as ``/webmail``, the single sign on page as ``/sso``, webdav as ``/webdav``, the client-autoconfiguration and the static files endpoint as ``/static``, you may also want to use a single virtual host and serve other applications (still Nginx):
.. code-block:: nginx
server {
# [...] here goes your standard configuration
- location ~ ^/(admin|sso|static|webdav|webmail) {
+ location ~* ^/(admin|sso|static|webdav|webmail|(apple\.)?mobileconfig|(\.well\-known/autoconfig/)?mail/|Autodiscover/Autodiscover) {
proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr
+ proxy_set_header X-Real-IP $remote_addr;
proxy_pass https://localhost:8443;
}
@@ -111,7 +111,7 @@ Here is an example configuration :
location /webmail {
proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr
+ proxy_set_header X-Real-IP $remote_addr;
proxy_pass https://localhost:8443/webmail;
}
}
@@ -123,7 +123,7 @@ Here is an example configuration :
location /admin {
proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr
+ proxy_set_header X-Real-IP $remote_addr;
proxy_pass https://localhost:8443/admin;
proxy_set_header Host $http_host;
}
diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile
index 53a4b198..e0ed0cdc 100644
--- a/optional/clamav/Dockerfile
+++ b/optional/clamav/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/optional/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile
index fe582088..71075ced 100644
--- a/optional/fetchmail/Dockerfile
+++ b/optional/fetchmail/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile
index b31439ef..30055a14 100644
--- a/optional/radicale/Dockerfile
+++ b/optional/radicale/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
@@ -13,7 +13,7 @@ RUN apk add --no-cache \
# Image specific layers under this line
RUN apk add --no-cache curl \
- && pip3 install radicale~=3.0
+ && pip3 install pytz radicale~=3.0
COPY radicale.conf /radicale.conf
@@ -24,4 +24,4 @@ VOLUME ["/data"]
CMD radicale -S -C /radicale.conf
HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1
-RUN echo $VERSION >> /version
\ No newline at end of file
+RUN echo $VERSION >> /version
diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile
index ecef3530..342ceebc 100644
--- a/optional/unbound/Dockerfile
+++ b/optional/unbound/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 4a0f355b..85e5f55b 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.4
+ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
ENV TZ Etc/UTC
diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html
index b7486ead..2a635562 100644
--- a/setup/flavors/stack/setup.html
+++ b/setup/flavors/stack/setup.html
@@ -4,7 +4,7 @@
Docker Stack expects a project file, named docker-compose.yml
in a project directory. First create your project directory.
-mkdir -p {{ root }}/{redis,certs,data,dkim,mail,mailqueue,overrides/rspamd,overrides/postfix,overrides/dovecot,overrides/nginx,filter,dav,webmail}
+mkdir -p {{ root }}/{redis,certs,data,data/fetchmail,dkim,mail,mailqueue,overrides/rspamd,overrides/postfix,overrides/dovecot,overrides/nginx,filter,dav,webmail}
Then download the project file. A side configuration file makes it easier
diff --git a/towncrier/newsfragments/224.feature b/towncrier/newsfragments/224.feature
new file mode 100644
index 00000000..4200a5da
--- /dev/null
+++ b/towncrier/newsfragments/224.feature
@@ -0,0 +1 @@
+Provide auto-configuration files (autodiscover, autoconfig & mobileconfig); Please update your DNS records
diff --git a/towncrier/newsfragments/2278.feature b/towncrier/newsfragments/2278.feature
new file mode 100644
index 00000000..1b0a2457
--- /dev/null
+++ b/towncrier/newsfragments/2278.feature
@@ -0,0 +1 @@
+Added ability to mark spam mails as read or unread when moving to junk folder.
diff --git a/towncrier/newsfragments/2302.bugfix b/towncrier/newsfragments/2302.bugfix
new file mode 100644
index 00000000..bcfedc4b
--- /dev/null
+++ b/towncrier/newsfragments/2302.bugfix
@@ -0,0 +1 @@
+update alpine linux docker image to version 3.14.5 which includes a security fix for zlib’s CVE-2018-25032.
diff --git a/towncrier/newsfragments/2325.bugfix b/towncrier/newsfragments/2325.bugfix
new file mode 100644
index 00000000..ff42224e
--- /dev/null
+++ b/towncrier/newsfragments/2325.bugfix
@@ -0,0 +1 @@
+postfix: wrap IPv6 CIDRs in square brackets for RELAYNETS
diff --git a/towncrier/newsfragments/2338.misc b/towncrier/newsfragments/2338.misc
new file mode 100644
index 00000000..70d895e0
--- /dev/null
+++ b/towncrier/newsfragments/2338.misc
@@ -0,0 +1 @@
+Don't send the `X-XSS-Protection` http header anymore.
\ No newline at end of file
diff --git a/towncrier/newsfragments/2346.bugfix b/towncrier/newsfragments/2346.bugfix
new file mode 100644
index 00000000..9feac519
--- /dev/null
+++ b/towncrier/newsfragments/2346.bugfix
@@ -0,0 +1 @@
+Disable the built-in nginx resolver for traffic going through the mail plugin. This will silence errors about DNS resolution when the connecting host has no rDNS.
diff --git a/towncrier/newsfragments/2368.bugfix b/towncrier/newsfragments/2368.bugfix
new file mode 100644
index 00000000..54c29c48
--- /dev/null
+++ b/towncrier/newsfragments/2368.bugfix
@@ -0,0 +1,3 @@
+Re-enable the built-in nginx resolver for traffic going through the mail plugin.
+This is required for passing rDNS/ptr information to postfix.
+Without this rspamd will flag all messages with DHFILTER_HOSTNAME_UNKNOWN due to the missing rDNS/ptr info.
\ No newline at end of file