From cebc64a2800fd7b8072aff0b36c0cac454a5b678 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Wed, 13 Feb 2019 11:48:32 +0200 Subject: [PATCH 01/52] Resolve HOST_WEBMAIL in admin --- core/admin/mailu/configuration.py | 3 +++ core/admin/mailu/internal/__init__.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 84fbbdde..3e2b3c21 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -46,6 +46,7 @@ DEFAULT_CONFIG = { 'WEBSITE': 'https://mailu.io', 'WEB_ADMIN': '/admin', 'WEB_WEBMAIL': '/webmail', + 'WEBMAIL': 'none', 'RECAPTCHA_PUBLIC_KEY': '', 'RECAPTCHA_PRIVATE_KEY': '', # Advanced settings @@ -79,6 +80,8 @@ class ConfigManager(dict): self.config['HOST_POP3'] = resolve(self.config['HOST_POP3']) self.config['HOST_AUTHSMTP'] = resolve(self.config['HOST_AUTHSMTP']) self.config['HOST_SMTP'] = resolve(self.config['HOST_SMTP']) + if self.config["WEBMAIL"] != "none": + self.config["HOST_WEBMAIL"] = resolve(self.config['HOST_WEBMAIL']) def __coerce_value(self, value): if isinstance(value, str) and value.lower() in ('true','yes'): diff --git a/core/admin/mailu/internal/__init__.py b/core/admin/mailu/internal/__init__.py index fcb19692..cf0ea3f7 100644 --- a/core/admin/mailu/internal/__init__.py +++ b/core/admin/mailu/internal/__init__.py @@ -1,6 +1,7 @@ from flask_limiter import RateLimitExceeded from mailu import utils +from flask import current_app as app import socket import flask @@ -23,7 +24,7 @@ def rate_limit_handler(e): def whitelist_webmail(): try: return flask.request.headers["Client-Ip"] ==\ - socket.gethostbyname("webmail") + app.config["HOST_WEBMAIL"] except: return False From f86e054d2772e11dc63b632d0788f2c0de6a35ab Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Wed, 13 Feb 2019 12:08:46 +0200 Subject: [PATCH 02/52] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c5a25f..44cf33f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ v1.6.1 - unreleased - Bug: Fix creating new fetched accounts - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869)) - Bug: Fix poor performance if ANTIVIRUS is configured to none. +- Bug: Implement mailustart to resolve webmail in admin ([#716](https://github.com/Mailu/Mailu/issues/716)) v1.6.0 - 2019-01-18 ------------------- From 4df36bea91a43b78ea65c678a2cb1614ece380b9 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 15 Feb 2019 12:06:01 +0200 Subject: [PATCH 03/52] Removed commented options --- setup/flavors/compose/mailu.env | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index bdd27853..75b0ae89 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -1,8 +1,6 @@ # Mailu main configuration file # -# Generated for {{ flavor }} flavor -# -# This file is autogenerated by the configuration management wizard. +# This file is autogenerated by the configuration management wizard for {{ flavor }} flavor. # For a detailed list of configuration variables, see the documentation at # https://mailu.io @@ -10,21 +8,9 @@ # Common configuration variables ################################### -# Set this to the path where Mailu data and configuration is stored -# This variable is now set directly in `docker-compose.yml by the setup utility -# ROOT={{ root }} - -# Mailu version to run (1.0, 1.1, etc. or master) -#VERSION={{ version }} - # Set to a randomly generated 16 bytes string SECRET_KEY={{ secret(16) }} -# Address where listening ports should bind -# This variables are now set directly in `docker-compose.yml by the setup utility -# PUBLIC_IPV4= {{ bind4 }} (default: 127.0.0.1) -# PUBLIC_IPV6= {{ bind6 }} (default: ::1) - # Subnet of the docker network. This should not conflict with any networks to which your system is connected. (Internal and external!) SUBNET={{ subnet }} {% if ipv6_enabled %} @@ -67,9 +53,6 @@ WEBDAV={{ webdav_enabled or 'none' }} # Antivirus solution (value: clamav, none) #ANTIVIRUS={{ antivirus_enabled or 'none' }} -#Antispam solution -ANTISPAM={{ antispam_enabled or 'none'}} - ################################### # Mail settings ################################### From 80d712451b201c57af2d349e4c6c3f7ef32aa969 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Tue, 19 Feb 2019 10:30:33 +0200 Subject: [PATCH 04/52] Enable rainloop contacts --- webmails/rainloop/config.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webmails/rainloop/config.ini b/webmails/rainloop/config.ini index 6ae5fff7..f61ec642 100644 --- a/webmails/rainloop/config.ini +++ b/webmails/rainloop/config.ini @@ -8,3 +8,9 @@ allow_admin_panel = Off [labs] allow_gravatar = Off + +[contacts] +enable = On + +[plugins] +contacts_autosave = On \ No newline at end of file From b9fd29a52fb694d105e5b3567b53375d7817ce7e Mon Sep 17 00:00:00 2001 From: Florian Peschka Date: Tue, 19 Feb 2019 21:09:50 +0100 Subject: [PATCH 05/52] Add extra newline to main.cf This should prevent jinja from stripping the newline, which causes overrides to be appended after the comment section see #941 --- core/postfix/conf/main.cf | 1 + 1 file changed, 1 insertion(+) diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf index d5d47d19..7fb32b67 100644 --- a/core/postfix/conf/main.cf +++ b/core/postfix/conf/main.cf @@ -112,3 +112,4 @@ milter_default_action = tempfail ############### # Extra Settings ############### + From 131406774b250fcdd1c1a9c2dd7a4d0875150faa Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Mon, 25 Feb 2019 11:46:42 +0200 Subject: [PATCH 06/52] Handle setup subnet error --- setup/server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup/server.py b/setup/server.py index 4dfd49ae..0bb25a51 100644 --- a/setup/server.py +++ b/setup/server.py @@ -90,7 +90,10 @@ def build_app(path): def submit(): data = flask.request.form.copy() data['uid'] = str(uuid.uuid4()) - data['dns'] = str(ipaddress.IPv4Network(data['subnet'])[-2]) + try: + data['dns'] = str(ipaddress.IPv4Network(data['subnet'])[-2]) + except ValueError as err: + return "Error while generating files: " + str(err) db.set(data['uid'], json.dumps(data)) return flask.redirect(flask.url_for('.setup', uid=data['uid'])) From f15fcf794ff1e91c4566ca8f9343a58c8663b44e Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Tue, 26 Feb 2019 15:04:35 +0200 Subject: [PATCH 07/52] Enable remote synchronization --- webmails/rainloop/config.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webmails/rainloop/config.ini b/webmails/rainloop/config.ini index f61ec642..5bd9943d 100644 --- a/webmails/rainloop/config.ini +++ b/webmails/rainloop/config.ini @@ -11,6 +11,7 @@ allow_gravatar = Off [contacts] enable = On +allow_sync = On [plugins] -contacts_autosave = On \ No newline at end of file +contacts_autosave = On From 52948fa529e551ef75b67bcce97f8baf6ba58bc8 Mon Sep 17 00:00:00 2001 From: Ahmed H Date: Sat, 2 Mar 2019 14:25:18 +0300 Subject: [PATCH 08/52] Correct hardcoded WEBROOT_REDIRECT We should not assume that the user has chosen the word "webmail" for his webmail path --- setup/flavors/compose/mailu.env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env index bdd27853..8971b470 100644 --- a/setup/flavors/compose/mailu.env +++ b/setup/flavors/compose/mailu.env @@ -113,7 +113,11 @@ COMPRESSION_LEVEL={{ compression_level }} ################################### # Path to redirect / to -WEBROOT_REDIRECT=/webmail +{% if webmail_type != 'none' and webmail_path == '' %} +WEBROOT_REDIRECT=/ +{% else %} +WEBROOT_REDIRECT={{ webmail_path }} +{% endif %} # Path to the admin interface if enabled WEB_ADMIN={{ admin_path }} From dd7710951ed0f6ec51bfa804e0fff2ad89db2775 Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 8 Mar 2019 14:45:22 +0200 Subject: [PATCH 09/52] Replaced double quotes with single ones --- core/admin/mailu/configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 3e2b3c21..14ead3dd 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -80,8 +80,8 @@ class ConfigManager(dict): self.config['HOST_POP3'] = resolve(self.config['HOST_POP3']) self.config['HOST_AUTHSMTP'] = resolve(self.config['HOST_AUTHSMTP']) self.config['HOST_SMTP'] = resolve(self.config['HOST_SMTP']) - if self.config["WEBMAIL"] != "none": - self.config["HOST_WEBMAIL"] = resolve(self.config['HOST_WEBMAIL']) + if self.config['WEBMAIL'] != 'none': + self.config['HOST_WEBMAIL'] = resolve(self.config['HOST_WEBMAIL']) def __coerce_value(self, value): if isinstance(value, str) and value.lower() in ('true','yes'): From 253ae9fad8f16e8e87395dfd0e39259e9526a9fc Mon Sep 17 00:00:00 2001 From: mariooos <48351788+mariooos@users.noreply.github.com> Date: Fri, 8 Mar 2019 14:11:58 +0100 Subject: [PATCH 10/52] Open some admin sidebar links (Antispam, Webmail, Website, Help) in a new browser tab --- core/admin/mailu/ui/templates/sidebar.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html index 3d945380..8ff3a216 100644 --- a/core/admin/mailu/ui/templates/sidebar.html +++ b/core/admin/mailu/ui/templates/sidebar.html @@ -52,7 +52,7 @@
  • - + {% trans %}Antispam{% endtrans %}
    • @@ -69,7 +69,7 @@
  • {% trans %}Go to{% endtrans %}
    • {% if config["WEBMAIL"] != "none" %}
  • - + {% trans %}Webmail{% endtrans %}
    • @@ -80,12 +80,12 @@
  • - + {% trans %}Website{% endtrans %}
  • - + {% trans %}Help{% endtrans %}
    • From b1621d4b635992f194af09a925b630c3866a13be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20VIGNELLES?= Date: Sun, 10 Mar 2019 11:09:50 +0100 Subject: [PATCH 11/52] Create overrides/nginx This folder is needed for the front service to be able to start, because a bind-mount is made on that folder. --- setup/flavors/stack/setup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html index 9d51a949..5ae65cf7 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,overrides/rspamd,filter,dav,webmail}
+
    mkdir -p /{{ root }}/{redis,certs,data,dkim,mail,overrides/rspamd,overrides/nginx,filter,dav,webmail}
 
    
 
 
    Then download the project file. A side configuration file makes it easier

From 5f4a6cf16b5060f05a6cca8bcc383d076c4ffc9c Mon Sep 17 00:00:00 2001
From: Dario Ernst 
Date: Sun, 27 Jan 2019 11:48:52 +0100
Subject: [PATCH 12/52] Update fetchmail to selfbuilt 7.0.0-alpha
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fetchmail in alpine is ~5 years old — and doesn’t support current SSL/TLS
variants anymore. This especially leads to our own fetchmail not being able to
pull mail from mailu itself. Since no new fetchmail release is on the horizon,
let’s build the lastest distribution artifact — which strangely is not
6.4.0-snapshot, but 7.0.0-alpha — ourselves.
---
 services/fetchmail/Dockerfile       | 19 ++++++++++++++++++-
 services/fetchmail/fetchmail.py     |  3 +--
 towncrier/newsfragments/891.feature |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 towncrier/newsfragments/891.feature

diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile
index 8e4d5db0..4636cd3f 100644
--- a/services/fetchmail/Dockerfile
+++ b/services/fetchmail/Dockerfile
@@ -1,13 +1,30 @@
+# First stage: Build
+FROM alpine:3.8 as builder
+
+# build dependencies
+RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev
+
+RUN curl 'https://netcologne.dl.sourceforge.net/project/fetchmail/branch_6.3/fetchmail-7.0.0-alpha6.tar.xz' | tar xJ
+RUN cd fetchmail-7.0.0-alpha6 && \
+    ./configure --with-ssl --prefix /usr/local --disable-nls && \
+    make
+
 FROM alpine:3.8
+
+
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip bash \
   && pip3 install --upgrade pip
+
 # Image specific layers under this line
-RUN apk add --no-cache fetchmail ca-certificates \
+RUN apk add --no-cache ca-certificates openssl \
  && pip3 install requests
 
+COPY --from=builder /fetchmail-7.0.0-alpha6/fetchmail /usr/local/bin
 COPY fetchmail.py /fetchmail.py
+
+RUN adduser -D fetchmail
 USER fetchmail
 
 CMD ["/fetchmail.py"]
diff --git a/services/fetchmail/fetchmail.py b/services/fetchmail/fetchmail.py
index 9b1bcc4f..49e57b73 100755
--- a/services/fetchmail/fetchmail.py
+++ b/services/fetchmail/fetchmail.py
@@ -22,7 +22,6 @@ poll "{host}" proto {protocol}  port {port}
     is "{user_email}"
     smtphost "{smtphost}"
     {options}
