From f5ee77519e0da05177efad0d74f44b6410e59e1d Mon Sep 17 00:00:00 2001 From: kaiyou Date: Sun, 5 Nov 2017 17:17:51 +0100 Subject: [PATCH] Rename spam threshold to spam tolerance --- CHANGELOG.md | 2 ++ .../translations/de/LC_MESSAGES/messages.po | 19 +++++++++++-------- .../translations/en/LC_MESSAGES/messages.po | 17 ++++++++++------- .../translations/fr/LC_MESSAGES/messages.po | 19 +++++++++++-------- .../translations/pt/LC_MESSAGES/messages.po | 19 +++++++++++-------- core/admin/mailu/ui/forms.py | 2 +- core/admin/messages.pot | 14 +++++++------- 7 files changed, 53 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f4a2b58..eb78b943 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ v1.5.0 - 2017-11-05 - Global: clean the ``.env`` file and change many options, *make sure that you download the latest ``.env`` and apply your settings when migrating.* +- Global: clean the Compose configuration, *make sure that you download the + latest ``docker-compose.yml`` when migrating.* - Global: nginx is now a reverse proxy for HTTP, SMTP, IMAP and POP. - Global: the new Rainloop webmail is available. - Global: the mail stack now supports IPv6. diff --git a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po index 9d5a58c6..4a21c41c 100644 --- a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po +++ b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: stefan.auditor@erdfisch.de\n" -"POT-Creation-Date: 2017-10-29 19:12+0100\n" +"POT-Creation-Date: 2017-11-05 17:17+0100\n" "PO-Revision-Date: 2016-11-09 21:43+0100\n" "Last-Translator: Stefan Auditor \n" "Language: de\n" @@ -60,7 +60,7 @@ msgstr "" #: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73 #: mailu/ui/forms.py:112 mailu/ui/forms.py:124 #: 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:20 +#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19 #: mailu/ui/templates/user/list.html:23 msgid "Comment" msgstr "Kommentar" @@ -111,8 +111,8 @@ msgid "Enable spam filter" msgstr "Spam-Filter aktivieren" #: mailu/ui/forms.py:80 -msgid "Spam filter threshold" -msgstr "Spam-Filter Schwellenwert" +msgid "Spam filter tolerance" +msgstr "" #: mailu/ui/forms.py:81 msgid "Save settings" @@ -159,7 +159,7 @@ msgstr "Antwort Text" msgid "Your token (write it down, as it will never be displayed again)" msgstr "" -#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21 +#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:20 msgid "Authorized IP" msgstr "" @@ -363,7 +363,7 @@ msgstr "Administrator hinzufügen" #: 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:19 +#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18 #: mailu/ui/templates/user/list.html:18 msgid "Actions" msgstr "Aktionen" @@ -377,7 +377,7 @@ msgstr "E-Mail" #: 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:27 +#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26 #: mailu/ui/templates/user/list.html:31 msgid "Delete" msgstr "Löschen" @@ -401,7 +401,7 @@ msgstr "Alias hinzufügen" #: 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:22 +#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21 #: mailu/ui/templates/user/list.html:24 msgid "Created" msgstr "Erstellt" @@ -630,3 +630,6 @@ msgstr "" #~ msgid "Your account" #~ msgstr "Konto" +#~ msgid "Spam filter threshold" +#~ msgstr "Spam-Filter Schwellenwert" + diff --git a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po index 060a289b..20d81981 100644 --- a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po +++ b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-29 19:12+0100\n" +"POT-Creation-Date: 2017-11-05 17:17+0100\n" "PO-Revision-Date: 2016-10-02 15:02+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -60,7 +60,7 @@ msgstr "" #: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73 #: mailu/ui/forms.py:112 mailu/ui/forms.py:124 #: 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:20 +#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19 #: mailu/ui/templates/user/list.html:23 msgid "Comment" msgstr "" @@ -111,7 +111,7 @@ msgid "Enable spam filter" msgstr "" #: mailu/ui/forms.py:80 -msgid "Spam filter threshold" +msgid "Spam filter tolerance" msgstr "" #: mailu/ui/forms.py:81 @@ -159,7 +159,7 @@ msgstr "" msgid "Your token (write it down, as it will never be displayed again)" msgstr "" -#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21 +#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:20 msgid "Authorized IP" msgstr "" @@ -361,7 +361,7 @@ msgstr "" #: 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:19 +#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18 #: mailu/ui/templates/user/list.html:18 msgid "Actions" msgstr "" @@ -375,7 +375,7 @@ msgstr "" #: 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:27 +#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26 #: mailu/ui/templates/user/list.html:31 msgid "Delete" msgstr "" @@ -399,7 +399,7 @@ 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:22 +#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21 #: mailu/ui/templates/user/list.html:24 msgid "Created" msgstr "" @@ -628,3 +628,6 @@ msgstr "" #~ msgid "Your account" #~ msgstr "" +#~ msgid "Spam filter threshold" +#~ msgstr "" + diff --git a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po index ca91aa10..38bf2518 100644 --- a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po +++ b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Mailu\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-29 19:12+0100\n" +"POT-Creation-Date: 2017-11-05 17:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: fr\n" @@ -56,7 +56,7 @@ msgstr "Quota maximum par utilisateur" #: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73 #: mailu/ui/forms.py:112 mailu/ui/forms.py:124 #: 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:20 +#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19 #: mailu/ui/templates/user/list.html:23 msgid "Comment" msgstr "Commentaire" @@ -107,8 +107,8 @@ msgid "Enable spam filter" msgstr "Activer le filtre anti-spam" #: mailu/ui/forms.py:80 -msgid "Spam filter threshold" -msgstr "Seuil du filtre anti-spam" +msgid "Spam filter tolerance" +msgstr "" #: mailu/ui/forms.py:81 msgid "Save settings" @@ -155,7 +155,7 @@ msgstr "Corps de la réponse" msgid "Your token (write it down, as it will never be displayed again)" msgstr "" -#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21 +#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:20 msgid "Authorized IP" msgstr "" @@ -357,7 +357,7 @@ msgstr "Ajouter un administrateur" #: 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:19 +#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18 #: mailu/ui/templates/user/list.html:18 msgid "Actions" msgstr "Actions" @@ -371,7 +371,7 @@ msgstr "E-mail" #: 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:27 +#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26 #: mailu/ui/templates/user/list.html:31 msgid "Delete" msgstr "Supprimer" @@ -395,7 +395,7 @@ msgstr "Ajouter un alias" #: mailu/ui/templates/alias/list.html:22 #: mailu/ui/templates/alternative/list.html:20 #: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24 -#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:22 +#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21 #: mailu/ui/templates/user/list.html:24 msgid "Created" msgstr "Création" @@ -624,3 +624,6 @@ msgstr "" #~ msgid "Your account" #~ msgstr "Votre compte" +#~ msgid "Spam filter threshold" +#~ msgstr "Seuil du filtre anti-spam" + diff --git a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po index 05817182..c1b88963 100644 --- a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po +++ b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-29 19:12+0100\n" +"POT-Creation-Date: 2017-11-05 17:17+0100\n" "PO-Revision-Date: 2017-03-27 11:43-0300\n" "Last-Translator: \n" "Language: pt_BR\n" @@ -60,7 +60,7 @@ msgstr "" #: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73 #: mailu/ui/forms.py:112 mailu/ui/forms.py:124 #: 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:20 +#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19 #: mailu/ui/templates/user/list.html:23 msgid "Comment" msgstr "Comentário" @@ -111,8 +111,8 @@ msgid "Enable spam filter" msgstr "Habilitar filtro de spam" #: mailu/ui/forms.py:80 -msgid "Spam filter threshold" -msgstr "Limite de filtro de spam" +msgid "Spam filter tolerance" +msgstr "" #: mailu/ui/forms.py:81 msgid "Save settings" @@ -159,7 +159,7 @@ msgstr "Corpo da resposta" msgid "Your token (write it down, as it will never be displayed again)" msgstr "" -#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21 +#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:20 msgid "Authorized IP" msgstr "" @@ -361,7 +361,7 @@ msgstr "Adicionar administrador" #: 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:19 +#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18 #: mailu/ui/templates/user/list.html:18 msgid "Actions" msgstr "Ações" @@ -375,7 +375,7 @@ msgstr "Email" #: 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:27 +#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26 #: mailu/ui/templates/user/list.html:31 msgid "Delete" msgstr "Deletar" @@ -399,7 +399,7 @@ msgstr "Adicionar alias" #: mailu/ui/templates/alias/list.html:22 #: mailu/ui/templates/alternative/list.html:20 #: mailu/ui/templates/domain/list.html:22 mailu/ui/templates/fetch/list.html:24 -#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:22 +#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21 #: mailu/ui/templates/user/list.html:24 msgid "Created" msgstr "Criado" @@ -628,3 +628,6 @@ msgstr "" #~ msgid "Your account" #~ msgstr "Sua conta" +#~ msgid "Spam filter threshold" +#~ msgstr "Limite de filtro de spam" + diff --git a/core/admin/mailu/ui/forms.py b/core/admin/mailu/ui/forms.py index fa2ec1dc..793057fc 100644 --- a/core/admin/mailu/ui/forms.py +++ b/core/admin/mailu/ui/forms.py @@ -77,7 +77,7 @@ class UserForm(flask_wtf.FlaskForm): class UserSettingsForm(flask_wtf.FlaskForm): displayed_name = fields.StringField(_('Displayed name')) spam_enabled = fields.BooleanField(_('Enable spam filter')) - spam_threshold = fields_.IntegerSliderField(_('Spam filter threshold')) + spam_threshold = fields_.IntegerSliderField(_('Spam filter tolerance')) submit = fields.SubmitField(_('Save settings')) diff --git a/core/admin/messages.pot b/core/admin/messages.pot index 8b8fe472..d05261f3 100644 --- a/core/admin/messages.pot +++ b/core/admin/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-10-29 19:12+0100\n" +"POT-Creation-Date: 2017-11-05 17:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,7 +59,7 @@ msgstr "" #: mailu/ui/forms.py:50 mailu/ui/forms.py:62 mailu/ui/forms.py:73 #: mailu/ui/forms.py:112 mailu/ui/forms.py:124 #: 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:20 +#: mailu/ui/templates/relay/list.html:19 mailu/ui/templates/token/list.html:19 #: mailu/ui/templates/user/list.html:23 msgid "Comment" msgstr "" @@ -110,7 +110,7 @@ msgid "Enable spam filter" msgstr "" #: mailu/ui/forms.py:80 -msgid "Spam filter threshold" +msgid "Spam filter tolerance" msgstr "" #: mailu/ui/forms.py:81 @@ -158,7 +158,7 @@ msgstr "" msgid "Your token (write it down, as it will never be displayed again)" msgstr "" -#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:21 +#: mailu/ui/forms.py:114 mailu/ui/templates/token/list.html:20 msgid "Authorized IP" msgstr "" @@ -360,7 +360,7 @@ msgstr "" #: 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:19 +#: mailu/ui/templates/relay/list.html:16 mailu/ui/templates/token/list.html:18 #: mailu/ui/templates/user/list.html:18 msgid "Actions" msgstr "" @@ -374,7 +374,7 @@ msgstr "" #: 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:27 +#: mailu/ui/templates/relay/list.html:27 mailu/ui/templates/token/list.html:26 #: mailu/ui/templates/user/list.html:31 msgid "Delete" msgstr "" @@ -398,7 +398,7 @@ 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:22 +#: mailu/ui/templates/relay/list.html:20 mailu/ui/templates/token/list.html:21 #: mailu/ui/templates/user/list.html:24 msgid "Created" msgstr ""