Add a button to keep forwarded messages

2017-09-03 15:43:30 +02:00
parent 213ee1d8b6
commit 2b3b1aeb19
9 changed files with 421 additions and 267 deletions
--- a/admin/messages.pot
+++ b/admin/messages.pot
@@ -1,21 +1,21 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-11-10 10:52+0100\n"
+"POT-Creation-Date: 2017-09-03 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.3.4\n"
+"Generated-By: Babel 2.5.0\n"

 #: mailu/admin/forms.py:32
 msgid "Invalid email address."
@@ -25,12 +25,12 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: mailu/admin/forms.py:40 mailu/admin/forms.py:54
+#: mailu/admin/forms.py:40 mailu/admin/forms.py:55
 msgid "E-mail"
 msgstr ""

-#: mailu/admin/forms.py:41 mailu/admin/forms.py:55 mailu/admin/forms.py:72
-#: mailu/admin/forms.py:120
+#: mailu/admin/forms.py:41 mailu/admin/forms.py:56 mailu/admin/forms.py:73
+#: mailu/admin/forms.py:122
 msgid "Password"
 msgstr ""

@@ -52,135 +52,147 @@ msgstr ""
 msgid "Maximum alias count"
 msgstr ""

-#: mailu/admin/forms.py:49 mailu/admin/forms.py:60 mailu/admin/forms.py:98
+#: mailu/admin/forms.py:49
+msgid "Maximum user quota"
+msgstr ""
+
+#: mailu/admin/forms.py:50 mailu/admin/forms.py:61 mailu/admin/forms.py:100
 #: mailu/admin/templates/alias/list.html:22
 #: mailu/admin/templates/domain/list.html:22
 #: mailu/admin/templates/user/list.html:24
 msgid "Comment"
 msgstr ""

-#: mailu/admin/forms.py:50 mailu/admin/forms.py:99
+#: mailu/admin/forms.py:51 mailu/admin/forms.py:101
 msgid "Create"
 msgstr ""

-#: mailu/admin/forms.py:56
+#: mailu/admin/forms.py:57
 msgid "Confirm password"
 msgstr ""

-#: mailu/admin/forms.py:57 mailu/admin/templates/user/list.html:23
+#: mailu/admin/forms.py:58 mailu/admin/templates/user/list.html:23
 msgid "Quota"
 msgstr ""

-#: mailu/admin/forms.py:58
+#: mailu/admin/forms.py:59
 msgid "Allow IMAP access"
 msgstr ""

-#: mailu/admin/forms.py:59
+#: mailu/admin/forms.py:60
 msgid "Allow POP3 access"
 msgstr ""

-#: mailu/admin/forms.py:61
+#: mailu/admin/forms.py:62
 msgid "Save"
 msgstr ""

-#: mailu/admin/forms.py:65
+#: mailu/admin/forms.py:66
 msgid "Displayed name"
 msgstr ""

-#: mailu/admin/forms.py:66
+#: mailu/admin/forms.py:67
 msgid "Enable spam filter"
 msgstr ""

-#: mailu/admin/forms.py:67
+#: mailu/admin/forms.py:68
 msgid "Spam filter threshold"
 msgstr ""

-#: mailu/admin/forms.py:68
+#: mailu/admin/forms.py:69
 msgid "Save settings"
 msgstr ""

-#: mailu/admin/forms.py:73
+#: mailu/admin/forms.py:74
 msgid "Password check"
 msgstr ""

-#: mailu/admin/forms.py:74 mailu/admin/templates/sidebar.html:13
+#: mailu/admin/forms.py:75 mailu/admin/templates/sidebar.html:13
 msgid "Update password"
 msgstr ""

-#: mailu/admin/forms.py:78
+#: mailu/admin/forms.py:79
 msgid "Enable forwarding"
 msgstr ""

-#: mailu/admin/forms.py:80 mailu/admin/forms.py:97
+#: mailu/admin/forms.py:80
+msgid "Keep a copy of the emails"
+msgstr ""
+
+#: mailu/admin/forms.py:82 mailu/admin/forms.py:99
 #: mailu/admin/templates/alias/list.html:21
 msgid "Destination"
 msgstr ""

-#: mailu/admin/forms.py:82 mailu/admin/forms.py:90
+#: mailu/admin/forms.py:84 mailu/admin/forms.py:92
 msgid "Update"
 msgstr ""

-#: mailu/admin/forms.py:86
+#: mailu/admin/forms.py:88
 msgid "Enable automatic reply"
 msgstr ""

-#: mailu/admin/forms.py:87
+#: mailu/admin/forms.py:89
 msgid "Reply subject"
 msgstr ""