-    sslproto 'AUTO'
 """
 
 
@@ -54,7 +53,7 @@ def run(debug):
     for fetch in fetches:
         fetchmailrc = ""
         options = "options antispam 501, 504, 550, 553, 554"
-        options += " ssl" if fetch["tls"] else ""
+        options += " sslmode wrapped" if fetch["tls"] else ""
         options += " keep" if fetch["keep"] else " fetchall"
         fetchmailrc += RC_LINE.format(
             user_email=escape_rc_string(fetch["user_email"]),
diff --git a/towncrier/newsfragments/891.feature b/towncrier/newsfragments/891.feature
new file mode 100644
index 00000000..a117e921
--- /dev/null
+++ b/towncrier/newsfragments/891.feature
@@ -0,0 +1 @@
+Update Fetchmail to 7.0.0, which features more current SSL support

From 1acd629e6f5fcd339c21aa0865b17d09de727127 Mon Sep 17 00:00:00 2001
From: Dario Ernst 
Date: Sun, 10 Mar 2019 12:15:14 +0000
Subject: [PATCH 13/52] Use ldez/traefik-certs-dumper in certificate dumper,
 and make more robust

closes #820
---
 optional/traefik-certdumper/Dockerfile |  9 ++++-----
 optional/traefik-certdumper/LICENSE    | 21 --------------------
 optional/traefik-certdumper/README.md  | 27 --------------------------
 optional/traefik-certdumper/run.sh     | 25 +++++++++++-------------
 towncrier/newsfragments/820.bugfix     |  1 +
 5 files changed, 16 insertions(+), 67 deletions(-)
 delete mode 100644 optional/traefik-certdumper/LICENSE
 delete mode 100644 optional/traefik-certdumper/README.md
 create mode 100644 towncrier/newsfragments/820.bugfix

diff --git a/optional/traefik-certdumper/Dockerfile b/optional/traefik-certdumper/Dockerfile
index 92e5e900..bfafe245 100644
--- a/optional/traefik-certdumper/Dockerfile
+++ b/optional/traefik-certdumper/Dockerfile
@@ -1,11 +1,10 @@
-FROM alpine:3.8
+FROM ldez/traefik-certs-dumper
 
-RUN apk --no-cache add inotify-tools jq openssl util-linux bash docker
-# while not strictly documented, this script seems to always(?) support previous acme.json versions too
-RUN wget https://raw.githubusercontent.com/containous/traefik/master/contrib/scripts/dumpcerts.sh -O dumpcerts.sh
+RUN apk --no-cache add inotify-tools util-linux bash docker
+
+COPY run.sh /
 
 VOLUME ["/traefik"]
 VOLUME ["/output"]
 
-COPY run.sh /
 ENTRYPOINT ["/run.sh"]
diff --git a/optional/traefik-certdumper/LICENSE b/optional/traefik-certdumper/LICENSE
deleted file mode 100644
index 259ccd34..00000000
--- a/optional/traefik-certdumper/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Sven Dowideit
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/optional/traefik-certdumper/README.md b/optional/traefik-certdumper/README.md
deleted file mode 100644
index f5434f62..00000000
--- a/optional/traefik-certdumper/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Single-domain traefik-certdumper for mailu
-
-This is based on the work by Sven Dowideit on https://github.com/SvenDowideit/traefik-certdumper
-
-## Fork?
-This is a slight modification that is less flexible, but is adapted to the
-usecase in mailu. If you wish to deploy mailu behind a traefik, you face many
-problems. One of these is that you need to get the certificates into mailu in a
-very defined manner. This will copy the certificate for the **Main:**-domain
-given in the DOMAIN-environment onto `output`.
-
-If your output happens to be mailu-front-`/certs`, the certificate-watcher in
-the front-container will catch it and reload nginx. This works for mailu
-`TLS_FLAVOR=[mail, cert]`
-
-
-```
-  certdumper:
-    restart: always
-    image: Mailu/traefik-certdumper:$VERSION
-    environment:
-      - DOMAIN=$DOMAIN
-    volumes:
-      # your traefik data-volume is probably declared outside of the mailu composefile
-      - /data/traefik:/traefik
-      - $ROOT/certs/:/output/
-```
diff --git a/optional/traefik-certdumper/run.sh b/optional/traefik-certdumper/run.sh
index 5d643670..6799946a 100755
--- a/optional/traefik-certdumper/run.sh
+++ b/optional/traefik-certdumper/run.sh
@@ -2,25 +2,22 @@
 
 function dump() {
     echo "$(date) Dumping certificates"
-    bash dumpcerts.sh /traefik/acme.json /tmp/work/ || return
 
-    # private-keys are rsa, we need pem though
-    for key_file in $(ls /tmp/work/private/*); do
-        pem_file=$(echo $key_file | sed 's/private/pem/g' | sed 's/.key/-private.pem/g')
-        openssl rsa -in $key_file -text > $pem_file
-    done
+    traefik-certs-dumper dump --crt-name "cert" --crt-ext ".pem" --key-name "key" --key-ext ".pem" --domain-subdir=true --dest /tmp/work --source /traefik/acme.json > /dev/null
 
-    echo "$(date) Copying certificates"
-    cp -v /tmp/work/pem/${DOMAIN}-private.pem /output/key.pem
-    # the .crt is a chained-pem, as common for letsencrypt
-    cp -v /tmp/work/certs/${DOMAIN}.crt /output/cert.pem
+    if diff -q /tmp/work/${DOMAIN}/cert.pem /output/cert.pem >/dev/null && \
+	    diff -q /tmp/work/${DOMAIN}/key.pem /output/key.pem >/dev/null ; then
+	echo "$(date) Certificate and key still up to date, doing nothing"
+    else
+	echo "$(date) Certificate or key differ, updating"
+	mv /tmp/work/${DOMAIN}/*.pem /output/
+    fi
 }
 
-mkdir -p /tmp/work/pem /tmp/work/certs
-# run once on start to make sure we have any old certs
+mkdir -p /tmp/work
 dump
 
 while true; do
-    inotifywait -e modify /traefik/acme.json && \
-        dump
+    inotifywait -qq -e modify /traefik/acme.json
+    dump
 done
diff --git a/towncrier/newsfragments/820.bugfix b/towncrier/newsfragments/820.bugfix
new file mode 100644
index 00000000..7831d0de
--- /dev/null
+++ b/towncrier/newsfragments/820.bugfix
@@ -0,0 +1 @@
+Use ldez/traefik-certs-dumper in our certificate dumper to have a more robust solution

From e22324adcd56f145cb55d0e2545471f30a39b9e1 Mon Sep 17 00:00:00 2001
From: Dario Ernst 
Date: Sun, 14 Apr 2019 11:37:09 +0000
Subject: [PATCH 14/52] Make aliases case-insensitive (too)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Even though RFC5321 2.4 explains that local-parts are to be case-sensitive,
this does not seem to be how EMail is used today. Thus, instead of reverting
user-emails back to being case sensitive, let’s make aliases case-insensitive
too. Not only more consistent, this also allows users to enjoy receiving EMails
from large airlines or car-rental agencies onto their already existing aliases.

For the rare case of case sensitive aliases existing, let’s query for the
forced-lowercase alias only in the event that the preserved-case one isn’t
found …

closes #867
---
 core/admin/mailu/models.py         | 39 +++++++++++++++++++++---------
 towncrier/newsfragments/867.bugfix |  1 +
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 towncrier/newsfragments/867.bugfix

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 8bfb12fb..95dc16a6 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -436,20 +436,37 @@ class Alias(Base, Email):
 
     @classmethod
     def resolve(cls, localpart, domain_name):
-        return cls.query.filter(
-            sqlalchemy.and_(cls.domain_name == domain_name,
-                sqlalchemy.or_(
-                    sqlalchemy.and_(
-                        cls.wildcard == False,
-                        cls.localpart == localpart
-                    ), sqlalchemy.and_(
-                        cls.wildcard == True,
-                        sqlalchemy.bindparam("l", localpart).like(cls.localpart)
+        alias_preserve_case = cls.query.filter(
+                sqlalchemy.and_(cls.domain_name == domain_name,
+                    sqlalchemy.or_(
+                        sqlalchemy.and_(
+                            cls.wildcard == False,
+                            cls.localpart == localpart
+                        ), sqlalchemy.and_(
+                            cls.wildcard == True,
+                            sqlalchemy.bindparam("l", localpart).like(cls.localpart)
+                        )
                     )
                 )
-            )
-        ).order_by(cls.wildcard, sqlalchemy.func.char_length(cls.localpart).desc()).first()
+            ).order_by(cls.wildcard, sqlalchemy.func.char_length(cls.localpart).desc()).first()
+        if alias_preserve_case:
+            return alias_preserve_case
 
+        if localpart:
+            localpart = localpart.lower()
+        return cls.query.filter(
+                sqlalchemy.and_(cls.domain_name == domain_name,
+                    sqlalchemy.or_(
+                        sqlalchemy.and_(
+                            cls.wildcard == False,
+                            sqlalchemy.func.lower(cls.localpart) == localpart
+                        ), sqlalchemy.and_(
+                            cls.wildcard == True,
+                            sqlalchemy.bindparam("l", localpart).like(sqlalchemy.func.lower(cls.localpart))
+                        )
+                    )
+                )
+            ).order_by(cls.wildcard, sqlalchemy.func.char_length(sqlalchemy.func.lower(cls.localpart)).desc()).first()
 
 class Token(Base):
     """ A token is an application password for a given user.
diff --git a/towncrier/newsfragments/867.bugfix b/towncrier/newsfragments/867.bugfix
new file mode 100644
index 00000000..ef9b04a7
--- /dev/null
+++ b/towncrier/newsfragments/867.bugfix
@@ -0,0 +1 @@
+Make aliases optionally case-insensitive: After attempting to resolve an alias in its preserved case, also attempt to match it case-insensitively

From c155823ec81a37f788abf903a26c5420966c7788 Mon Sep 17 00:00:00 2001
From: hoellen 
Date: Sun, 5 May 2019 12:47:30 +0200
Subject: [PATCH 15/52] update roundcube 1.3.9

---
 webmails/roundcube/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index cecf009b..3c970ea4 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists \
   && echo "ServerSignature Off" >> /etc/apache2/apache2.conf
 
-ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.8/roundcubemail-1.3.8-complete.tar.gz
+ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.9/roundcubemail-1.3.9-complete.tar.gz
 
 RUN apt-get update && apt-get install -y \
       zlib1g-dev python3-jinja2 \

From 67d5c8fcb34cccd971f9281fd17b19e1fe52a126 Mon Sep 17 00:00:00 2001
From: Zhuang Yuyao 
Date: Mon, 6 May 2019 10:55:00 +0800
Subject: [PATCH 16/52] distinguish disabled user in user list view by row
 color

---
 CHANGELOG.md                                 | 1 +
 core/admin/mailu/ui/templates/user/list.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaa9ecac..4639c399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ upgrading Freposte.io as some changes will include useful notes.
 
 v1.6.1 - unreleased
 -------------------
+- Enhancement: Distinguish disabled user in user list view by row color
 - Enhancement: Make Unbound drop privileges after binding to port
 - Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829))
 - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869))
diff --git a/core/admin/mailu/ui/templates/user/list.html b/core/admin/mailu/ui/templates/user/list.html
index 8a8fad69..2aff662f 100644
--- a/core/admin/mailu/ui/templates/user/list.html
+++ b/core/admin/mailu/ui/templates/user/list.html
@@ -25,7 +25,7 @@
   {% trans %}Last edit{% endtrans %}
 
 {% for user in domain.users %}
-
+
   
      
     

From cfc224352abca6c4d64461f8cb527171d1705730 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 06:33:36 +0000
Subject: [PATCH 17/52] Added translation using Weblate (Icelandic)

---
 .../mailu/translations/is/LC_MESSAGES/messages.po   | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 core/admin/mailu/translations/is/LC_MESSAGES/messages.po

diff --git a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..33448d62
--- /dev/null
+++ b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
@@ -0,0 +1,13 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-07 06:33+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 2.3.1\n"

From 57385df15c49b20abb195888989d64ff7aee0c14 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 06:38:36 +0000
Subject: [PATCH 18/52] Deleted translation using Weblate (Icelandic)

---
 .../mailu/translations/is/LC_MESSAGES/messages.po   | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 core/admin/mailu/translations/is/LC_MESSAGES/messages.po

diff --git a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
deleted file mode 100644
index 33448d62..00000000
--- a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,13 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-07 06:33+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: is\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.3.1\n"

From 65a61ad5c8a98809d702fd852cd72244f2ca0b18 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 06:39:48 +0000
Subject: [PATCH 19/52] Added translation using Weblate (Icelandic)

---
 .../translations/is/LC_MESSAGES/messages.po   | 669 ++++++++++++++++++
 1 file changed, 669 insertions(+)
 create mode 100644 core/admin/mailu/translations/is/LC_MESSAGES/messages.po

diff --git a/core/admin/mailu/translations/is/LC_MESSAGES/messages.po b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..9798a792
--- /dev/null
+++ b/core/admin/mailu/translations/is/LC_MESSAGES/messages.po
@@ -0,0 +1,669 @@
+# Translations template for PROJECT.
+# Copyright (C) 2018 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2018.
+#
+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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: is\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"
+
+#: 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
+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
+msgid "Password"
+msgstr ""
+
+#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:111
+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/ui/forms.py:47
+msgid "Maximum user count"
+msgstr ""
+
+#: mailu/ui/forms.py:48
+msgid "Maximum alias count"
+msgstr ""
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
+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/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/ui/forms.py:57
+msgid "Initial admin"
+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/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:97
+msgid "Displayed name"
+msgstr ""
+
+#: mailu/ui/forms.py:98
+msgid "Enable spam filter"
+msgstr ""
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
+msgstr ""
+
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr ""
+
+#: mailu/ui/forms.py:101
+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
+msgid "Destination"
+msgstr ""
+
+#: mailu/ui/forms.py:105
+msgid "Save settings"
+msgstr ""
+
+#: mailu/ui/forms.py:110
+msgid "Password check"
+msgstr ""
+
+#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr ""
+
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr ""
+
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr ""
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr ""
+
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:120
+msgid "Update"
+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 ""
+
+#: mailu/ui/forms.py:136
+msgid "Alias"
+msgstr ""
+
+#: mailu/ui/forms.py:138
+msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
+msgstr ""
+
+#: mailu/ui/forms.py:145
+msgid "Admin email"
+msgstr ""
+
+#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+msgid "Submit"
+msgstr ""
+
+#: mailu/ui/forms.py:150
+msgid "Manager email"
+msgstr ""
+
+#: mailu/ui/forms.py:155
+msgid "Protocol"
+msgstr ""
+
+#: mailu/ui/forms.py:158
+msgid "Hostname or IP"
+msgstr ""
+
+#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:47
+msgid "TCP port"
+msgstr ""
+
+#: mailu/ui/forms.py:160
+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
+msgid "Username"
+msgstr ""
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+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/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/confirm.html:4
+msgid "Confirm action"
+msgstr ""
+
+#: mailu/ui/templates/confirm.html:13
+#, python-format
+msgid "You are about to %(action)s. Please confirm your action."
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr ""
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-reply"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
+#: mailu/ui/templates/user/list.html:36
+msgid "Fetched accounts"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:54
+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
+msgid "Mail domains"
+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/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
+msgid "Sign out"
+msgstr ""
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr ""
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:9
+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
+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
+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
+msgid "Delete"
+msgstr ""
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:12
+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
+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
+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
+msgid "Edit"
+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/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:15
+msgid "Regenerate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:31
+msgid "DNS MX entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:35
+msgid "DNS SPF entries"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:42
+msgid "DKIM public key"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:46
+msgid "DNS DKIM entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:50
+msgid "DNS DMARC entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+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/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr ""
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr ""
+
+#: mailu/ui/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
+#: mailu/ui/templates/token/create.html:4
+msgid "Create an authentication token"
+msgstr ""
+
+#: mailu/ui/templates/token/list.html:12
+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
+msgid "Features and quotas"
+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/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:8
+msgid "pick a domain for the new account"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:14
+msgid "Domain"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:15
+msgid "Available slots"
+msgstr ""

From 13d7dbdde57a0e3a91b8b289f68213a2df0eb04f Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 08:47:17 +0200
Subject: [PATCH 20/52] Remove references to individuals in the docs

---
 docs/contributors/environment.rst |  8 +++-----
 docs/faq.rst                      | 13 +++----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/docs/contributors/environment.rst b/docs/contributors/environment.rst
index e2e74d8f..161619f6 100644
--- a/docs/contributors/environment.rst
+++ b/docs/contributors/environment.rst
@@ -192,12 +192,10 @@ domain name would be required. This can be a simple free DynDNS account. Do not
 server, as there are cases where data corruption occurs and you need to delete the ``/mailu``
 directory structure.
 
-If you do no posses the resources, but want to become an involved tester/reviewer.
-Please contact `muhlemmer on Matrix`_.
-He can provide access to a testing server, if a trust relation can be established.
-
-.. _`muhlemmer on Matrix`: https://matrix.to/#/@muhlemmer:matrix.org
+If you do no posses the resources, but want to become an involved tester/reviewer, please contact
+us on `Matrix`_.
 
+.. _`Matrix`: https://matrix.to/#/#mailu:tedomum.net
 .. _testing:
 
 Test images
diff --git a/docs/faq.rst b/docs/faq.rst
index 9d69f2c5..8d6b283f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -71,22 +71,15 @@ We thank you for your understanding and patience.
 I would like to donate (for a feature)
 ``````````````````````````````````````
 
-Donations are welcome at the `patreon`_ account of the project lead. It will be used to pay
-for infra structure and project related costs. If there are leftovers, it will be distributed
-among the developers.
-
-It is not yet possible to pay for a specific feature. We don't have
-any bounty system implemented. Feel free to come with suggestions in
-our ongoing `project management`_ discussion issue.
-
+Donations are welcome to the authors of the project directly, we do not manage any central
+donation pot. Also, check the ``AUTHORS.md`` file for Patreon link or equivalent. If you
+wish to contact a contributor specifically, please do so on `Matrix`_
 
 .. _`Matrix`: https://matrix.to/#/#mailu:tedomum.net
 .. _`open issues`: https://github.com/Mailu/Mailu/issues
 .. _`new issue`: https://github.com/Mailu/Mailu/issues/new
 .. _`Enhancement issues`: https://github.com/Mailu/Mailu/issues?q=is%3Aissue+is%3Aopen+label%3Atype%2Fenhancement
 .. _`Feature request issues`: https://github.com/Mailu/Mailu/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Ffeature
-.. _`patreon`: https://patreon.com/kaiyou
-.. _`project management`: https://github.com/Mailu/Mailu/issues/508
 
 Deployment related
 ------------------

From 8bcb4deb7e4ef46eff6a95091a72766ebd85b496 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:32 +0200
Subject: [PATCH 21/52] Update messages.po (POEditor.com)

---
 .../zh_CN/LC_MESSAGES/messages.po             | 62 ++++++++++++++-----
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po b/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
index 3b0a2332..ee204fec 100644
--- a/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
@@ -193,6 +193,34 @@ msgstr "你的帐户"
 msgid "to access the administration tools"
 msgstr "访问管理员工具"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+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 "进程ID"
+
+#: 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
 msgid "My account"
 msgstr "我的帐户"
@@ -600,75 +628,75 @@ msgstr "垃圾邮件过滤器容忍度"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "启用用户注册"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "初始管理员"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "管理员密码"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "启用"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "注册"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "假期结束"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "客户端设置"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "邮件协议"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "服务器名"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "注册域名"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+msgstr "在注册一个新的域名前，您必须先为该域名设置 MX 记录，并使其指向本服务器"
 
 #: 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 ""
+msgstr "如果您不知道如何为域名设置 MX 记录，请联系你的DNS提供商或者系统管理员。在设置完成 MX 记录后，请等待本地域名服务器的缓存过期。"
 
 #: mailu/ui/templates/user/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "为新用户选择一个域名"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "域名"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "可用"
 

From 0ca18035e10b0fd3add2caf02500b64a76923184 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:35 +0200
Subject: [PATCH 22/52] Update messages.po (POEditor.com)

---
 .../translations/nl/LC_MESSAGES/messages.po   | 62 ++++++++++++++-----
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
index 2e6e2c7e..8d7b5054 100644
--- a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
@@ -193,6 +193,34 @@ msgstr "Uw account"
 msgid "to access the administration tools"
 msgstr "om toegang te krijgen tot systeembeheer"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Status diensten"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Dienst"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Image"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Gestart"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Laatste aanpassing"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mijn account"
@@ -600,75 +628,75 @@ msgstr "Spam filter toleratie"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Schakel registreren in"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "Eerste beheerder"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "Beheerder wachtwoord"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "Ingeschakeld"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "Registreren"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "Einde van vakantie"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "Client instellingen"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "Mail protocol"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Server naam"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Registreer een domein"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+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 ""
+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/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "kies een domein voor het nieuwe account"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Domein"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Vrije sloten"
 

From 308521ff9af893d02b9aa2652aa607610ebd3106 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:37 +0200
Subject: [PATCH 23/52] Update messages.po (POEditor.com)

---
 .../translations/fr/LC_MESSAGES/messages.po   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
index 0d8077a0..8939605c 100644
--- a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
@@ -193,6 +193,34 @@ msgstr "Votre compte"
 msgid "to access the administration tools"
 msgstr "pour accéder aux outils d'administration"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Etat des services"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Service"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Etat"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Image"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Démarré depuis"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Dernière mise à jour"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mon compte"

From c939b30e6bafdeb85e4b0ef926d2356ca2d7584c Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:40 +0200
Subject: [PATCH 24/52] Update messages.po (POEditor.com)

---
 .../translations/de/LC_MESSAGES/messages.po   | 66 +++++++++++++------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
index c733b45d..941c22ef 100644
--- a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
@@ -158,11 +158,11 @@ msgstr "Hostname oder IP"
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
 msgid "TCP port"
-msgstr "Port"
+msgstr "TCP Port"
 
 #: mailu/ui/forms.py:160
 msgid "Enable TLS"
-msgstr "Verschlüsselung aktivieren"
+msgstr "Verschlüsselung aktivieren (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
@@ -193,6 +193,34 @@ msgstr "Konto"
 msgid "to access the administration tools"
 msgstr "für administrativen Zugriff"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Dienst-Status"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Dienst"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Image"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Gestartet"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Letztes Update"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mein Konto"
@@ -600,75 +628,75 @@ msgstr "Spamfilter-Grenzwert"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Neuanmeldung erlauben"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "Initiale Admin-Adresse"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "Administrator Passwort"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiv"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "Registrieren"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "Ende der Abwesenheit"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "Client Einrichtung"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "E-Mail-Protokoll"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Servername"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Regestrieren Sie eine Domain"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+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 ""
+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/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "Wählen Sie eine Domain für das neue Benutzerkonto"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Domain"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Verfügbare Plätze"
 

From 0566b0066491d14fc44ea2119d78843904e96d66 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:42 +0200
Subject: [PATCH 25/52] Update messages.po (POEditor.com)

---
 .../translations/it/LC_MESSAGES/messages.po   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/core/admin/mailu/translations/it/LC_MESSAGES/messages.po b/core/admin/mailu/translations/it/LC_MESSAGES/messages.po
index e53cd4df..a7649e2a 100644
--- a/core/admin/mailu/translations/it/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/it/LC_MESSAGES/messages.po
@@ -194,6 +194,34 @@ msgstr "Il tuo account"
 msgid "to access the administration tools"
 msgstr ""
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+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 "Stato"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Immagine"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Avviato"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Ultimo aggiornamento"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Il mio account"

From 80c57b597bc284871c86f82d6aff779cc9ae5271 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:45 +0200
Subject: [PATCH 26/52] Update messages.po (POEditor.com)

---
 .../translations/pl/LC_MESSAGES/messages.po   | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
index 43f7b72b..595b1b43 100644
--- a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
@@ -194,6 +194,34 @@ msgstr "Twoje konto"
 msgid "to access the administration tools"
 msgstr ""
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Status usług"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Usługa"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: 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 "Ostatnia aktualizacja"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Moje konto"
@@ -296,7 +324,7 @@ msgstr "Dodaj alias"
 #: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
 #: mailu/ui/templates/user/list.html:24
 msgid "Created"
-msgstr ""
+msgstr "Utworzono"
 
 #: 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
@@ -529,7 +557,7 @@ msgstr ""
 
 #: mailu/ui/templates/domain/list.html:39
 msgid "Alternatives"
-msgstr ""
+msgstr "Alternatywy"
 
 #: mailu/ui/templates/relay/create.html:4
 msgid "New relay domain"
@@ -577,7 +605,7 @@ msgstr ""
 
 #: mailu/ui/templates/token/list.html:12
 msgid "New token"
-msgstr ""
+msgstr "Nowy token"
 
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
@@ -601,7 +629,7 @@ msgstr ""
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Włącz rejestrację"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
@@ -609,7 +637,7 @@ msgstr ""
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "hasło administratora"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
@@ -635,19 +663,19 @@ msgstr ""
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "Protokół poczty"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Nazwa serwera"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Zarejestruj domenę"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+msgstr "Wygeneruj klucze"
 
 #: mailu/ui/templates/domain/signup.html:13
 msgid "In order to register a new domain, you must first setup the\n"
@@ -667,7 +695,7 @@ msgstr ""
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Domena"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"

From c0263a2ae9078a4a186122528a880236e4d013ea Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:47 +0200
Subject: [PATCH 27/52] Update messages.po (POEditor.com)

---
 .../translations/pt/LC_MESSAGES/messages.po   | 89 ++++++++++++-------
 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
index 6cef189f..58338380 100644
--- a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
@@ -193,6 +193,34 @@ msgstr "Sua conta"
 msgid "to access the administration tools"
 msgstr "para acessar as ferramentas administrativas"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Status do serviço"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Serviço"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Status"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Imagem"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Iniciado"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Última atualização"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Minha conta"
@@ -548,127 +576,128 @@ 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 ""
+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 ""
+msgstr "IP autorizado"
 
 #: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
 msgid "Authentication tokens"
-msgstr ""
+msgstr "Tokens de autenticação"
 
 #: mailu/ui/templates/sidebar.html:72
 msgid "Go to"
-msgstr ""
+msgstr "Ir para"
 
 #: mailu/ui/templates/sidebar.html:76
 msgid "Webmail"
-msgstr ""
+msgstr "Webmail"
 
 #: mailu/ui/templates/sidebar.html:87
 msgid "Website"
-msgstr ""
+msgstr "Website"
 
 #: mailu/ui/templates/token/create.html:4
 msgid "Create an authentication token"
-msgstr ""
+msgstr "Criar token de autenticação"
 
 #: mailu/ui/templates/token/list.html:12
 msgid "New token"
-msgstr ""
+msgstr "Novo token"
 
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
-msgstr ""
+msgstr "Geral"
 
 #: mailu/ui/templates/user/create.html:22
 msgid "Features and quotas"
-msgstr ""
+msgstr "Recursos e quotas"
 
 #: mailu/ui/templates/user/settings.html:14
 msgid "General settings"
-msgstr ""
+msgstr "Configurações"
 
 #: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
 msgid "Antispam"
-msgstr ""
+msgstr "Antispam"
 
 #: mailu/ui/forms.py:99
 msgid "Spam filter tolerance"
-msgstr ""
+msgstr "Filtro de tolerância de spam"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Habilitar acesso"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "Administrador"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "Senha administrador"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "Acesso"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "Conclusão das férias"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "Configuração"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "Protocolo de e-mail"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Servidor"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Registrar domínio"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+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 ""
+msgstr "Caso não saiba configurar os registros MXno 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/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "Selecione o domínio da nova conta"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Domínio"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Slots disponíveis"
 

From 91c8ca1279964f2a485f678e1b9480de50c42eb1 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:50 +0200
Subject: [PATCH 28/52] Update messages.po (POEditor.com)

---
 .../translations/ru/LC_MESSAGES/messages.po   | 66 ++++++++++++++-----
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
index 3456cd6b..08803d1d 100644
--- a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
@@ -193,6 +193,34 @@ msgstr "Ваша учетная запись"
 msgid "to access the administration tools"
 msgstr "для доступа к утилитам администрирования"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+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 "PID"
+
+#: 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
 msgid "My account"
 msgstr "Моя учетная запись"
@@ -600,75 +628,79 @@ msgstr "Порог спам-фильтра"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Разрешить регистрацию"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "Начальный админ"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "Пароль администратора"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "Регистрация"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "Конец отпуска"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "Настройка клиента"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "Почтовый протокол"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Имя сервера"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Зарегистрировать домен"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+msgstr "Чтобы зарегистрировать новый домен, вы должны сначала настроить\n"
+"    доменная зона, так что домен  MX  указывает на этот сервер"
 
 #: 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 ""
+msgstr "Если вы не знаете, как настроить запись  MX  для своей зоны DNS,\n"
+"    пожалуйста, свяжитесь с вашим поставщиком DNS или администратором. Также, пожалуйста, подождите\n"
+"    через пару минут после установки  MX , чтобы кэш локального сервера\n"
+"    истекает."
 
 #: mailu/ui/templates/user/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "выбрать домен для новой учетной записи"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Домен"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Доступные слоты"
 

From d9294137845b0625000fa99bca85d820d6537047 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:54 +0200
Subject: [PATCH 29/52] Update messages.po (POEditor.com)

---
 .../translations/sv/LC_MESSAGES/messages.po   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
index 61e3458b..825888f1 100644
--- a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
 "Project-Id-Version: Mailu\n"
-"Language: sv\n"
+"Language: sk\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
@@ -193,6 +193,34 @@ msgstr "Ditt konto"
 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"
+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
 msgid "My account"
 msgstr "Mitt konto"

From b91c7f64eed0344d67f8b69ec0a3f99032216f5b Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:15:56 +0200
Subject: [PATCH 30/52] Update messages.po (POEditor.com)

---
 .../translations/es/LC_MESSAGES/messages.po   | 171 ++++++++++--------
 1 file changed, 100 insertions(+), 71 deletions(-)

diff --git a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
index e3fd6c1d..c5b0322c 100644
--- a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
@@ -121,11 +121,11 @@ msgstr "Habilitar respuesta automática"
 
 #: mailu/ui/forms.py:116
 msgid "Reply subject"
-msgstr ""
+msgstr "Título de la respuesta"
 
 #: mailu/ui/forms.py:117
 msgid "Reply body"
-msgstr ""
+msgstr "Texto de la respuesta"
 
 #: mailu/ui/forms.py:136
 msgid "Alias"
@@ -137,15 +137,15 @@ msgstr "Usar sintaxis SQL (p.ej. para abarcar todos los alias)"
 
 #: mailu/ui/forms.py:145
 msgid "Admin email"
-msgstr ""
+msgstr "Correo-e del administrador"
 
 #: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: mailu/ui/forms.py:150
 msgid "Manager email"
-msgstr ""
+msgstr "Gestor de correo"
 
 #: mailu/ui/forms.py:155
 msgid "Protocol"
@@ -153,7 +153,7 @@ msgstr "Protocolo"
 
 #: mailu/ui/forms.py:158
 msgid "Hostname or IP"