-#: mailu/admin/forms.py:88
+#: mailu/admin/forms.py:90
 msgid "Reply body"
 msgstr ""

-#: mailu/admin/forms.py:94
+#: mailu/admin/forms.py:96
 msgid "Alias"
 msgstr ""

-#: mailu/admin/forms.py:96
+#: mailu/admin/forms.py:98
 msgid "Use SQL LIKE Syntax (e.g. for catch-all aliases)"
 msgstr ""

-#: mailu/admin/forms.py:103
+#: mailu/admin/forms.py:105
 msgid "Admin email"
 msgstr ""

-#: mailu/admin/forms.py:104 mailu/admin/forms.py:109 mailu/admin/forms.py:121
+#: mailu/admin/forms.py:106 mailu/admin/forms.py:111 mailu/admin/forms.py:124
 msgid "Submit"
 msgstr ""

-#: mailu/admin/forms.py:108
+#: mailu/admin/forms.py:110
 msgid "Manager email"
 msgstr ""

-#: mailu/admin/forms.py:113
+#: mailu/admin/forms.py:115
 msgid "Protocol"
 msgstr ""

-#: mailu/admin/forms.py:116
+#: mailu/admin/forms.py:118
 msgid "Hostname or IP"
 msgstr ""

-#: mailu/admin/forms.py:117
+#: mailu/admin/forms.py:119
 msgid "TCP port"
 msgstr ""

-#: mailu/admin/forms.py:118
+#: mailu/admin/forms.py:120
 msgid "Enable TLS"
 msgstr ""

-#: mailu/admin/forms.py:119 mailu/admin/templates/fetch/list.html:21
+#: mailu/admin/forms.py:121 mailu/admin/templates/fetch/list.html:21
 msgid "Username"
 msgstr ""

-#: mailu/admin/forms.py:125
+#: mailu/admin/forms.py:123
+msgid "Keep emails on the server"
+msgstr ""
+
+#: mailu/admin/forms.py:128
 msgid "Announcement subject"
 msgstr ""

-#: mailu/admin/forms.py:127
+#: mailu/admin/forms.py:130
 msgid "Announcement body"
 msgstr ""

-#: mailu/admin/forms.py:129
+#: mailu/admin/forms.py:132
 msgid "Send"
 msgstr ""

@@ -225,7 +237,7 @@ msgstr ""
 msgid "Service"
 msgstr ""

-#: mailu/admin/templates/fetch/list.html:23
+#: mailu/admin/templates/fetch/list.html:24
 #: mailu/admin/templates/services.html:12
 msgid "Status"
 msgstr ""
@@ -329,7 +341,7 @@ msgstr ""
 #: mailu/admin/templates/admin/list.html:23
 #: mailu/admin/templates/alias/list.html:30
 #: mailu/admin/templates/domain/list.html:32
-#: mailu/admin/templates/fetch/list.html:31
+#: mailu/admin/templates/fetch/list.html:32
 #: mailu/admin/templates/manager/list.html:25
 #: mailu/admin/templates/user/list.html:32
 msgid "Delete"
@@ -353,21 +365,21 @@ msgstr ""

 #: mailu/admin/templates/alias/list.html:23
 #: mailu/admin/templates/domain/list.html:23
-#: mailu/admin/templates/fetch/list.html:24
+#: mailu/admin/templates/fetch/list.html:25
 #: mailu/admin/templates/user/list.html:25
 msgid "Created"
 msgstr ""

 #: mailu/admin/templates/alias/list.html:24
 #: mailu/admin/templates/domain/list.html:24
-#: mailu/admin/templates/fetch/list.html:25
+#: mailu/admin/templates/fetch/list.html:26
 #: mailu/admin/templates/user/list.html:26
 msgid "Last edit"
 msgstr ""

 #: mailu/admin/templates/alias/list.html:29
 #: mailu/admin/templates/domain/list.html:31
-#: mailu/admin/templates/fetch/list.html:30
+#: mailu/admin/templates/fetch/list.html:31
 #: mailu/admin/templates/user/list.html:31
 msgid "Edit"
 msgstr ""
@@ -458,9 +470,21 @@ msgid "Endpoint"
 msgstr ""

 #: mailu/admin/templates/fetch/list.html:22
+msgid "Keep emails"
+msgstr ""
+
+#: mailu/admin/templates/fetch/list.html:23
 msgid "Last check"
 msgstr ""

+#: mailu/admin/templates/fetch/list.html:36
+msgid "yes"
+msgstr ""
+
+#: mailu/admin/templates/fetch/list.html:36
+msgid "no"
+msgstr ""
+
 #: mailu/admin/templates/manager/create.html:4
 msgid "Add a manager"
 msgstr ""