-msgstr ""
+msgstr "Nombre o IP del servidor"
 
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
@@ -175,7 +175,7 @@ msgstr "Confirmar acción"
 
 #: mailu/ui/templates/confirm.html:13
 msgid "You are about to %(action)s. Please confirm your action."
-msgstr ""
+msgstr "Está a punto de  %(action)s. Por favor, confirme su acción. "
 
 #: mailu/ui/templates/docker-error.html:4
 msgid "Docker error"
@@ -187,12 +187,40 @@ msgstr "Ocurrió un error en la comunicación con el servidor Docker."
 
 #: mailu/admin/templates/login.html:6
 msgid "Your account"
-msgstr ""
+msgstr "Su cuenta"
 
 #: mailu/ui/templates/login.html:8
 msgid "to access the administration tools"
 msgstr "para acceder a las herramientas de administración"
 
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Estado de servicios"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Servicio"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Estado"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Imagen"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Iniciado"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Última actualización"
+
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mi cuenta"
@@ -212,7 +240,7 @@ msgstr "Auto-respuesta"
 #: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
 #: mailu/ui/templates/user/list.html:36
 msgid "Fetched accounts"
-msgstr ""
+msgstr "Cuentas recogidas"
 
 #: mailu/ui/templates/sidebar.html:105
 msgid "Sign out"
@@ -324,23 +352,23 @@ msgstr "Regenerar llaves"
 
 #: mailu/ui/templates/domain/details.html:31
 msgid "DNS MX entry"
-msgstr ""
+msgstr "Entrada MX del DNS"
 
 #: mailu/ui/templates/domain/details.html:35
 msgid "DNS SPF entries"
-msgstr ""
+msgstr "Entradas SPF del DNS"
 
 #: mailu/ui/templates/domain/details.html:42
 msgid "DKIM public key"
-msgstr ""
+msgstr "Llave pública DKIM"
 
 #: mailu/ui/templates/domain/details.html:46
 msgid "DNS DKIM entry"
-msgstr ""
+msgstr "Entrada DKIM en DNS"
 
 #: mailu/ui/templates/domain/details.html:50
 msgid "DNS DMARC entry"
-msgstr ""
+msgstr "Registro DMARC en DNS"
 
 #: mailu/ui/templates/domain/edit.html:4
 msgid "Edit domain"
@@ -352,15 +380,15 @@ msgstr "Lista de dominios"
 
 #: mailu/ui/templates/domain/list.html:17
 msgid "Manage"
-msgstr ""
+msgstr "Gestionar"
 
 #: mailu/ui/templates/domain/list.html:19
 msgid "Mailbox count"
-msgstr ""
+msgstr "Contar buzones"
 
 #: mailu/ui/templates/domain/list.html:20
 msgid "Alias count"
-msgstr ""
+msgstr "Contar alias"
 
 #: mailu/ui/templates/domain/list.html:28
 msgid "Details"
@@ -376,15 +404,15 @@ msgstr "Alias"
 
 #: mailu/ui/templates/domain/list.html:37
 msgid "Managers"
-msgstr ""
+msgstr "Gestores"
 
 #: mailu/ui/templates/fetch/create.html:4
 msgid "Add a fetched account"
-msgstr ""
+msgstr "Añadir una cuenta externa (fetched)"
 
 #: mailu/ui/templates/fetch/edit.html:4
 msgid "Update a fetched account"
-msgstr ""
+msgstr "Actualizar cuenta externa (fetched)"
 
 #: mailu/ui/templates/fetch/list.html:12
 msgid "Add an account"
@@ -392,7 +420,7 @@ msgstr "Añadir una cuenta"
 
 #: mailu/ui/templates/fetch/list.html:19
 msgid "Endpoint"
-msgstr ""
+msgstr "Punto final"
 
 #: mailu/ui/templates/fetch/list.html:22
 msgid "Last check"
@@ -400,23 +428,23 @@ msgstr "Último checkeo"
 
 #: mailu/ui/templates/manager/create.html:4
 msgid "Add a manager"
-msgstr ""
+msgstr "Añadir un gestor"
 
 #: mailu/ui/templates/manager/list.html:4
 msgid "Manager list"
-msgstr ""
+msgstr "Gestor de lista"
 
 #: mailu/ui/templates/manager/list.html:12
 msgid "Add manager"
-msgstr ""
+msgstr "Añadir un gestor"
 
 #: mailu/ui/forms.py:168
 msgid "Announcement subject"
-msgstr ""
+msgstr "Título del anuncio"
 
 #: mailu/ui/forms.py:170
 msgid "Announcement body"
-msgstr ""
+msgstr "Texto del anuncio"
 
 #: mailu/ui/forms.py:172
 msgid "Send"
@@ -428,7 +456,7 @@ msgstr "Anuncio público"
 
 #: mailu/ui/templates/announcement.html:8
 msgid "from"
-msgstr ""
+msgstr "De"
 
 #: mailu/ui/templates/sidebar.html:44
 msgid "Announcement"
@@ -444,7 +472,7 @@ msgstr "Editar usuario"
 
 #: mailu/ui/templates/user/forward.html:4
 msgid "Forward emails"
-msgstr ""
+msgstr "Redirigir correos"
 
 #: mailu/ui/templates/user/list.html:4
 msgid "User list"
@@ -472,7 +500,7 @@ msgstr "Respuesta automática"
 
 #: mailu/ui/forms.py:49
 msgid "Maximum user quota"
-msgstr ""
+msgstr "Límite de cuota de usuario"
 
 #: mailu/ui/forms.py:101
 msgid "Keep a copy of the emails"
@@ -496,31 +524,32 @@ msgstr "no"
 
 #: mailu/ui/forms.py:65
 msgid "Alternative name"
-msgstr ""
+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 ""
+msgstr "Nombre de.dominio a recepcionar"
 
 #: mailu/ui/forms.py:71 mailu/ui/templates/relay/list.html:18
 msgid "Remote host"
-msgstr ""
+msgstr "Servidor remoto"
 
 #: mailu/ui/templates/sidebar.html:54
 msgid "Relayed domains"
-msgstr ""
+msgstr "Dominios recepcionados (relayed)"
 
 #: mailu/ui/templates/alternative/create.html:4
 msgid "Create alternative domain"
-msgstr ""
+msgstr "Crear dominio alternativo"
 
 #: mailu/ui/templates/alternative/list.html:4
 msgid "Alternative domain list"
-msgstr ""
+msgstr "Lista de dominios alternativos"
 
 #: mailu/ui/templates/alternative/list.html:12
 msgid "Add alternative"
-msgstr ""
+msgstr "Añadir alternativa"
 
 #: mailu/ui/templates/alternative/list.html:19
 msgid "Name"
@@ -528,147 +557,147 @@ msgstr "Nombre"
 
 #: mailu/ui/templates/domain/list.html:39
 msgid "Alternatives"
-msgstr ""
+msgstr "Alternativas"
 
 #: mailu/ui/templates/relay/create.html:4
 msgid "New relay domain"
-msgstr ""
+msgstr "Nuevo dominio externo (relay)"
 
 #: mailu/ui/templates/relay/edit.html:4
 msgid "Edit relayd domain"
-msgstr ""
+msgstr "Editar dominio externo (relay)"
 
 #: mailu/ui/templates/relay/list.html:4
 msgid "Relayed domain list"
-msgstr ""
+msgstr "Lista de dominios externos (relayed)"
 
 #: mailu/ui/templates/relay/list.html:9
 msgid "New relayed domain"
-msgstr ""
+msgstr "Nuevo dominio externo (relayed)"
 
 #: mailu/ui/forms.py:125
 msgid "Your token (write it down, as it will never be displayed again)"
-msgstr ""
+msgstr "Sus llaves (token) (anótelas, ya que no se mostrarán nunca más)."
 
 #: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
 msgid "Authorized IP"
-msgstr ""
+msgstr "IP autorizada"
 
 #: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
 msgid "Authentication tokens"
-msgstr ""
+msgstr "Tokens (llaves) autorizados"
 
 #: mailu/ui/templates/sidebar.html:72
 msgid "Go to"
-msgstr ""
+msgstr "Ir a"
 
 #: mailu/ui/templates/sidebar.html:76
 msgid "Webmail"
-msgstr ""
+msgstr "Webmail"
 
 #: mailu/ui/templates/sidebar.html:87
 msgid "Website"
-msgstr ""
+msgstr "Web"
 
 #: mailu/ui/templates/token/create.html:4
 msgid "Create an authentication token"
-msgstr ""
+msgstr "Crear un token (llave) de autenticación."
 
 #: mailu/ui/templates/token/list.html:12
 msgid "New token"
-msgstr ""
+msgstr "Nuevo token"
 
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #: mailu/ui/templates/user/create.html:22
 msgid "Features and quotas"
-msgstr ""
+msgstr "Funcionalidades y cuotas"
 
 #: mailu/ui/templates/user/settings.html:14
 msgid "General settings"
-msgstr ""
+msgstr "Configuración general"
 
 #: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
 msgid "Antispam"
-msgstr ""
+msgstr "Antispam"
 
 #: mailu/ui/forms.py:99
 msgid "Spam filter tolerance"
-msgstr ""
+msgstr "Tolerancia del filtro de spam"
 
 #: mailu/ui/forms.py:50
 msgid "Enable sign-up"
-msgstr ""
+msgstr "Permitir registros"
 
 #: mailu/ui/forms.py:57
 msgid "Initial admin"
-msgstr ""
+msgstr "Administrador inicial"
 
 #: mailu/ui/forms.py:58
 msgid "Admin password"
-msgstr ""
+msgstr "Contraseña del administrador"
 
 #: mailu/ui/forms.py:84
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #: mailu/ui/forms.py:89
 msgid "Email address"
-msgstr ""
+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 ""
+msgstr "Registrarse"
 
 #: mailu/ui/forms.py:119
 msgid "End of vacation"
-msgstr ""
+msgstr "Fin de las vacaciones"
 
 #: mailu/ui/templates/client.html:4 mailu/ui/templates/sidebar.html:82
 msgid "Client setup"
-msgstr ""
+msgstr "Configuración del cliente"
 
 #: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
 msgid "Mail protocol"
-msgstr ""
+msgstr "Protocolo de correo"
 
 #: mailu/ui/templates/client.html:24 mailu/ui/templates/client.html:51
 msgid "Server name"
-msgstr ""
+msgstr "Nombre del servidor"
 
 #: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
 msgid "Register a domain"
-msgstr ""
+msgstr "Registrar un dominio"
 
 #: mailu/ui/templates/domain/details.html:17
 msgid "Generate keys"
-msgstr ""
+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 ""
+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 ""
+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/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "Seleccione un dominio para la nueva cuenta"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Dominio"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Slots disponibles"
 

From d99ad5fe3ea28922aaa477b212ea4abe4c048f2f Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 07:21:06 +0000
Subject: [PATCH 31/52] Added translation using Weblate (Hungarian)

---
 .../translations/hu/LC_MESSAGES/messages.po   | 669 ++++++++++++++++++
 1 file changed, 669 insertions(+)
 create mode 100644 core/admin/mailu/translations/hu/LC_MESSAGES/messages.po

diff --git a/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..1b0b67cc
--- /dev/null
+++ b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
@@ -0,0 +1,669 @@
+# Translations template for PROJECT.
+# Copyright (C) 2018 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2018.
+#
+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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: hu\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"
+
+#: 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
+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
+msgid "Password"
+msgstr ""
+
+#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:111
+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/ui/forms.py:47
+msgid "Maximum user count"
+msgstr ""
+
+#: mailu/ui/forms.py:48
+msgid "Maximum alias count"
+msgstr ""
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
+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/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/ui/forms.py:57
+msgid "Initial admin"
+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/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:97
+msgid "Displayed name"
+msgstr ""
+
+#: mailu/ui/forms.py:98
+msgid "Enable spam filter"
+msgstr ""
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
+msgstr ""
+
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr ""
+
+#: mailu/ui/forms.py:101
+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
+msgid "Destination"
+msgstr ""
+
+#: mailu/ui/forms.py:105
+msgid "Save settings"
+msgstr ""
+
+#: mailu/ui/forms.py:110
+msgid "Password check"
+msgstr ""
+
+#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr ""
+
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr ""
+
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr ""
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr ""
+
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:120
+msgid "Update"
+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 ""
+
+#: mailu/ui/forms.py:136
+msgid "Alias"
+msgstr ""
+
+#: mailu/ui/forms.py:138
+msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
+msgstr ""
+
+#: mailu/ui/forms.py:145
+msgid "Admin email"
+msgstr ""
+
+#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+msgid "Submit"
+msgstr ""
+
+#: mailu/ui/forms.py:150
+msgid "Manager email"
+msgstr ""
+
+#: mailu/ui/forms.py:155
+msgid "Protocol"
+msgstr ""
+
+#: mailu/ui/forms.py:158
+msgid "Hostname or IP"
+msgstr ""
+
+#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:47
+msgid "TCP port"
+msgstr ""
+
+#: mailu/ui/forms.py:160
+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
+msgid "Username"
+msgstr ""
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+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/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/confirm.html:4
+msgid "Confirm action"
+msgstr ""
+
+#: mailu/ui/templates/confirm.html:13
+#, python-format
+msgid "You are about to %(action)s. Please confirm your action."
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr ""
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-reply"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
+#: mailu/ui/templates/user/list.html:36
+msgid "Fetched accounts"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:54
+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
+msgid "Mail domains"
+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/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
+msgid "Sign out"
+msgstr ""
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr ""
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:9
+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
+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
+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
+msgid "Delete"
+msgstr ""
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:12
+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
+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
+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
+msgid "Edit"
+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/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:15
+msgid "Regenerate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:31
+msgid "DNS MX entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:35
+msgid "DNS SPF entries"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:42
+msgid "DKIM public key"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:46
+msgid "DNS DKIM entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:50
+msgid "DNS DMARC entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+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/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr ""
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr ""
+
+#: mailu/ui/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
+#: mailu/ui/templates/token/create.html:4
+msgid "Create an authentication token"
+msgstr ""
+
+#: mailu/ui/templates/token/list.html:12
+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
+msgid "Features and quotas"
+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/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:8
+msgid "pick a domain for the new account"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:14
+msgid "Domain"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:15
+msgid "Available slots"
+msgstr ""

From a150315c1dabfc36682aba7a0e455d87c45d7d8e Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 07:21:09 +0000
Subject: [PATCH 32/52] Added translation using Weblate (Japanese)

---
 .../translations/ja/LC_MESSAGES/messages.po   | 669 ++++++++++++++++++
 1 file changed, 669 insertions(+)
 create mode 100644 core/admin/mailu/translations/ja/LC_MESSAGES/messages.po

diff --git a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..3d71e298
--- /dev/null
+++ b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
@@ -0,0 +1,669 @@
+# Translations template for PROJECT.
+# Copyright (C) 2018 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2018.
+#
+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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: ja\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"
+
+#: 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
+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
+msgid "Password"
+msgstr ""
+
+#: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
+#: mailu/ui/templates/sidebar.html:111
+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/ui/forms.py:47
+msgid "Maximum user count"
+msgstr ""
+
+#: mailu/ui/forms.py:48
+msgid "Maximum alias count"
+msgstr ""
+
+#: mailu/ui/forms.py:49
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
+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/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/ui/forms.py:57
+msgid "Initial admin"
+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/ui/templates/user/signup_domain.html:4
+msgid "Sign up"
+msgstr ""
+
+#: mailu/ui/forms.py:97
+msgid "Displayed name"
+msgstr ""
+
+#: mailu/ui/forms.py:98
+msgid "Enable spam filter"
+msgstr ""
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
+msgstr ""
+
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr ""
+
+#: mailu/ui/forms.py:101
+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
+msgid "Destination"
+msgstr ""
+
+#: mailu/ui/forms.py:105
+msgid "Save settings"
+msgstr ""
+
+#: mailu/ui/forms.py:110
+msgid "Password check"
+msgstr ""
+
+#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr ""
+
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr ""
+
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr ""
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr ""
+
+#: mailu/ui/forms.py:119
+msgid "End of vacation"
+msgstr ""
+
+#: mailu/ui/forms.py:120
+msgid "Update"
+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 ""
+
+#: mailu/ui/forms.py:136
+msgid "Alias"
+msgstr ""
+
+#: mailu/ui/forms.py:138
+msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
+msgstr ""
+
+#: mailu/ui/forms.py:145
+msgid "Admin email"
+msgstr ""
+
+#: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
+msgid "Submit"
+msgstr ""
+
+#: mailu/ui/forms.py:150
+msgid "Manager email"
+msgstr ""
+
+#: mailu/ui/forms.py:155
+msgid "Protocol"
+msgstr ""
+
+#: mailu/ui/forms.py:158
+msgid "Hostname or IP"
+msgstr ""
+
+#: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
+#: mailu/ui/templates/client.html:47
+msgid "TCP port"
+msgstr ""
+
+#: mailu/ui/forms.py:160
+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
+msgid "Username"
+msgstr ""
+
+#: mailu/ui/forms.py:163
+msgid "Keep emails on the server"
+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/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/confirm.html:4
+msgid "Confirm action"
+msgstr ""
+
+#: mailu/ui/templates/confirm.html:13
+#, python-format
+msgid "You are about to %(action)s. Please confirm your action."
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr ""
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr ""
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-reply"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
+#: mailu/ui/templates/user/list.html:36
+msgid "Fetched accounts"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
+msgid "Authentication tokens"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:54
+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
+msgid "Mail domains"
+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/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
+msgid "Sign out"
+msgstr ""
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr ""
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr ""
+
+#: mailu/ui/templates/admin/list.html:9
+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
+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
+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
+msgid "Delete"
+msgstr ""
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:12
+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
+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
+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
+msgid "Edit"
+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/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:15
+msgid "Regenerate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:17
+msgid "Generate keys"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:31
+msgid "DNS MX entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:35
+msgid "DNS SPF entries"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:42
+msgid "DKIM public key"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:46
+msgid "DNS DKIM entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/details.html:50
+msgid "DNS DMARC entry"
+msgstr ""
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:39
+msgid "Alternatives"
+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/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:21
+msgid "Keep emails"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "yes"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:35
+msgid "no"
+msgstr ""
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr ""
+
+#: mailu/ui/templates/relay/create.html:4
+msgid "New relay domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr ""
+
+#: mailu/ui/templates/relay/list.html:9
+msgid "New relayed domain"
+msgstr ""
+
+#: mailu/ui/templates/token/create.html:4
+msgid "Create an authentication token"
+msgstr ""
+
+#: mailu/ui/templates/token/list.html:12
+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
+msgid "Features and quotas"
+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/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:8
+msgid "pick a domain for the new account"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:14
+msgid "Domain"
+msgstr ""
+
+#: mailu/ui/templates/user/signup_domain.html:15
+msgid "Available slots"
+msgstr ""

From 08bdc715bbc3e3dcaaac7b880d339edb2c29eec3 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:24:29 +0200
Subject: [PATCH 33/52] Update messages.po (POEditor.com)

---
 .../translations/hu/LC_MESSAGES/messages.po   | 734 +++++++++---------
 1 file changed, 384 insertions(+), 350 deletions(-)

diff --git a/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
index 1b0b67cc..1fe2cc38 100644
--- a/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/hu/LC_MESSAGES/messages.po
@@ -1,66 +1,48 @@
-# Translations template for PROJECT.
-# Copyright (C) 2018 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2018.
-#
 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"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: hu\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"
-"Generated-By: Babel 2.5.3\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: hu\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
-msgstr ""
+msgstr "Érvénytelen levelezési cím"
 
 #: mailu/ui/forms.py:36
 msgid "Confirm"
-msgstr ""
+msgstr "Megerősít"
 
 #: mailu/ui/forms.py:40 mailu/ui/forms.py:77
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #: 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
 msgid "Password"
-msgstr ""
+msgstr "Jelszó"
 
 #: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
 #: mailu/ui/templates/sidebar.html:111
 msgid "Sign in"
-msgstr ""
+msgstr "Belépés"
 
 #: 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 ""
+msgstr "Tartomány"
 
 #: mailu/ui/forms.py:47
 msgid "Maximum user count"
-msgstr ""
+msgstr "Maximális felhasználók száma"
 
 #: mailu/ui/forms.py:48
 msgid "Maximum alias count"
-msgstr ""
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr ""
-
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
+msgstr "Maximális álnevek száma"
 
 #: 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
@@ -68,308 +50,233 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
 #: mailu/ui/templates/user/list.html:23
 msgid "Comment"
-msgstr ""
+msgstr "Megjegyzés"
 
 #: 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/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
-
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
+msgstr "Létrehoz"
 
 #: 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 ""
+msgstr "Jelszó megerősítése"
 
 #: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
 #: mailu/ui/templates/user/signup_domain.html:16
 msgid "Quota"
-msgstr ""
+msgstr "Kvóta"
 
 #: mailu/ui/forms.py:81
 msgid "Allow IMAP access"
-msgstr ""
+msgstr "IMAP hozzáférés engedélyezése"
 
 #: mailu/ui/forms.py:82
 msgid "Allow POP3 access"
-msgstr ""
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
+msgstr "POP3 hozzáférés engedélyezéseq"
 
 #: 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/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
+msgstr "Mentés"
 
 #: mailu/ui/forms.py:97
 msgid "Displayed name"
-msgstr ""
+msgstr "Megjelenő név"
 
 #: mailu/ui/forms.py:98
 msgid "Enable spam filter"
-msgstr ""
+msgstr "Levélszemét szűrő engedélyezése"
 
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr ""
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
+msgstr "Levélszemét szűrő korlátja"
+
+#: mailu/ui/forms.py:105
+msgid "Save settings"
+msgstr "Beállítások mentése"
+
+#: mailu/ui/forms.py:110
+msgid "Password check"
+msgstr "Jelszó ellenőrzése"
+
+#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
+msgid "Update password"
+msgstr "Jelszó frissítése"
 
 #: mailu/ui/forms.py:100
 msgid "Enable forwarding"
-msgstr ""
-
-#: mailu/ui/forms.py:101
-msgid "Keep a copy of the emails"
-msgstr ""
+msgstr "Továbbítás engedélyezése"
 
 #: mailu/ui/forms.py:103 mailu/ui/forms.py:139
 #: mailu/ui/templates/alias/list.html:20
 msgid "Destination"
-msgstr ""
-
-#: mailu/ui/forms.py:105
-msgid "Save settings"
-msgstr ""
-
-#: mailu/ui/forms.py:110
-msgid "Password check"
-msgstr ""
-
-#: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
-msgid "Update password"
-msgstr ""
-
-#: mailu/ui/forms.py:115
-msgid "Enable automatic reply"
-msgstr ""
-
-#: mailu/ui/forms.py:116
-msgid "Reply subject"
-msgstr ""
-
-#: mailu/ui/forms.py:117
-msgid "Reply body"
-msgstr ""
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
+msgstr "Cél"
 
 #: mailu/ui/forms.py:120
 msgid "Update"
-msgstr ""
+msgstr "Frissítés"
 
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr ""
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr "Automatikus válasz engedélyezése"
 
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr ""
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr "Válasz tárgya"
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr "Válasz levéltörzs"
 
 #: mailu/ui/forms.py:136
 msgid "Alias"
-msgstr ""
+msgstr "Álnév"
 
 #: mailu/ui/forms.py:138
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
-msgstr ""
+msgstr "SQL-szerű kifejezések használata (pl.: mint a catch-all álnevek)"
 
 #: mailu/ui/forms.py:145
 msgid "Admin email"
-msgstr ""
+msgstr "Adminisztrátor címe"
 
 #: mailu/ui/forms.py:146 mailu/ui/forms.py:151 mailu/ui/forms.py:164
 msgid "Submit"
-msgstr ""
+msgstr "Elküldés"
 
 #: mailu/ui/forms.py:150
 msgid "Manager email"
-msgstr ""
+msgstr "Menedzser címe"
 
 #: mailu/ui/forms.py:155
 msgid "Protocol"
-msgstr ""
+msgstr "Protokoll"
 
 #: mailu/ui/forms.py:158
 msgid "Hostname or IP"
-msgstr ""
+msgstr "Hosztnév vagy IP"
 
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
 msgid "TCP port"
-msgstr ""
+msgstr "TCP port"
 
 #: mailu/ui/forms.py:160
 msgid "Enable TLS"
-msgstr ""
+msgstr "TLS engedélyezése"
 
 #: mailu/ui/forms.py:161 mailu/ui/templates/client.html:28
 #: mailu/ui/templates/client.html:55 mailu/ui/templates/fetch/list.html:20
 msgid "Username"
-msgstr ""
-
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
-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/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 ""
+msgstr "Felhasználó neve"
 
 #: mailu/ui/templates/confirm.html:4
 msgid "Confirm action"
-msgstr ""
+msgstr "Megerősítés"
 
 #: mailu/ui/templates/confirm.html:13
-#, python-format
 msgid "You are about to %(action)s. Please confirm your action."
-msgstr ""
+msgstr "%(action) megerősítése."
 
 #: mailu/ui/templates/docker-error.html:4
 msgid "Docker error"
-msgstr ""
+msgstr "Docker hiba"
 
 #: mailu/ui/templates/docker-error.html:12
 msgid "An error occurred while talking to the Docker server."
-msgstr ""
+msgstr "Hiba lépett fel a Docker kiszolgáló kommunikációjában."
+
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
+msgstr "Saját fiók"
 
 #: mailu/ui/templates/login.html:8
 msgid "to access the administration tools"
-msgstr ""
+msgstr "az rendszergazai eszközökhöz fér hozzá"
+
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+msgstr "Szolgáltatások állapota"
+
+#: mailu/ui/templates/services.html:10
+msgid "Service"
+msgstr "Szolgáltatás"
+
+#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
+msgid "Status"
+msgstr "Állapot"
+
+#: mailu/ui/templates/services.html:12
+msgid "PID"
+msgstr "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Kép"
+
+#: mailu/ui/templates/services.html:14
+msgid "Started"
+msgstr "Elindítva"
+
+#: mailu/ui/templates/services.html:15
+msgid "Last update"
+msgstr "Utolsó frissítés"
+
+#: mailu/ui/templates/sidebar.html:8
+msgid "My account"
+msgstr "Saját fiók"
 
 #: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
 msgid "Settings"
-msgstr ""
+msgstr "Beállítások"
+
+#: mailu/ui/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr "Automatikus továbbítás"
 
 #: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
 msgid "Auto-reply"
-msgstr ""
+msgstr "Automatikus válasz"
 
 #: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
 #: mailu/ui/templates/user/list.html:36
 msgid "Fetched accounts"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:35
-msgid "Administration"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:44
-msgid "Announcement"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:49
-msgid "Administrators"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:54
-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
-msgid "Mail domains"
-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/sidebar.html:92
-msgid "Help"
-msgstr ""
-
-#: mailu/ui/templates/domain/signup.html:4 mailu/ui/templates/sidebar.html:98
-msgid "Register a domain"
-msgstr ""
+msgstr "Letöltött fiókok"
 
 #: mailu/ui/templates/sidebar.html:105
 msgid "Sign out"
-msgstr ""
+msgstr "Kilépés"
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr "Adminisztrátor"
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr "Adminisztrátorok"
+
+#: mailu/ui/templates/sidebar.html:66
+msgid "Mail domains"
+msgstr "Levelezési tartomány"
+
+#: mailu/ui/templates/sidebar.html:92
+msgid "Help"
+msgstr "Súgó"
 
 #: mailu/ui/templates/working.html:4
 msgid "We are still working on this feature!"
-msgstr ""
+msgstr "Ezen a funkción még dolgozunk"
 
 #: mailu/ui/templates/admin/create.html:4
 msgid "Add a global administrator"
-msgstr ""
+msgstr "Globális adminisztrátor hozzáadása"
 
 #: mailu/ui/templates/admin/list.html:4
 msgid "Global administrators"
-msgstr ""
+msgstr "Globális adminisztrátorok"
 
 #: mailu/ui/templates/admin/list.html:9
 msgid "Add administrator"
-msgstr ""
+msgstr "Adminisztrátor hozzáadása"
 
 #: mailu/ui/templates/admin/list.html:16 mailu/ui/templates/alias/list.html:18
 #: mailu/ui/templates/alternative/list.html:18
@@ -378,12 +285,12 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18
 #: mailu/ui/templates/user/list.html:18
 msgid "Actions"
-msgstr ""
+msgstr "Tevékenység"
 
 #: 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
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #: mailu/ui/templates/admin/list.html:22 mailu/ui/templates/alias/list.html:29
 #: mailu/ui/templates/alternative/list.html:25
@@ -392,23 +299,23 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26
 #: mailu/ui/templates/user/list.html:31
 msgid "Delete"
-msgstr ""
+msgstr "Törlés"
 
 #: mailu/ui/templates/alias/create.html:4
 msgid "Create alias"
-msgstr ""
+msgstr "Álnév létrehozása"
 
 #: mailu/ui/templates/alias/edit.html:4
 msgid "Edit alias"
-msgstr ""
+msgstr "Álnév szerkesztése"
 
 #: mailu/ui/templates/alias/list.html:4
 msgid "Alias list"
-msgstr ""
+msgstr "Álnevek listája"
 
 #: mailu/ui/templates/alias/list.html:12
 msgid "Add alias"
-msgstr ""
+msgstr "Álnév hozzáadása"
 
 #: mailu/ui/templates/alias/list.html:22
 #: mailu/ui/templates/alternative/list.html:20
@@ -416,254 +323,381 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21
 #: mailu/ui/templates/user/list.html:24
 msgid "Created"
-msgstr ""
+msgstr "Létrehozva"
 
 #: 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
 msgid "Last edit"
-msgstr ""
+msgstr "Utolsó szerkesztés"
 
 #: 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
 msgid "Edit"
-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 ""
+msgstr "Szerkesztés"
 
 #: mailu/ui/templates/domain/create.html:4
 #: mailu/ui/templates/domain/list.html:9
 msgid "New domain"
-msgstr ""
+msgstr "Új tartomány"
 
 #: mailu/ui/templates/domain/details.html:4
 msgid "Domain details"
-msgstr ""
+msgstr "Tartomány részletei"
 
 #: mailu/ui/templates/domain/details.html:15
 msgid "Regenerate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
+msgstr "Kulcsok újragenerálása"
 
 #: mailu/ui/templates/domain/details.html:31
 msgid "DNS MX entry"
-msgstr ""
+msgstr "DNS MX rekord"
 
 #: mailu/ui/templates/domain/details.html:35
 msgid "DNS SPF entries"
-msgstr ""
+msgstr "DNS SPF rekord"
 
 #: mailu/ui/templates/domain/details.html:42
 msgid "DKIM public key"
-msgstr ""
+msgstr "DKIM nyilvános kulcs"
 
 #: mailu/ui/templates/domain/details.html:46
 msgid "DNS DKIM entry"
-msgstr ""
+msgstr "DNS DKIM rekord"
 
 #: mailu/ui/templates/domain/details.html:50
 msgid "DNS DMARC entry"
-msgstr ""
+msgstr "DNS DMARC rekord"
 
 #: mailu/ui/templates/domain/edit.html:4
 msgid "Edit domain"
-msgstr ""
+msgstr "Tartomány szerkesztése"
 
 #: mailu/ui/templates/domain/list.html:4
 msgid "Domain list"
-msgstr ""
+msgstr "Tartományok listája"
 
 #: mailu/ui/templates/domain/list.html:17
 msgid "Manage"
-msgstr ""
+msgstr "Kezelés"
 
 #: mailu/ui/templates/domain/list.html:19
 msgid "Mailbox count"
-msgstr ""
+msgstr "Postaládák száma"
 
 #: mailu/ui/templates/domain/list.html:20
 msgid "Alias count"
-msgstr ""
+msgstr "Álnevek száma"
 
 #: mailu/ui/templates/domain/list.html:28
 msgid "Details"
-msgstr ""
+msgstr "Részletek"
 
 #: mailu/ui/templates/domain/list.html:35
 msgid "Users"
-msgstr ""
+msgstr "Felhasználók"
 
 #: mailu/ui/templates/domain/list.html:36
 msgid "Aliases"
-msgstr ""
+msgstr "Álnevek"
 
 #: mailu/ui/templates/domain/list.html:37
 msgid "Managers"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:39
-msgid "Alternatives"
-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 ""
+msgstr "Kezelők"
 
 #: mailu/ui/templates/fetch/create.html:4
 msgid "Add a fetched account"
-msgstr ""
+msgstr "Letöltött fiók hozzáadása"
 
 #: mailu/ui/templates/fetch/edit.html:4
 msgid "Update a fetched account"
-msgstr ""
+msgstr "Letöltött fiók frissítése"
 
 #: mailu/ui/templates/fetch/list.html:12
 msgid "Add an account"
-msgstr ""
+msgstr "Fiók hozzáadása"
 
 #: mailu/ui/templates/fetch/list.html:19
 msgid "Endpoint"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr ""
+msgstr "Végpont"
 
 #: mailu/ui/templates/fetch/list.html:22
 msgid "Last check"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr ""
+msgstr "Utolsó ellenőrzés"
 
 #: mailu/ui/templates/manager/create.html:4
 msgid "Add a manager"
-msgstr ""
+msgstr "Kezelő hozzáadása"
 
 #: mailu/ui/templates/manager/list.html:4
 msgid "Manager list"
-msgstr ""
+msgstr "Kezelők listája"
 
 #: mailu/ui/templates/manager/list.html:12
 msgid "Add manager"
-msgstr ""
+msgstr "Kezelő hozzáadása"
 
-#: mailu/ui/templates/relay/create.html:4
-msgid "New relay domain"
-msgstr ""
+#: mailu/ui/forms.py:168
+msgid "Announcement subject"
+msgstr "Bejelentés tárgya"
 
-#: mailu/ui/templates/relay/edit.html:4
-msgid "Edit relayd domain"
-msgstr ""
+#: mailu/ui/forms.py:170
+msgid "Announcement body"
+msgstr "Bejelentés levéltörzs"
 
-#: mailu/ui/templates/relay/list.html:4
-msgid "Relayed domain list"
-msgstr ""
+#: mailu/ui/forms.py:172
+msgid "Send"
+msgstr "Küldés"
 
-#: mailu/ui/templates/relay/list.html:9
-msgid "New relayed domain"
-msgstr ""
+#: mailu/ui/templates/announcement.html:4
+msgid "Public announcement"
+msgstr "Nyilvános bejelentés"
 
-#: mailu/ui/templates/token/create.html:4
-msgid "Create an authentication token"
-msgstr ""
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
+msgstr "küldő"
 
-#: mailu/ui/templates/token/list.html:12
-msgid "New token"
-msgstr ""
+#: mailu/ui/templates/sidebar.html:44
+msgid "Announcement"
+msgstr "Bejelentés"
 
 #: 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
-msgid "Features and quotas"
-msgstr ""
+msgstr "Új felhasználó"
 
 #: mailu/ui/templates/user/edit.html:4
 msgid "Edit user"
-msgstr ""
+msgstr "Felhasználó szerkesztése"
 
 #: mailu/ui/templates/user/forward.html:4
 msgid "Forward emails"
-msgstr ""
+msgstr "Továbbítás"
 
 #: mailu/ui/templates/user/list.html:4
 msgid "User list"
-msgstr ""
+msgstr "Felhasználók"
 
 #: mailu/ui/templates/user/list.html:12
 msgid "Add user"
-msgstr ""
+msgstr "Felhasználó hozzáadása"
 
 #: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
 msgid "User settings"
-msgstr ""
+msgstr "Felhasználói beállítások"
 
 #: mailu/ui/templates/user/list.html:21
 msgid "Features"
-msgstr ""
+msgstr "Jellemzők"
 
 #: mailu/ui/templates/user/password.html:4
 msgid "Password update"
-msgstr ""
+msgstr "Jelszó frissítése"
 
 #: mailu/ui/templates/user/reply.html:4
 msgid "Automatic reply"
-msgstr ""
+msgstr "Automatikus válasz"
 
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
-msgstr ""
+#: 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"
+
+#: mailu/ui/templates/relay/edit.html:4
+msgid "Edit relayd domain"
+msgstr "Továbbított tartomány szerkesztése"
+
+#: mailu/ui/templates/relay/list.html:4
+msgid "Relayed domain list"
+msgstr "Továbbított tartományok"
+
+#: mailu/ui/templates/relay/list.html:9
+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"
+
+#: mailu/ui/templates/token/list.html:12
+msgid "New token"
+msgstr "Új token"
+
+#: mailu/ui/templates/user/create.html:15
+msgid "General"
+msgstr "Általános"
+
+#: mailu/ui/templates/user/create.html:22
+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/sidebar.html:59 mailu/ui/templates/user/settings.html:15
+msgid "Antispam"
+msgstr "Levélszemét szűrő"
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
+msgstr "Szűrő tolerancia"
+
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
+msgstr "Feliratkozás engedélyezése"
+
+#: mailu/ui/forms.py:57
+msgid "Initial admin"
+msgstr "Kezdeti adminisztrátor"
+
+#: mailu/ui/forms.py:58
+msgid "Admin password"
+msgstr "Adminisztrátor jelszó"
+
+#: mailu/ui/forms.py:84
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: 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/signup_domain.html:8
 msgid "pick a domain for the new account"
-msgstr ""
+msgstr "válasszon tartományt az új fiókhoz"
 
 #: mailu/ui/templates/user/signup_domain.html:14
 msgid "Domain"
-msgstr ""
+msgstr "Tartomány"
 
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
-msgstr ""
+msgstr "Elérhető rekeszek"
+

From 645c423d09adcba19e721957ae767cf48d221287 Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:24:31 +0200
Subject: [PATCH 34/52] Update messages.po (POEditor.com)

---
 .../translations/ja/LC_MESSAGES/messages.po   | 913 +++++++++---------
 1 file changed, 473 insertions(+), 440 deletions(-)

diff --git a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
index 3d71e298..1215b6b3 100644
--- a/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ja/LC_MESSAGES/messages.po
@@ -1,25 +1,15 @@
-# Translations template for PROJECT.
-# Copyright (C) 2018 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2018.
-#
 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"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: ja\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"
-"Generated-By: Babel 2.5.3\n"
+"X-Generator: POEditor.com\n"
+"Project-Id-Version: Mailu\n"
+"Language: ja\n"
 
 #: mailu/ui/forms.py:32
 msgid "Invalid email address."
-msgstr ""
+msgstr "無効なメールアドレスです"
 
 #: mailu/ui/forms.py:36
 msgid "Confirm"
@@ -27,40 +17,32 @@ msgstr ""
 
 #: mailu/ui/forms.py:40 mailu/ui/forms.py:77
 msgid "E-mail"
-msgstr ""
+msgstr "E-Mailアドレス"
 
 #: 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
 msgid "Password"
-msgstr ""
+msgstr "パスワード"
 
 #: mailu/ui/forms.py:42 mailu/ui/templates/login.html:4
 #: mailu/ui/templates/sidebar.html:111
 msgid "Sign in"
-msgstr ""
+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 ""
+msgstr "ドメイン名"
 
 #: mailu/ui/forms.py:47
 msgid "Maximum user count"
-msgstr ""
+msgstr "最大ユーザー数"
 
 #: mailu/ui/forms.py:48
 msgid "Maximum alias count"
-msgstr ""
-
-#: mailu/ui/forms.py:49
-msgid "Maximum user quota"
-msgstr ""
-
-#: mailu/ui/forms.py:50
-msgid "Enable sign-up"
-msgstr ""
+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
@@ -68,136 +50,86 @@ msgstr ""
 #: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19
 #: mailu/ui/templates/user/list.html:23
 msgid "Comment"
-msgstr ""
+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/ui/forms.py:57
-msgid "Initial admin"
-msgstr ""
-
-#: mailu/ui/forms.py:58
-msgid "Admin password"
-msgstr ""
+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 ""
+msgstr "パスワード(再入力)"
 
 #: mailu/ui/forms.py:80 mailu/ui/templates/user/list.html:22
 #: mailu/ui/templates/user/signup_domain.html:16
 msgid "Quota"
-msgstr ""
+msgstr "容量"
 
 #: mailu/ui/forms.py:81
 msgid "Allow IMAP access"
-msgstr ""
+msgstr "IMAPアクセスを許可"
 
 #: mailu/ui/forms.py:82
 msgid "Allow POP3 access"
-msgstr ""
-
-#: mailu/ui/forms.py:84
-msgid "Enabled"
-msgstr ""
+msgstr "POP3アクセスを許可"
 
 #: 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/ui/templates/user/signup_domain.html:4
-msgid "Sign up"
-msgstr ""
+msgstr "保存"
 
 #: mailu/ui/forms.py:97
 msgid "Displayed name"
-msgstr ""
+msgstr "表示名"
 
 #: mailu/ui/forms.py:98
 msgid "Enable spam filter"
-msgstr ""
+msgstr "スパムフィルターを有効"
 
-#: mailu/ui/forms.py:99
-msgid "Spam filter tolerance"
-msgstr ""
-
-#: mailu/ui/forms.py:100
-msgid "Enable forwarding"
-msgstr ""
-
-#: mailu/ui/forms.py:101
-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
-msgid "Destination"
+#: mailu/ui/forms.py:80
+msgid "Spam filter threshold"
 msgstr ""
 
 #: mailu/ui/forms.py:105
 msgid "Save settings"
-msgstr ""
+msgstr "設定を保存"
 
 #: mailu/ui/forms.py:110
 msgid "Password check"
-msgstr ""
+msgstr "パスワード(再入力)"
 
 #: mailu/ui/forms.py:111 mailu/ui/templates/sidebar.html:16
 msgid "Update password"
-msgstr ""
+msgstr "パスワード変更"
 
-#: mailu/ui/forms.py:115
-msgid "Enable automatic reply"
-msgstr ""
+#: mailu/ui/forms.py:100
+msgid "Enable forwarding"
+msgstr "自動転送を有効"
 
-#: mailu/ui/forms.py:116
-msgid "Reply subject"
-msgstr ""
-
-#: mailu/ui/forms.py:117
-msgid "Reply body"
-msgstr ""
-
-#: mailu/ui/forms.py:119
-msgid "End of vacation"
-msgstr ""
+#: mailu/ui/forms.py:103 mailu/ui/forms.py:139
+#: mailu/ui/templates/alias/list.html:20
+msgid "Destination"
+msgstr "宛先"
 
 #: mailu/ui/forms.py:120
 msgid "Update"
-msgstr ""
+msgstr "更新"
 
-#: mailu/ui/forms.py:125
-msgid "Your token (write it down, as it will never be displayed again)"
-msgstr ""
+#: mailu/ui/forms.py:115
+msgid "Enable automatic reply"
+msgstr "自動返信を有効"
 
-#: mailu/ui/forms.py:130 mailu/ui/templates/token/list.html:20
-msgid "Authorized IP"
-msgstr ""
+#: mailu/ui/forms.py:116
+msgid "Reply subject"
+msgstr "返信件名"
+
+#: mailu/ui/forms.py:117
+msgid "Reply body"
+msgstr "返信本文"
 
 #: mailu/ui/forms.py:136
 msgid "Alias"
-msgstr ""
+msgstr "エイリアス名"
 
 #: mailu/ui/forms.py:138
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
@@ -213,15 +145,15 @@ msgstr ""
 
 #: mailu/ui/forms.py:150
 msgid "Manager email"
-msgstr ""
+msgstr "管理者メールアドレス"
 
 #: mailu/ui/forms.py:155
 msgid "Protocol"
-msgstr ""
+msgstr "プロトコル"
 
 #: mailu/ui/forms.py:158
 msgid "Hostname or IP"
-msgstr ""
+msgstr "ホスト名またはIPアドレス"
 
 #: mailu/ui/forms.py:159 mailu/ui/templates/client.html:20
 #: mailu/ui/templates/client.html:47
@@ -235,12 +167,277 @@ 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
 msgid "Username"
+msgstr "ユーザー名"
+
+#: mailu/ui/templates/confirm.html:4
+msgid "Confirm action"
 msgstr ""
 
-#: mailu/ui/forms.py:163
-msgid "Keep emails on the server"
+#: mailu/ui/templates/confirm.html:13
+msgid "You are about to %(action)s. Please confirm your action."
 msgstr ""
 
+#: mailu/ui/templates/docker-error.html:4
+msgid "Docker error"
+msgstr "Docker エラー"
+
+#: mailu/ui/templates/docker-error.html:12
+msgid "An error occurred while talking to the Docker server."
+msgstr ""
+
+#: mailu/admin/templates/login.html:6
+msgid "Your account"
+msgstr ""
+
+#: mailu/ui/templates/login.html:8
+msgid "to access the administration tools"
+msgstr "管理画面"
+
+#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
+msgid "Services status"
+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 "PID"
+
+#: mailu/ui/templates/services.html:13
+msgid "Image"
+msgstr "Docker イメージ"
+
+#: 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
+msgid "My account"
+msgstr "アカウント設定"
+
+#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
+msgid "Settings"
+msgstr "設定"
+
+#: mailu/ui/templates/user/settings.html:22
+msgid "Auto-forward"
+msgstr "自動転送"
+
+#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
+msgid "Auto-reply"
+msgstr "自動返信"
+
+#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
+#: mailu/ui/templates/user/list.html:36
+msgid "Fetched accounts"
+msgstr ""
+
+#: mailu/ui/templates/sidebar.html:105
+msgid "Sign out"
+msgstr "ログアウト"
+
+#: mailu/ui/templates/sidebar.html:35
+msgid "Administration"
+msgstr "サービス設定"
+
+#: mailu/ui/templates/sidebar.html:49
+msgid "Administrators"
+msgstr "管理者"
+
+#: mailu/ui/templates/sidebar.html:66
+msgid "Mail domains"
+msgstr "メールドメイン"
+
+#: mailu/ui/templates/sidebar.html:92
+msgid "Help"
+msgstr "ヘルプ"
+
+#: mailu/ui/templates/working.html:4
+msgid "We are still working on this feature!"
+msgstr ""
+
+#: mailu/ui/templates/admin/create.html:4
+msgid "Add a global administrator"
+msgstr "グローバル管理者を追加"
+
+#: mailu/ui/templates/admin/list.html:4
+msgid "Global administrators"
+msgstr "グローバル管理者"
+
+#: mailu/ui/templates/admin/list.html:9
+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
+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
+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
+msgid "Delete"
+msgstr "削除"
+
+#: mailu/ui/templates/alias/create.html:4
+msgid "Create alias"
+msgstr "エイリアスを作成"
+
+#: mailu/ui/templates/alias/edit.html:4
+msgid "Edit alias"
+msgstr ""
+
+#: mailu/ui/templates/alias/list.html:4
+msgid "Alias list"
+msgstr "エイリアス一覧"
+
+#: mailu/ui/templates/alias/list.html:12
+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
+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
+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
+msgid "Edit"
+msgstr ""
+
+#: mailu/ui/templates/domain/create.html:4
+#: mailu/ui/templates/domain/list.html:9
+msgid "New domain"
+msgstr "ドメイン名を追加"
+
+#: mailu/ui/templates/domain/details.html:4
+msgid "Domain details"
+msgstr "ドメイン名詳細"
+
+#: mailu/ui/templates/domain/details.html:15
+msgid "Regenerate keys"
+msgstr "鍵を再生成"
+
+#: mailu/ui/templates/domain/details.html:31
+msgid "DNS MX entry"
+msgstr "DNS MXエントリ"
+
+#: mailu/ui/templates/domain/details.html:35
+msgid "DNS SPF entries"
+msgstr "DNS SPFエントリ"
+
+#: mailu/ui/templates/domain/details.html:42
+msgid "DKIM public key"
+msgstr "DKIM公開鍵"
+
+#: mailu/ui/templates/domain/details.html:46
+msgid "DNS DKIM entry"
+msgstr "DNS DKIMエントリ"
+
+#: mailu/ui/templates/domain/details.html:50
+msgid "DNS DMARC entry"
+msgstr "DNS DMARCエントリ"
+
+#: mailu/ui/templates/domain/edit.html:4
+msgid "Edit domain"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:4
+msgid "Domain list"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:17
+msgid "Manage"
+msgstr "管理"
+
+#: mailu/ui/templates/domain/list.html:19
+msgid "Mailbox count"
+msgstr "メールボックス数"
+
+#: mailu/ui/templates/domain/list.html:20
+msgid "Alias count"
+msgstr "エイリアス数"
+
+#: mailu/ui/templates/domain/list.html:28
+msgid "Details"
+msgstr "詳細"
+
+#: mailu/ui/templates/domain/list.html:35
+msgid "Users"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:36
+msgid "Aliases"
+msgstr ""
+
+#: mailu/ui/templates/domain/list.html:37
+msgid "Managers"
+msgstr ""
+
+#: mailu/ui/templates/fetch/create.html:4
+msgid "Add a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/edit.html:4
+msgid "Update a fetched account"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:12
+msgid "Add an account"
+msgstr "アカウントを追加"
+
+#: mailu/ui/templates/fetch/list.html:19
+msgid "Endpoint"
+msgstr ""
+
+#: mailu/ui/templates/fetch/list.html:22
+msgid "Last check"
+msgstr ""
+
+#: mailu/ui/templates/manager/create.html:4
+msgid "Add a manager"
+msgstr ""
+
+#: mailu/ui/templates/manager/list.html:4
+msgid "Manager list"
+msgstr "管理者一覧"
+
+#: mailu/ui/templates/manager/list.html:12
+msgid "Add manager"
+msgstr "管理者を追加"
+
 #: mailu/ui/forms.py:168
 msgid "Announcement subject"
 msgstr ""
@@ -257,178 +454,89 @@ msgstr ""
 msgid "Public announcement"
 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/confirm.html:4
-msgid "Confirm action"
-msgstr ""
-
-#: mailu/ui/templates/confirm.html:13
-#, python-format
-msgid "You are about to %(action)s. Please confirm your action."
-msgstr ""
-
-#: mailu/ui/templates/docker-error.html:4
-msgid "Docker error"
-msgstr ""
-
-#: mailu/ui/templates/docker-error.html:12
-msgid "An error occurred while talking to the Docker server."
-msgstr ""
-
-#: mailu/ui/templates/login.html:8
-msgid "to access the administration tools"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
-msgid "Settings"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:21 mailu/ui/templates/user/list.html:35
-msgid "Auto-reply"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:4 mailu/ui/templates/sidebar.html:26
-#: mailu/ui/templates/user/list.html:36
-msgid "Fetched accounts"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:31 mailu/ui/templates/token/list.html:4
-msgid "Authentication tokens"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:35
-msgid "Administration"
+#: mailu/ui/templates/announcement.html:8
+msgid "from"
 msgstr ""
 
 #: mailu/ui/templates/sidebar.html:44
 msgid "Announcement"
 msgstr ""
 
-#: mailu/ui/templates/sidebar.html:49
-msgid "Administrators"
+#: 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/sidebar.html:59 mailu/ui/templates/user/settings.html:15
-msgid "Antispam"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:66
-msgid "Mail domains"
-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/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
-msgid "Sign out"
-msgstr ""
-
-#: mailu/ui/templates/working.html:4
-msgid "We are still working on this feature!"
-msgstr ""
-
-#: mailu/ui/templates/admin/create.html:4
-msgid "Add a global administrator"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:4
-msgid "Global administrators"
-msgstr ""
-
-#: mailu/ui/templates/admin/list.html:9
-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
-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
-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
-msgid "Delete"
-msgstr ""
-
-#: mailu/ui/templates/alias/create.html:4
-msgid "Create alias"
-msgstr ""
-
-#: mailu/ui/templates/alias/edit.html:4
-msgid "Edit alias"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:4
-msgid "Alias list"
-msgstr ""
-
-#: mailu/ui/templates/alias/list.html:12
-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
-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
-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
-msgid "Edit"
-msgstr ""
+msgstr "リレードメイン"
 
 #: mailu/ui/templates/alternative/create.html:4
 msgid "Create alternative domain"
@@ -446,147 +554,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: mailu/ui/templates/domain/create.html:4
-#: mailu/ui/templates/domain/list.html:9
-msgid "New domain"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:4
-msgid "Domain details"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:15
-msgid "Regenerate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:17
-msgid "Generate keys"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:31
-msgid "DNS MX entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:35
-msgid "DNS SPF entries"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:42
-msgid "DKIM public key"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:46
-msgid "DNS DKIM entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/details.html:50
-msgid "DNS DMARC entry"
-msgstr ""
-
-#: mailu/ui/templates/domain/edit.html:4
-msgid "Edit domain"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:4
-msgid "Domain list"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:17
-msgid "Manage"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:19
-msgid "Mailbox count"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:20
-msgid "Alias count"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:28
-msgid "Details"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:35
-msgid "Users"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:36
-msgid "Aliases"
-msgstr ""
-
-#: mailu/ui/templates/domain/list.html:37
-msgid "Managers"
-msgstr ""
-
 #: mailu/ui/templates/domain/list.html:39
 msgid "Alternatives"
 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/fetch/create.html:4
-msgid "Add a fetched account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/edit.html:4
-msgid "Update a fetched account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:12
-msgid "Add an account"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:19
-msgid "Endpoint"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:21
-msgid "Keep emails"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:22
-msgid "Last check"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "yes"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:35
-msgid "no"
-msgstr ""
-
-#: mailu/ui/templates/manager/create.html:4
-msgid "Add a manager"
-msgstr ""
-
-#: mailu/ui/templates/manager/list.html:4
-msgid "Manager list"
-msgstr ""
-
-#: mailu/ui/templates/manager/list.html:12
-msgid "Add manager"
-msgstr ""
-
 #: mailu/ui/templates/relay/create.html:4
 msgid "New relay domain"
-msgstr ""
+msgstr "リレードメイン名を追加"
 
 #: mailu/ui/templates/relay/edit.html:4
 msgid "Edit relayd domain"
@@ -598,62 +572,120 @@ msgstr ""
 
 #: mailu/ui/templates/relay/list.html:9
 msgid "New relayed domain"
-msgstr ""
+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 ""
+msgstr "認証トークンを作成"
 
 #: mailu/ui/templates/token/list.html:12
 msgid "New token"
-msgstr ""
-
-#: mailu/ui/templates/user/create.html:4
-msgid "New user"
-msgstr ""
+msgstr "トークンを作成"
 
 #: mailu/ui/templates/user/create.html:15
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #: mailu/ui/templates/user/create.html:22
 msgid "Features and quotas"
+msgstr "サーバ機能と容量"
+
+#: mailu/ui/templates/user/settings.html:14
+msgid "General settings"
+msgstr "一般設定"
+
+#: mailu/ui/templates/sidebar.html:59 mailu/ui/templates/user/settings.html:15
+msgid "Antispam"
+msgstr "スパムメール対策"
+
+#: mailu/ui/forms.py:99
+msgid "Spam filter tolerance"
 msgstr ""
 
-#: mailu/ui/templates/user/edit.html:4
-msgid "Edit user"
+#: mailu/ui/forms.py:50
+msgid "Enable sign-up"
 msgstr ""
 
-#: mailu/ui/templates/user/forward.html:4
-msgid "Forward emails"
+#: mailu/ui/forms.py:57
+msgid "Initial admin"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:4
-msgid "User list"
+#: mailu/ui/forms.py:58
+msgid "Admin password"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:12
-msgid "Add user"
+#: mailu/ui/forms.py:84
+msgid "Enabled"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:19 mailu/ui/templates/user/settings.html:4
-msgid "User settings"
+#: mailu/ui/forms.py:89
+msgid "Email address"
 msgstr ""
 
-#: mailu/ui/templates/user/list.html:21
-msgid "Features"
+#: 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/templates/user/password.html:4
-msgid "Password update"
+#: 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/user/reply.html:4
-msgid "Automatic reply"
+#: mailu/ui/templates/client.html:16 mailu/ui/templates/client.html:43
+msgid "Mail protocol"
 msgstr ""
 
-#: mailu/ui/templates/user/settings.html:22
-msgid "Auto-forward"
+#: 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/signup_domain.html:8
@@ -667,3 +699,4 @@ msgstr ""
 #: mailu/ui/templates/user/signup_domain.html:15
 msgid "Available slots"
 msgstr ""
+

From 05925f4c458cd9c5bf2677a0e7c2c61d7ba17dbb Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:34:33 +0200
Subject: [PATCH 36/52] Move the localization effort to Weblate

---
 docs/contributors/localization.rst | 8 ++++----
 towncrier/newsframents/916.doc     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 towncrier/newsframents/916.doc

diff --git a/docs/contributors/localization.rst b/docs/contributors/localization.rst
index 19af5574..0324120a 100644
--- a/docs/contributors/localization.rst
+++ b/docs/contributors/localization.rst
@@ -1,12 +1,12 @@
 I18N and L10N
 =============
 
-Using POEditor.com
-------------------
+Using Weblate
+-------------
 
-We are using integrations with POEditor.com for translating Mailu. If you would like to contribute to the localization process, feel free to ask us to add a language then you can contribute to translations.
+We are hosting our localization effort using Weblate.If you would like to contribute to the localization process, feel free to ask us to add a language then you can contribute to translations.
 
-The project : https://poeditor.com/join/project/VszspPuEpn
+The project : https://translate.tedomum.net/projects/mailu/admin/
 
 Using Poedit
 ------------
diff --git a/towncrier/newsframents/916.doc b/towncrier/newsframents/916.doc
new file mode 100644
index 00000000..a380ebb5
--- /dev/null
+++ b/towncrier/newsframents/916.doc
@@ -0,0 +1 @@
+Move the localization effort to Weblate

From 0b484a8c2d804f8f29808428d33d96fe2e81d25e Mon Sep 17 00:00:00 2001
From: kaiyou 
Date: Tue, 7 May 2019 09:50:51 +0200
Subject: [PATCH 37/52] Stop building certdumper since it is not supported by
 traefik anymore

---
 tests/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/build.yml b/tests/build.yml
index dd56dc41..b44bc745 100644
--- a/tests/build.yml
+++ b/tests/build.yml
@@ -30,9 +30,9 @@ services:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-local}
     build: ../optional/radicale
 
-  traefik-certdumper:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-local}
-    build: ../optional/traefik-certdumper
+#  traefik-certdumper:
+#    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}traefik-certdumper:${MAILU_VERSION:-local}
+#    build: ../optional/traefik-certdumper
 
   admin:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-local}

From 0f439dbc5be49e67358705e507255ffbc390cc0c Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 11:59:11 -0600
Subject: [PATCH 38/52] DMARC regenerated in admin dash (what about cli?)

---
 docs/setup.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/setup.rst b/docs/setup.rst
index eb79a697..df387c51 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -61,6 +61,10 @@ Perform the specific setup steps
 Specific setup steps are described per flavor (Compose, Kubernetes, etc.)
 and you should follow the steps after completing the requirements.
 
+After setting up your flavor, continue to the DNS setup instructions,
+additional steps in the admin dashboard will be needed to generate your
+DMARC and SPF/DKIM keys.
+
 Make sure that you test properly before going live!
 
 - Try to send an email to an external service

From 5fe7fb4bf8a71ba1f42f8fdd3eb7f27aaf160755 Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 12:06:39 -0600
Subject: [PATCH 39/52] location in the admin UI to regenerate DMARC/SPF/DKIM

---
 docs/dns.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/dns.rst b/docs/dns.rst
index d2fd4131..a96383b6 100644
--- a/docs/dns.rst
+++ b/docs/dns.rst
@@ -48,3 +48,13 @@ And for another domain, ``myotherdomain.com`` for example:
   myotherdomain.com.  IN  MX  10 mail.mydomain.com.
 
 Note that both point to the same mail server hostname, which is unique to your server.
+
+DKIM/SPF & DMARC Entries
+------------------------
+
+Finally, you'll need to visit the admin dashboard (or use the cli) to regenerate your DMARC, SPF, and DKIM records.
+
+Once the DNS changes to your host have propogated (and if SSL / domain rules were setup correctly, visit your admin
+dashboard at https://example.com/admin/ui/domain/details/example.com. Click on `regenerate keys` and add the required
+records to your DNS provider. If you've enabled DKIM/SPF / DMARC and haven't added these entries, your mail might
+not get delivered.

From 55224fb915904cb588c4752721e042a6e1f7c4b3 Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 12:11:01 -0600
Subject: [PATCH 40/52] suggestion on fixing some access denied errors for
 admin.

---
 docs/faq.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 9d69f2c5..280a8d42 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -319,6 +319,11 @@ down and up again. A container restart is not sufficient.
 
 *Issue reference:* `615`_.
 
+Access Denied Errors
+--------------------
+
+While this may be due to several issues, check to make sure your ``DOMAIN=`` entry is the **first** entry in your ``HOSTNAMES=``.
+
 TLS certificate issues
 ``````````````````````
 

From f1eb2ee3676eda4041f05b746e063b12cdeda7c5 Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 12:19:06 -0600
Subject: [PATCH 41/52] solve admin problems by recommending it in setup, not
 just FAQ.

---
 setup/templates/steps/compose/03_expose.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/templates/steps/compose/03_expose.html b/setup/templates/steps/compose/03_expose.html
index c909fc9b..291ea672 100644
--- a/setup/templates/steps/compose/03_expose.html
+++ b/setup/templates/steps/compose/03_expose.html
@@ -50,7 +50,9 @@ avoid generic all-interfaces addresses like 0.0.0.0 or ::You server will be available under a main hostname but may expose multiple public
 hostnames. Every e-mail domain that points to this server must have one of the
-hostnames in its MX record. Hostnames must be coma-separated.
    
+hostnames in its MX record. Hostnames must be coma-separated. If you're having
+trouble accessing your admin interface, make sure it is the first entry here (and possibly the
+same as your DOMAIN entry from earlier.
    
 
 
    
   

From ca5e0c88ba56bbefbae74334305b3f377a330c73 Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 12:19:38 -0600
Subject: [PATCH 42/52] update in stack, as well.

---
 setup/templates/steps/stack/03_expose.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/templates/steps/stack/03_expose.html b/setup/templates/steps/stack/03_expose.html
index 5377d3bd..c5daa24d 100644
--- a/setup/templates/steps/stack/03_expose.html
+++ b/setup/templates/steps/stack/03_expose.html
@@ -11,7 +11,9 @@ you expose it to the world.
    
 
 
    You server will be available under a main hostname but may expose multiple public
 hostnames. Every e-mail domain that points to this server must have one of the
-hostnames in its MX record. Hostnames must be coma-separated.
    
+hostnames in its MX record. Hostnames must be coma-separated. If you're having
+trouble accessing your admin interface, make sure it is the first entry here (and possibly the
+same as your DOMAIN entry from earlier.
    
 
 
    
   

From 6ca59f20b52418fe0dff91427a06ae1bb611e53d Mon Sep 17 00:00:00 2001
From: toxik-io 
Date: Tue, 7 May 2019 12:29:24 -0600
Subject: [PATCH 43/52] typo.

---
 docs/dns.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dns.rst b/docs/dns.rst
index a96383b6..027ce4fc 100644
--- a/docs/dns.rst
+++ b/docs/dns.rst
@@ -54,7 +54,7 @@ DKIM/SPF & DMARC Entries
 
 Finally, you'll need to visit the admin dashboard (or use the cli) to regenerate your DMARC, SPF, and DKIM records.
 
-Once the DNS changes to your host have propogated (and if SSL / domain rules were setup correctly, visit your admin
+Once the DNS changes to your host have propogated (and if SSL / domain rules were setup correctly), visit your admin
 dashboard at https://example.com/admin/ui/domain/details/example.com. Click on `regenerate keys` and add the required
 records to your DNS provider. If you've enabled DKIM/SPF / DMARC and haven't added these entries, your mail might
 not get delivered.

From b2b19d8810dd335809cf1cc0e74fb03328060630 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg 
Date: Thu, 23 May 2019 12:57:23 +0200
Subject: [PATCH 44/52] Update user_external example for nextcloud

---
 docs/faq.rst | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8d6b283f..6a8a9953 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -257,12 +257,31 @@ First of all you have to install dependencies required to authenticate users via
 
 Next, you have to enable External user support from Nextcloud Apps interface
 
-In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax:
+In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15.
 
 .. code-block:: bash
 
    array(
+      array(
+          'class' => 'OC_User_IMAP',
+          'arguments' => array(
+            '127.0.0.1', 993, 'ssl', 'example.com'
+        ),
+      ),
+  ),
+  
+
+For Nextcloud 14 and below use the following syntax:
+
+
+.. code-block:: bash
+
+   array(
       array(
           'class' => 'OC_User_IMAP',

From 0f030130b40fbe2e63e5cd765a0d21edca851a5d Mon Sep 17 00:00:00 2001
From: hoellen 
Date: Wed, 29 May 2019 09:45:31 +0200
Subject: [PATCH 45/52] [doc] port 443 instead of 440

---
 docs/reverse.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reverse.rst b/docs/reverse.rst
index 02f90fbb..f2826890 100644
--- a/docs/reverse.rst
+++ b/docs/reverse.rst
@@ -137,7 +137,7 @@ which will dump the certificates as ``PEM`` files, readable for Nginx. The ``fro
 
 To set this up, first set ``TLS_FLAVOR=mail`` in your ``.env``. This tells ``mailu/front`` not to try to request certificates using ``letsencrypt``,
 but to read provided certificates, and use them only for mail-protocols, not for ``HTTP``.
-Next, in your ``docker-compose.yml``, comment out the ``port`` lines of the ``front`` section for port ``…:80`` and ``…:440``.
+Next, in your ``docker-compose.yml``, comment out the ``port`` lines of the ``front`` section for port ``…:80`` and ``…:443``.
 Add the respective Traefik labels for your domain/configuration, like
 
 .. code-block:: yaml

From 2277d86a9f923b4f9a73e7bb462d0e08dec75a5e Mon Sep 17 00:00:00 2001
From: Cody Warmbo 
Date: Wed, 22 May 2019 18:12:09 -0500
Subject: [PATCH 46/52] Corrected 'adminitration' to 'administration'

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 0808010c..300bacbf 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,7 +25,7 @@ Main features include:
 
 - **Standard email server**, IMAP and IMAP+, SMTP and Submission
 - **Advanced email features**, aliases, domain aliases, custom routing
-- **Web access**, multiple Webmails and adminitration interface
+- **Web access**, multiple Webmails and administration interface
 - **User features**, aliases, auto-reply, auto-forward, fetched accounts
 - **Admin features**, global admins, announcements, per-domain delegation, quotas
 - **Security**, enforced TLS, Letsencrypt!, outgoing DKIM, anti-virus scanner

From 04a66187b52f4ee87acf517369749c104ff457e2 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg 
Date: Sat, 15 Jun 2019 16:15:49 +0200
Subject: [PATCH 47/52] Add information about stripDomain

---
 docs/faq.rst | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 6a8a9953..03c7eb87 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -242,7 +242,34 @@ correct syntax. The following file names will be taken as override configuration
 
 *Issue reference:* `206`_.
 
-I want to integrate Nextcloud with Mailu
+I want to integrate Nextcloud 15 (and newer) with Mailu
+````````````````````````````````````````
+
+First of all you have to enable External user support from Nextcloud Apps interface
+
+In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15.
+
+.. code-block:: bash
+
+   array(
+      array(
+          'class' => 'OC_User_IMAP',
+          'arguments' => array(
+            '127.0.0.1', 993, 'ssl', 'example.com', true, false
+        ),
+      ),
+  ),
+  
+
+If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login.
+After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. You can disable this behaviour by changing true (the fifth parameter) to false. 
+
+*Issue reference:* `575`_.
+
+I want to integrate Nextcloud 14 (and older) with Mailu
 ````````````````````````````````````````
 
 First of all you have to install dependencies required to authenticate users via imap in Nextcloud
@@ -257,25 +284,7 @@ First of all you have to install dependencies required to authenticate users via
 
 Next, you have to enable External user support from Nextcloud Apps interface
 
-In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15.
-
-.. code-block:: bash
-
-   array(
-      array(
-          'class' => 'OC_User_IMAP',
-          'arguments' => array(
-            '127.0.0.1', 993, 'ssl', 'example.com'
-        ),
-      ),
-  ),
-  
-
-For Nextcloud 14 and below use the following syntax:
-
+In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below):
 
 .. code-block:: bash
 

From 8088f2bd6d409b92ea966a027f9c3498b00809e9 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg 
Date: Sat, 15 Jun 2019 16:20:05 +0200
Subject: [PATCH 48/52] Improve readability

---
 docs/faq.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 03c7eb87..f0ed578f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -245,9 +245,9 @@ correct syntax. The following file names will be taken as override configuration
 I want to integrate Nextcloud 15 (and newer) with Mailu
 ````````````````````````````````````````
 
-First of all you have to enable External user support from Nextcloud Apps interface
+1. Enable External user support from Nextcloud Apps interface
 
-In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15.
+2. Configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax if you use at least Nextcloud 15.
 
 .. code-block:: bash
 
@@ -272,7 +272,7 @@ After successfull login the domain part will be striped and the rest used as use
 I want to integrate Nextcloud 14 (and older) with Mailu
 ````````````````````````````````````````
 
-First of all you have to install dependencies required to authenticate users via imap in Nextcloud
+1. Install dependencies required to authenticate users via imap in Nextcloud
 
 .. code-block:: bash
 
@@ -282,9 +282,9 @@ First of all you have to install dependencies required to authenticate users via
    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
    && docker-php-ext-install imap
 
-Next, you have to enable External user support from Nextcloud Apps interface
+2. Enable External user support from Nextcloud Apps interface
 
-In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below):
+3. Configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax for Nextcloud 14 (and below):
 
 .. code-block:: bash
 

From 6cad9f4839ba9d08e522b991fd914e0bb2a668da Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg 
Date: Sat, 15 Jun 2019 16:21:04 +0200
Subject: [PATCH 49/52] Improve wording

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index f0ed578f..d78223f5 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -265,7 +265,7 @@ I want to integrate Nextcloud 15 (and newer) with Mailu
   
 
 If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login.
-After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. You can disable this behaviour by changing true (the fifth parameter) to false. 
+After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. Disable this behaviour by changing true (the fifth parameter) to false. 
 
 *Issue reference:* `575`_.
 

From 591f00a71131f3687a2ed3592e3ea06c9d690aa6 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg 
Date: Mon, 17 Jun 2019 19:04:18 +0200
Subject: [PATCH 50/52] Change NextCloud to Nextcloud

---
 docs/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index d78223f5..9292d57a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -265,7 +265,7 @@ I want to integrate Nextcloud 15 (and newer) with Mailu
   
 
 If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login.
-After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud. Disable this behaviour by changing true (the fifth parameter) to false. 
+After successfull login the domain part will be striped and the rest used as username in Nextcloud. e.g. 'username@example.com' will be 'username' in Nextcloud. Disable this behaviour by changing true (the fifth parameter) to false. 
 
 *Issue reference:* `575`_.
 
@@ -301,7 +301,7 @@ I want to integrate Nextcloud 14 (and older) with Mailu
   ),
 
 If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login.
-After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud.
+After successfull login the domain part will be striped and the rest used as username in Nextcloud. e.g. 'username@example.com' will be 'username' in Nextcloud.
 
 *Issue reference:* `575`_.
 

From 94dbddd9338223fdb4c8daf7797159535732c6f1 Mon Sep 17 00:00:00 2001
From: Nebukadneza 
Date: Mon, 24 Jun 2019 16:07:32 +0200
Subject: [PATCH 51/52] Add -L to curl to support sourceforge redirects

As per @hoellens suggestion

Co-Authored-By: hoellen 
---
 services/fetchmail/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile
index 4636cd3f..431581c7 100644
--- a/services/fetchmail/Dockerfile
+++ b/services/fetchmail/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:3.8 as builder
 # build dependencies
 RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev
 
-RUN curl 'https://netcologne.dl.sourceforge.net/project/fetchmail/branch_6.3/fetchmail-7.0.0-alpha6.tar.xz' | tar xJ
+RUN curl -L 'https://netcologne.dl.sourceforge.net/project/fetchmail/branch_6.3/fetchmail-7.0.0-alpha6.tar.xz' | tar xJ
 RUN cd fetchmail-7.0.0-alpha6 && \
     ./configure --with-ssl --prefix /usr/local --disable-nls && \
     make

From 5ceedde1de3e1793701108b99c8579f1c0b1c356 Mon Sep 17 00:00:00 2001
From: Dario Ernst 
Date: Mon, 24 Jun 2019 14:24:58 +0000
Subject: [PATCH 52/52] Use more robust SF index URL now that -L helps
 following

---
 services/fetchmail/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile
index 431581c7..4004706d 100644
--- a/services/fetchmail/Dockerfile
+++ b/services/fetchmail/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:3.8 as builder
 # build dependencies
 RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev
 
-RUN curl -L 'https://netcologne.dl.sourceforge.net/project/fetchmail/branch_6.3/fetchmail-7.0.0-alpha6.tar.xz' | tar xJ
+RUN curl -L 'https://sourceforge.net/projects/fetchmail/files/branch_7-alpha/fetchmail-7.0.0-alpha6.tar.xz/download' | tar xJ
 RUN cd fetchmail-7.0.0-alpha6 && \
     ./configure --with-ssl --prefix /usr/local --disable-nls && \
     make